react-grid-system
Advanced tools
Comparing version 6.1.0 to 6.2.0
@@ -42,4 +42,3 @@ "use strict"; | ||
gridColumns = _ref.gridColumns; | ||
var styles = _objectSpread({ | ||
var styles = { | ||
boxSizing: 'border-box', | ||
@@ -51,3 +50,3 @@ minHeight: '1px', | ||
width: '100%' | ||
}, moreStyle); | ||
}; | ||
@@ -57,2 +56,3 @@ if (debug) { | ||
styles.background = 'rgba(0,0,0,.05)'; | ||
styles.lineHeight = '32px'; | ||
} | ||
@@ -86,5 +86,5 @@ | ||
return styles; | ||
return _objectSpread({}, styles, {}, moreStyle); | ||
}; | ||
exports.default = _default; |
@@ -25,4 +25,3 @@ "use strict"; | ||
moreStyle = _ref.moreStyle; | ||
var styles = _objectSpread({ | ||
var styles = { | ||
boxSizing: 'border-box', | ||
@@ -34,3 +33,3 @@ position: 'relative', | ||
paddingRight: "".concat(gutterWidth / 2, "px") | ||
}, moreStyle); | ||
}; | ||
@@ -57,3 +56,3 @@ if (fluid && !sm && !md && !lg && !xl) { | ||
return styles; | ||
return _objectSpread({}, styles, {}, moreStyle); | ||
}; | ||
@@ -60,0 +59,0 @@ |
@@ -34,4 +34,3 @@ "use strict"; | ||
if (justify === 'inherit') justifyContent = 'inherit'; | ||
var styles = _objectSpread({ | ||
var styles = { | ||
marginLeft: "-".concat(gutterWidth / 2, "px"), | ||
@@ -45,3 +44,3 @@ marginRight: "-".concat(gutterWidth / 2, "px"), | ||
justifyContent: justifyContent | ||
}, moreStyle); | ||
}; | ||
@@ -52,5 +51,5 @@ if (debug) { | ||
return styles; | ||
return _objectSpread({}, styles, {}, moreStyle); | ||
}; | ||
exports.default = _default; |
{ | ||
"name": "react-grid-system", | ||
"version": "6.1.0", | ||
"version": "6.2.0", | ||
"description": "A powerful Bootstrap-like responsive grid system for React.", | ||
@@ -5,0 +5,0 @@ "main": "./build/index.js", |
import { screenClasses } from '../../utils'; | ||
const hasWidth = widths => Object.keys(widths).reduce((acc, cur) => acc || widths[cur], false); | ||
const hasWidth = (widths) => Object.keys(widths).reduce((acc, cur) => acc || widths[cur], false); | ||
@@ -29,3 +29,2 @@ const getWidth = (width, gridColumns) => { | ||
width: '100%', | ||
...moreStyle, | ||
}; | ||
@@ -36,2 +35,3 @@ | ||
styles.background = 'rgba(0,0,0,.05)'; | ||
styles.lineHeight = '32px'; | ||
} | ||
@@ -66,3 +66,3 @@ | ||
return styles; | ||
return { ...styles, ...moreStyle }; | ||
}; |
@@ -20,3 +20,2 @@ export default ({ | ||
paddingRight: `${gutterWidth / 2}px`, | ||
...moreStyle, | ||
}; | ||
@@ -44,3 +43,3 @@ | ||
return styles; | ||
return { ...styles, ...moreStyle }; | ||
}; | ||
@@ -47,0 +46,0 @@ |
@@ -10,3 +10,3 @@ A powerful Bootstrap-like responsive grid system for React. | ||
``` | ||
<Container fluid style={{ lineHeight: '32px' }}> | ||
<Container fluid> | ||
<Row debug> | ||
@@ -28,3 +28,3 @@ <Col debug>1 of 2</Col> | ||
``` | ||
<Container fluid style={{ lineHeight: '32px' }}> | ||
<Container fluid> | ||
<Row debug> | ||
@@ -66,3 +66,3 @@ <Col md={1} debug>md=1</Col> | ||
``` | ||
<Container fluid style={{ lineHeight: '32px' }}> | ||
<Container fluid> | ||
<Row debug> | ||
@@ -89,3 +89,3 @@ <Col xs={12} md={8} debug>xs=12 md=8</Col> | ||
``` | ||
<Container fluid style={{ lineHeight: '32px' }}> | ||
<Container fluid> | ||
<Row debug> | ||
@@ -102,3 +102,3 @@ <Col xs={9} debug>xs=9</Col> | ||
``` | ||
<Container fluid style={{ lineHeight: '32px' }}> | ||
<Container fluid> | ||
<Row align="start" style={{ height: '75px' }} debug> | ||
@@ -122,3 +122,3 @@ <Col debug>1 of 3</Col> | ||
<br /> | ||
<Row align="stretch" debug> | ||
<Row align="stretch" style={{ height: '75px' }} debug> | ||
<Col debug>1 of 3</Col> | ||
@@ -134,3 +134,3 @@ <Col debug>2 of 3</Col> | ||
``` | ||
<Container fluid style={{ lineHeight: '32px' }}> | ||
<Container fluid> | ||
<Row justify="start" debug> | ||
@@ -183,3 +183,3 @@ <Col xs={3} debug>1 of 3</Col> | ||
``` | ||
<Container fluid style={{ lineHeight: '32px' }}> | ||
<Container fluid> | ||
<Row debug> | ||
@@ -204,3 +204,3 @@ <Col md={4} debug>md=4</Col> | ||
``` | ||
<Container fluid style={{ lineHeight: '32px' }}> | ||
<Container fluid> | ||
<Row debug> | ||
@@ -225,3 +225,3 @@ <Col sm={9} debug> | ||
``` | ||
<Container fluid style={{ lineHeight: '32px' }}> | ||
<Container fluid> | ||
<Row debug> | ||
@@ -237,3 +237,3 @@ <Col md={9} push={{ md: 3 }} debug>md=9 push-md=3</Col> | ||
``` | ||
<Container fluid style={{ lineHeight: '32px' }}> | ||
<Container fluid> | ||
<Row nogutter debug> | ||
@@ -254,3 +254,3 @@ <Col md={8} debug>md=8</Col> | ||
``` | ||
<Container fluid style={{ lineHeight: '32px' }}> | ||
<Container fluid> | ||
<Row debug> | ||
@@ -257,0 +257,0 @@ <Col debug>Logo (Flexible column)</Col> |
@@ -28,3 +28,2 @@ export default ({ | ||
justifyContent, | ||
...moreStyle, | ||
}; | ||
@@ -36,3 +35,3 @@ | ||
return styles; | ||
return { ...styles, ...moreStyle }; | ||
}; |
107838
1959