terribleplan/next.js
1
0
Fork 0
mirror of https://github.com/terribleplan/next.js.git synced 2024-01-19 02:48:18 +00:00
Code Issues Releases Wiki Activity

Merge master into canary (#3846)

Browse source 
* Move security related test cases into a its own file.

* Removes the unused renderScript function

* Add a nerv example. (#3573)

* Add a nerv example.

* Fix for indentation/style

* Fix for name

* Release 5.0.0

* Add multi-zones docs. (#3688)

* with emotion example - hoist styles out of the index page component (#3821)

* Use indexOf instead of startsWith (#3758)

* Use indexOf instead of startsWith

This fixes an IE11 regression, see #3755

* Lint the code
This commit is contained in:
Tim Neutkens 2018-02-19 15:47:50 +01:00 committed by GitHub
parent 9cfea69ab1
commit a10324d591
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 60 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
examples/with-emotion/pages/index.js
View file

@ -7,8 +7,7 @@ if (typeof window !== 'undefined') {
hydrate(window.__NEXT_DATA__.ids) hydrate(window.__NEXT_DATA__.ids)
} }
export default () => { injectGlobal`
injectGlobal`
html, body { html, body {
padding: 3rem 1rem; padding: 3rem 1rem;
margin: 0; margin: 0;
@ -17,9 +16,9 @@ export default () => {
font-family: Helvetica, Arial, sans-serif; font-family: Helvetica, Arial, sans-serif;
font-size: 24px; font-size: 24px;
} }
` `
const basicStyles = css` const basicStyles = css`
background-color: white; background-color: white;
color: cornflowerblue; color: cornflowerblue;
border: 1px solid lightgreen; border: 1px solid lightgreen;
@ -29,44 +28,45 @@ export default () => {
transition: all 0.1s linear; transition: all 0.1s linear;
margin: 3rem 0; margin: 3rem 0;
padding: 1rem 0.5rem; padding: 1rem 0.5rem;
` `
const hoverStyles = css` const hoverStyles = css`
&:hover { &:hover {
color: white; color: white;
background-color: lightgray; background-color: lightgray;
border-color: aqua; border-color: aqua;
box-shadow: -15px -15px 0 0 aqua, -30px -30px 0 0 cornflowerblue; box-shadow: -15px -15px 0 0 aqua, -30px -30px 0 0 cornflowerblue;
} }
` `
const bounce = keyframes` const bounce = keyframes`
from { from {
transform: scale(1.01); transform: scale(1.01);
} }
to { to {
transform: scale(0.99); transform: scale(0.99);
} }
` `
const Basic = styled.div` const Basic = styled.div`
${basicStyles}; ${basicStyles};
` `
const Combined = styled.div` const Combined = styled.div`
${basicStyles}; ${basicStyles};
${hoverStyles}; ${hoverStyles};
& code { & code {
background-color: linen; background-color: linen;
} }
` `
const Animated = styled.div` const Animated = styled.div`
${basicStyles}; ${basicStyles};
${hoverStyles}; ${hoverStyles};
& code { & code {
background-color: linen; background-color: linen;
} }
animation: ${props => props.animation} 0.2s infinite ease-in-out alternate; animation: ${props => props.animation} 0.2s infinite ease-in-out alternate;
` `
export default () => {
return ( return (
<div> <div>
<Basic>Cool Styles</Basic> <Basic>Cool Styles</Basic>

2
lib/head.js
View file

@ -60,7 +60,7 @@ function unique () {
const metaCategories = {} const metaCategories = {}
return (h) => { return (h) => {
if (h.key && h.key.startsWith('.$')) { if (h.key && h.key.indexOf('.$') === 0) {
if (keys.has(h.key)) return false if (keys.has(h.key)) return false
keys.add(h.key) keys.add(h.key)
} }