Merge branch 'master' into fix-uncaught-localStorage-exception

Author: jxnblk

CHANGELOG.md

@@ -3,6 +3,9 @@
 ## Unreleased
 
 - `@theme-ui/components`: on Grid component, allow custom `columns` definitions via strings #541
+- `@theme-ui/gatsby-theme-style-guide`: add docs on shadowing #558
+- Adds `@theme-ui/preset-polaris` #567
+- Adjusts default font stack in presets #568
 
 ## v0.2.53 2019-12-19
 

examples/create-react-app/src/theme.js

@@ -6,7 +6,8 @@ export default {
     secondary: '#609',
   },
   fonts: {
-    body: 'system-ui, sans-serif',
+    body:
+      'system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", sans-serif',
     heading: 'inherit',
   },
   styles: {

examples/custom-pragma/src/theme.js

@@ -6,7 +6,8 @@ export default {
     secondary: '#609',
   },
   fonts: {
-    body: 'system-ui, sans-serif',
+    body:
+      'system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", sans-serif',
     heading: 'inherit',
     monospace: 'Menlo, monospace',
   },

examples/dark-mode/src/theme.js

@@ -14,7 +14,8 @@ export default {
     },
   },
   fonts: {
-    body: 'system-ui, sans-serif',
+    body:
+      'system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", sans-serif',
     heading: 'inherit',
   },
   lineHeights: {

examples/gatsby-plugin/package.json

@@ -24,7 +24,7 @@
     "@testing-library/react": "^9.1.3",
     "husky": ">=1",
     "jest": "^24.8.0",
-    "lint-staged": "9",
+    "lint-staged": "10",
     "react-test-renderer": "^16.8.6"
   }
 }

examples/gatsby-plugin/src/gatsby-plugin-theme-ui/index.js

@@ -8,7 +8,8 @@ export default {
     secondary: '#609',
   },
   fonts: {
-    body: 'system-ui, sans-serif',
+    body:
+      'system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", sans-serif',
     heading: 'inherit',
   },
   lineHeights: {

examples/gatsby/src/theme.js

@@ -6,7 +6,8 @@ export default {
     secondary: '#609',
   },
   fonts: {
-    body: 'system-ui, sans-serif',
+    body:
+      'system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", sans-serif',
     heading: 'inherit',
   },
   styles: {

examples/next/src/theme.js

@@ -15,7 +15,8 @@ export default {
     },
   },
   fonts: {
-    body: 'system-ui, sans-serif',
+    body:
+      'system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", sans-serif',
     heading: 'inherit',
   },
   styles: {

examples/prism/src/theme.js

@@ -7,7 +7,8 @@ export default {
     lightgray: '#fafafa',
   },
   fonts: {
-    body: 'system-ui, sans-serif',
+    body:
+      'system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", sans-serif',
     heading: 'inherit',
     monospace: 'Menlo, monospace',
   },

lerna.json

@@ -2,7 +2,5 @@
   "version": "0.2.53",
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "packages": [
-    "packages/*"
-  ]
+  "packages": ["packages/*"]
 }