Merge pull request #5772 from nathanmarks/update-jss

Update jss/jss-theme-reactor
mui · Dec 13, 2016 · 898d1d7 · 898d1d7
2 parents 15255a0 + 4a14923
commit 898d1d7
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 53 deletions.
diff --git a/.flowconfig b/.flowconfig
@@ -1,6 +1,7 @@
 [ignore]
 
 .*/node_modules/fbjs/*
+.*/node_modules/jss/lib/.*\.js\.flow
 .*/node_modules/react-swipeable-views/src/.*
 ./scripts/*
 ./test/e2e/*

diff --git a/docs/site/src/components/AppFrame.js b/docs/site/src/components/AppFrame.js
@@ -12,37 +12,37 @@ import withWidth, { isWidthUp } from 'material-ui/utils/withWidth';
 import AppDrawer from './AppDrawer';
 
 const globalStyleSheet = createStyleSheet('global', (theme) => ({
-  html: {
-    boxSizing: 'border-box',
-  },
-  '*, *:before, *:after': {
-    boxSizing: 'inherit',
-  },
-  body: {
-    margin: 0,
-    background: theme.palette.background.default,
-    fontFamily: theme.typography.fontFamily,
-    color: theme.palette.text.primary,
-    lineHeight: '1.2',
-    overflowX: 'hidden',
-    WebkitFontSmoothing: 'antialiased', // Antialiasing.
-    MozOsxFontSmoothing: 'grayscale', // Antialiasing.
-  },
-  a: {
-    color: theme.palette.accent.A400,
-    textDecoration: 'none',
-    '&:hover': {
+  '@global': {
+    html: {
+      boxSizing: 'border-box',
+    },
+    '*, *:before, *:after': {
+      boxSizing: 'inherit',
+    },
+    body: {
+      margin: 0,
+      background: theme.palette.background.default,
+      fontFamily: theme.typography.fontFamily,
+      color: theme.palette.text.primary,
+      lineHeight: '1.2',
+      overflowX: 'hidden',
+      WebkitFontSmoothing: 'antialiased', // Antialiasing.
+      MozOsxFontSmoothing: 'grayscale', // Antialiasing.
+    },
+    a: {
+      color: theme.palette.accent.A400,
+      textDecoration: 'none',
+    },
+    'a:hover': {
       textDecoration: 'underline',
     },
+    img: {
+      maxWidth: '100%',
+      height: 'auto',
+      width: 'auto',
+    },
   },
-  img: {
-    maxWidth: '100%',
-    height: 'auto',
-    width: 'auto',
-  },
-}), {
-  named: false, // global CSS.
-});
+}));
 
 const styleSheet = createStyleSheet('AppFrame', (theme) => {
   return {

diff --git a/package.json b/package.json
@@ -50,8 +50,8 @@
   "dependencies": {
     "classnames": "^2.2.5",
     "dom-helpers": "^3.0.0",
-    "jss-preset-default": "^0.9.0",
-    "jss-theme-reactor": "^0.6.0",
+    "jss-preset-default": "^1.1.0",
+    "jss-theme-reactor": "^0.8.0",
     "keycode": "^2.1.1",
     "lodash": "^4.17.2",
     "object-assign": "^4.1.0",

diff --git a/test/regressions/site/src/TestViewer.js b/test/regressions/site/src/TestViewer.js
@@ -6,33 +6,35 @@ import { createStyleSheet } from 'jss-theme-reactor';
 const globalStyleSheet = createStyleSheet('global', (theme) => {
   const { palette, typography } = theme;
   return {
-    html: {
-      boxSizing: 'border-box',
-    },
-    '*, *:before, *:after': {
-      boxSizing: 'inherit',
-    },
-    body: {
-      margin: 0,
-      background: palette.background.default,
-      fontFamily: typography.fontFamily,
-      color: palette.text.primary,
-      lineHeight: '1.2',
-      overflowX: 'hidden',
-      WebkitFontSmoothing: 'antialiased',
-    },
-    a: {
-      color: palette.accent.A400,
-      textDecoration: 'none',
-      '&:hover': {
+    '@global': {
+      html: {
+        boxSizing: 'border-box',
+      },
+      '*, *:before, *:after': {
+        boxSizing: 'inherit',
+      },
+      body: {
+        margin: 0,
+        background: palette.background.default,
+        fontFamily: typography.fontFamily,
+        color: palette.text.primary,
+        lineHeight: '1.2',
+        overflowX: 'hidden',
+        WebkitFontSmoothing: 'antialiased',
+      },
+      a: {
+        color: palette.accent.A400,
+        textDecoration: 'none',
+      },
+      '@:hover': {
         textDecoration: 'underline',
       },
-    },
-    p: {
-      lineHeight: '1.6',
+      p: {
+        lineHeight: '1.6',
+      },
     },
   };
-}, { named: false });
+});
 
 const styleSheet = createStyleSheet('TestViewer', (theme) => {
   const { palette } = theme;