Merge branch 'master' of https://github.com/zeit/next.js

Readme.md

@@ -50,7 +50,7 @@ We use [glamor](https://github.com/threepointone/glamor) to provide a great buil
 
 ```jsx
 import React from 'react'
-import { style } from 'next/css'
+import style from 'next/css'
 
 export default () => (
   <div className={style}>

examples/basic-css/pages/index.js

 import React from 'react'
-import { style } from 'next/css'
+import style from 'next/css'
 
 export default () => (
   <div className={styles}>

examples/nested-components/components/paragraph.js

 import React from 'react'
-import { style } from 'next/css'
+import style from 'next/css'
 
 export default ({ children }) => (
   <p className={styles}>{children}</p>

examples/nested-components/components/post.js

 import React from 'react'
-import { style } from 'next/css'
+import style from 'next/css'
 
 export default ({ title, children }) => (
   <div className={mainStyle}>

examples/nested-components/pages/index.js

 import React from 'react'
 import P from '../components/paragraph'
 import Post from '../components/post'
-import { style } from 'next/css'
+import style from 'next/css'
 
 export default () => (
   <div className={styles.main}>

pages/_error-debug.js

 import React from 'react'
 import stripAnsi from 'strip-ansi'
 import Head from 'next/head'
-import { style } from 'next/css'
+import style from 'next/css'
 
 export default class ErrorDebug extends React.Component {
   static getInitialProps ({ err }) {

pages/_error.js

 import React from 'react'
-import { style, merge } from 'next/css'
+import style, { merge } from 'next/css'
 
 export default class Error extends React.Component {
   static getInitialProps ({ res, xhr }) {

test/fixtures/basic/pages/css.js

 import React from 'react'
-import { style } from 'next/css'
+import style from 'next/css'
 
 export default () => <div className={styles}>This is red</div>