Merge branch 'master' into next-minimal

mukkara · Sep 8, 2018 · 9abbb24 · 9abbb24
2 parents 2994ea7 + f33e2ec
commit 9abbb24
Show file tree

Hide file tree

Showing 24 changed files with 4 additions and 854 deletions.
diff --git a/.npmignore b/.npmignore
@@ -9,3 +9,4 @@ examples
 markdown
 mdx
 babel.config.js
+packages
diff --git a/examples/sandbox/package.json b/examples/sandbox/package.json
@@ -6,7 +6,8 @@
     "react": "^16.4.0",
     "react-dom": "^16.4.2",
     "react-scripts": "1.1.4",
-    "rebass": "^2.0.0"
+    "rebass": "^2.1.0",
+    "styled-components": "^3.4.5"
   },
   "scripts": {
     "start": "react-scripts start",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rebass",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Flexible & functional React design system, built with styled-system",
   "main": "dist/index.js",
   "module": "dist/index.es.js",

diff --git a/packages/markdown/.gitignore b/packages/markdown/.gitignore
diff --git a/packages/markdown/.npmignore b/packages/markdown/.npmignore
diff --git a/packages/markdown/.npmrc b/packages/markdown/.npmrc
diff --git a/packages/markdown/README.md b/packages/markdown/README.md
diff --git a/packages/markdown/demo/_app.js b/packages/markdown/demo/_app.js
diff --git a/packages/markdown/demo/index.mdx b/packages/markdown/demo/index.mdx
diff --git a/packages/markdown/index.js b/packages/markdown/index.js
diff --git a/packages/markdown/package.json b/packages/markdown/package.json