Merge pull request #27 from nordnet/noPadding-on-grid

feat: noPadding on grid
nordnet · Mar 19, 2018 · f5b79f4 · f5b79f4
2 parents b9702bf + e29f9ce
commit f5b79f4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/col/index.js b/src/col/index.js
@@ -12,7 +12,6 @@ function Col({
   className: classNameCustom,
   children,
   componentClass: ComponentClass,
-
   reverse,
   xs,
   sm,
@@ -56,16 +55,12 @@ function Col({
       [classes['sm-last']]: smLast,
       [classes['md-last']]: mdLast,
       [classes['lg-last']]: lgLast,
-      [classes['noPadding']]: noPadding,
+      [classes.noPadding]: noPadding,
     },
     classNameCustom,
   );
 
-  return (
-    <ComponentClass className={className}>
-      {children}
-    </ComponentClass>
-  );
+  return <ComponentClass className={className}>{children}</ComponentClass>;
 }
 
 Col.propTypes = {

diff --git a/src/grid/index.js b/src/grid/index.js
@@ -12,11 +12,13 @@ function Grid({
   style,
   children,
   componentClass: ComponentClass,
+  noPadding,
 }) {
   const className = cn(
     {
       [classes.grid]: !fluid,
       [classes.gridFluid]: fluid,
+      [classes.noPadding]: noPadding,
     },
     classNameCustom,
   );
@@ -35,6 +37,7 @@ Grid.propTypes = {
   style: PropTypes.object,
   children: PropTypes.node,
   componentClass: PropTypes.oneOfType([PropTypes.element, PropTypes.string]),
+  noPadding: PropTypes.bool,
 };
 
 Grid.defaultProps = {

diff --git a/src/grid/styles.js b/src/grid/styles.js
@@ -9,6 +9,9 @@ const styles = {
     boxSizing: 'border-box',
     margin: '0 auto',
   },
+  noPadding: {
+    padding: 0,
+  },
 };
 
 Object.keys(breakpoints).forEach(breakpoint => {