Dont pass gutter prop to div

jxnblk · Jul 5, 2016 · ddf9a99 · ddf9a99
1 parent 92795a8
commit ddf9a99
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 92 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 node_modules
 npm-debug.log
 dist/*
+docs/bundle.js
+docs/dev.js
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: node_js
 node_js:
-  - 4.3
-  - 5.6
+  - 6.2
 addons:
   firefox: '39.0'
   code_climate:

diff --git a/docs/bundle.js b/docs/bundle.js
diff --git a/docs/dev.js b/docs/dev.js
diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
     "mocha:watch": "mocha --watch --compilers js:babel-register",
     "standard": "standard",
     "start": "npm run docs:dev",
-    "test": "npm run mocha && npm run karma"
+    "test": "standard && npm run mocha && npm run karma"
   },
   "author": "Brent Jackson",
   "license": "MIT",

diff --git a/src/Base.js b/src/Base.js
@@ -11,6 +11,7 @@ const Base = ({
   is,
   _style,
   _className,
+  gutter,
   m, mt, mr, mb, ml, mx, my,
   p, pt, pr, pb, pl, px, py,
   ...props
@@ -21,7 +22,7 @@ const Base = ({
     { boxSizing: 'border-box' },
     style,
     _style,
-    margin({ m, mt, mr, mb, ml, mx, my }, scale),
+    margin({ gutter, m, mt, mr, mb, ml, mx, my }, scale),
     padding({ p, pt, pr, pb, pl, px, py }, scale)
   )
 

diff --git a/test/Base.spec.js b/test/Base.spec.js
@@ -94,6 +94,7 @@ describe('Base', () => {
           is='div'
           _style={{ color: 'black' }}
           _className='black'
+          gutter={1}
           m={1} mt={1} mr={1} mb={1} ml={1} mx={1} my={1}
           p={1} pt={1} pr={1} pb={1} pl={1} px={1} py={1}
         />