Skip to content

Commit 67bf4d6

Browse files
authored
Merge pull request vercel#1 from zeit/fix/css
Updated css to use the new API
2 parents 73627f5 + 5123620 commit 67bf4d6

6 files changed

Lines changed: 30 additions & 29 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
.next
2+
node_modules

components/frame.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import React from 'react'
22
import Link from 'next/link'
3-
import { css, StyleSheet } from 'next/css'
3+
import { style } from 'next/css'
44

55
export default ({ id }) => (
6-
<div className={css(styles.photo)}>
7-
<div className={css(styles.image)}>
6+
<div className={style(styles.photo)}>
7+
<div className={style(styles.image)}>
88
{id}
99
</div>
1010

11-
<div className={css(styles.sidebar)}>
12-
<ul className={css(styles.sidebarList)}>
11+
<div className={style(styles.sidebar)}>
12+
<ul className={style(styles.sidebarList)}>
1313
<li>
1414
<Link href="/profile?id=nkzawa">@nkzawa</Link>
1515
- Great photo!
@@ -19,7 +19,7 @@ export default ({ id }) => (
1919
</div>
2020
)
2121

22-
const styles = StyleSheet.create({
22+
const styles = {
2323
photo: {
2424
width: '800px',
2525
overflow: 'hidden',
@@ -56,4 +56,4 @@ const styles = StyleSheet.create({
5656
margin: 0,
5757
padding: 0,
5858
}
59-
})
59+
}

components/modal.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react'
22
import Photo from './frame'
3-
import { css, StyleSheet } from 'next/css'
3+
import { style } from 'next/css'
44

55
export default class extends React.Component {
66
dismiss (e) {
@@ -14,16 +14,16 @@ export default class extends React.Component {
1414

1515
render () {
1616
return (
17-
<div className={css(styles.shim)} ref="shim" onClick={(e) => this.dismiss(e)}>
18-
<div ref="photoWrap" className={css(styles.photo)}>
17+
<div className={style(styles.shim)} ref="shim" onClick={(e) => this.dismiss(e)}>
18+
<div ref="photoWrap" className={style(styles.photo)}>
1919
<Photo id={this.props.id} />
2020
</div>
2121
</div>
2222
)
2323
}
2424
}
2525

26-
const styles = StyleSheet.create({
26+
const styles = {
2727
shim: {
2828
position: 'fixed',
2929
background: 'rgba(0,0,0,.65)',
@@ -40,4 +40,4 @@ const styles = StyleSheet.create({
4040
width: '100%',
4141
marginTop: '-250px'
4242
}
43-
})
43+
}

pages/index.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react'
22
import Modal from '../components/modal'
3-
import { css, StyleSheet } from 'next/css'
3+
import { style } from 'next/css'
44

55
export default class extends React.Component {
66
static getInitialProps () {
@@ -40,7 +40,7 @@ export default class extends React.Component {
4040

4141
render () {
4242
return (
43-
<div className={css(styles.list)}>
43+
<div className={style(styles.list)}>
4444
{
4545
this.props.url.query.id &&
4646
<Modal
@@ -50,8 +50,8 @@ export default class extends React.Component {
5050
}
5151
{
5252
this.props.photos.map((id) => (
53-
<div key={id} className={css(styles.photo)}>
54-
<a className={css(styles.photoLink)} onClick={() => this.showPhoto(id) }>
53+
<div key={id} className={style(styles.photo)}>
54+
<a className={style(styles.photoLink)} onClick={() => this.showPhoto(id) }>
5555
{id}
5656
</a>
5757
</div>
@@ -62,7 +62,7 @@ export default class extends React.Component {
6262
}
6363
}
6464

65-
const styles = StyleSheet.create({
65+
const styles = {
6666
list: {
6767
padding: '50px',
6868
textAlign: 'center'
@@ -87,4 +87,4 @@ const styles = StyleSheet.create({
8787
borderColor: 'blue'
8888
}
8989
}
90-
})
90+
}

pages/photo.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import React from 'react'
22
import Photo from '../components/frame'
3-
import { css, StyleSheet } from 'next/css'
3+
import { style } from 'next/css'
44

55
export default ({ url: { query: { id } } }) => (
6-
<div className={css(styles.permalink)}>
7-
<div className={css(styles.wrap)}>
6+
<div className={style(styles.permalink)}>
7+
<div className={style(styles.wrap)}>
88
<Photo id={id} />
99
</div>
1010
</div>
1111
)
1212

13-
const styles = StyleSheet.create({
13+
const styles = {
1414
permalink: {
1515
padding: '100px',
1616
textAlign: 'center'
@@ -21,4 +21,4 @@ const styles = StyleSheet.create({
2121
border: '1px solid #999',
2222
margin: 'auto'
2323
}
24-
})
24+
}

pages/profile.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import React from 'react'
2-
import { css, StyleSheet } from 'next/css'
2+
import { style } from 'next/css'
33

44
export default ({ url: { query: { id } } }) => (
5-
<div className={css(styles.main)}>
6-
<h1 className={css(styles.heading)}>
5+
<div className={style(styles.main)}>
6+
<h1 className={style(styles.heading)}>
77
User profile:
88
{' '}
9-
<b className={css(styles.username)}>{id}</b>
9+
<b className={style(styles.username)}>{id}</b>
1010
</h1>
1111
</div>
1212
)
1313

14-
const styles = StyleSheet.create({
14+
const styles = {
1515
main: {
1616
padding: '100px'
1717
},
@@ -23,4 +23,4 @@ const styles = StyleSheet.create({
2323
username: {
2424
color: 'blue'
2525
}
26-
})
26+
}

0 commit comments

Comments
 (0)