uip-design-system
Advanced tools
Comparing version 0.1.6 to 0.1.7
@@ -7,3 +7,3 @@ 'use strict'; | ||
var _templateObject = (0, _taggedTemplateLiteral3.default)(['\n ', '\n\n body {\n font-family: \'Campton-Book\', Helvetica, Arial, sans-serif;\n }\n\n a {\n color: #333;\n }\n\n h1,h2,h3,h4,h5,h6,p {\n margin-top: 0;\n }\n'], ['\n ', '\n\n body {\n font-family: \'Campton-Book\', Helvetica, Arial, sans-serif;\n }\n\n a {\n color: #333;\n }\n\n h1,h2,h3,h4,h5,h6,p {\n margin-top: 0;\n }\n']); | ||
var _templateObject = (0, _taggedTemplateLiteral3.default)(['\n ', '\n\n body {\n font-family: \'Campton-Book\', Helvetica, Arial, sans-serif;\n font-size: 18px;\n line-height: 1.5;\n }\n\n a {\n color: #333;\n }\n\n h1,h2,h3,h4,h5,h6,p {\n margin-top: 0;\n }\n'], ['\n ', '\n\n body {\n font-family: \'Campton-Book\', Helvetica, Arial, sans-serif;\n font-size: 18px;\n line-height: 1.5;\n }\n\n a {\n color: #333;\n }\n\n h1,h2,h3,h4,h5,h6,p {\n margin-top: 0;\n }\n']); | ||
@@ -10,0 +10,0 @@ var _styledComponents = require('styled-components'); |
@@ -7,2 +7,6 @@ 'use strict'; | ||
var _toConsumableArray2 = require('/Users/jonespen/Sites/github/urbaninfrastucture/uip-design-system/node_modules/babel-runtime/helpers/toConsumableArray'); | ||
var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2); | ||
var _taggedTemplateLiteral2 = require('/Users/jonespen/Sites/github/urbaninfrastucture/uip-design-system/node_modules/babel-runtime/helpers/taggedTemplateLiteral'); | ||
@@ -30,4 +34,2 @@ | ||
var getPercentageWidth = function getPercentageWidth(cols) { | ||
console.log('cols', cols); | ||
// if no cols, return nothing | ||
@@ -57,7 +59,7 @@ if (!cols) { | ||
GridCell.propTypes = { | ||
xs: _react.PropTypes.oneOf(_constants.VALID_COL_NUMBERS), | ||
sm: _react.PropTypes.oneOf(_constants.VALID_COL_NUMBERS), | ||
md: _react.PropTypes.oneOf(_constants.VALID_COL_NUMBERS) | ||
xs: _react.PropTypes.oneOf([true].concat((0, _toConsumableArray3.default)(_constants.VALID_COL_NUMBERS))), | ||
sm: _react.PropTypes.oneOf([true].concat((0, _toConsumableArray3.default)(_constants.VALID_COL_NUMBERS))), | ||
md: _react.PropTypes.oneOf([true].concat((0, _toConsumableArray3.default)(_constants.VALID_COL_NUMBERS))) | ||
}; | ||
exports.default = GridCell; |
@@ -16,4 +16,4 @@ 'use strict'; | ||
var _templateObject = (0, _taggedTemplateLiteral3.default)(['\n box-sizing: border-box;\n display: flex; /* 1 */\n flex-flow: row wrap;\n margin: ', ';\n padding: 0;\n > * {\n ', ';\n }\n ', '\n ', '\n ', '\n'], ['\n box-sizing: border-box;\n display: flex; /* 1 */\n flex-flow: row wrap;\n margin: ', ';\n padding: 0;\n > * {\n ', ';\n }\n ', '\n ', '\n ', '\n']), | ||
_templateObject2 = (0, _taggedTemplateLiteral3.default)(['\n ', '\n '], ['\n ', '\n ']); | ||
var _templateObject = (0, _taggedTemplateLiteral3.default)(['\n box-sizing: border-box;\n display: flex;\n flex-flow: row wrap;\n margin: ', ';\n padding: 0;\n > * {\n ', ';\n }\n ', '\n ', '\n ', '\n ', '\n'], ['\n box-sizing: border-box;\n display: flex;\n flex-flow: row wrap;\n margin: ', ';\n padding: 0;\n > * {\n ', ';\n }\n ', '\n ', '\n ', '\n ', '\n']), | ||
_templateObject2 = (0, _taggedTemplateLiteral3.default)(['\n ', '\n ', '\n '], ['\n ', '\n ', '\n ']); | ||
@@ -38,4 +38,6 @@ var _react = require('/Users/jonespen/Sites/github/urbaninfrastucture/uip-design-system/node_modules/react/react.js'); | ||
var centered = '\n justify-content: center;\n text-align: center;\n'; | ||
var centered = '\n justify-content: center;\n'; | ||
var end = '\n justify-content: flex-end;\n'; | ||
var Grid = _styledComponents2.default.div(_templateObject, function (props) { | ||
@@ -47,6 +49,12 @@ return props.withGutter ? '0 -' + _constants.GUTTER_SIZE / 2 + 'px' : 0; | ||
return props.center && props.center === 'xs' && centered; | ||
}, function (props) { | ||
return props.end && props.end === 'xs' && end; | ||
}, _utils.media.sm(_templateObject2, function (props) { | ||
return props.center && props.center === 'sm' && centered; | ||
}, function (props) { | ||
return props.end && props.end === 'sm' && end; | ||
}), _utils.media.md(_templateObject2, function (props) { | ||
return props.center && props.center === 'md' && centered; | ||
}, function (props) { | ||
return props.end && props.end === 'sm' && end; | ||
})); | ||
@@ -56,3 +64,4 @@ | ||
withGutter: _react.PropTypes.bool, | ||
center: _react.PropTypes.oneOf((0, _keys2.default)(_constants.BREAKPOINTS)) | ||
center: _react.PropTypes.oneOf((0, _keys2.default)(_constants.BREAKPOINTS)), | ||
end: _react.PropTypes.oneOf((0, _keys2.default)(_constants.BREAKPOINTS)) | ||
}; | ||
@@ -59,0 +68,0 @@ |
{ | ||
"name": "uip-design-system", | ||
"version": "0.1.6", | ||
"version": "0.1.7", | ||
"description": "Design system for Urban Infrastructure Partner", | ||
@@ -26,2 +26,3 @@ "files": [ | ||
"babel-jest": "^18.0.0", | ||
"cross-env": "^3.1.4", | ||
"enzyme": "^2.7.0", | ||
@@ -31,4 +32,3 @@ "jest": "^18.1.0", | ||
"react-addons-test-utils": "^15.4.2", | ||
"styled-components": "^1.2.1", | ||
"cross-env": "^3.1.4" | ||
"styled-components": "^1.2.1" | ||
}, | ||
@@ -38,3 +38,4 @@ "peerDependencies": { | ||
"react-dom": "^15.0.0" | ||
} | ||
}, | ||
"dependencies": {} | ||
} |
@@ -9,2 +9,4 @@ import { injectGlobal } from 'styled-components'; | ||
font-family: 'Campton-Book', Helvetica, Arial, sans-serif; | ||
font-size: 18px; | ||
line-height: 1.5; | ||
} | ||
@@ -11,0 +13,0 @@ |
@@ -7,4 +7,2 @@ import React, { PropTypes } from 'react'; | ||
const getPercentageWidth = (cols) => { | ||
console.log('cols', cols); | ||
// if no cols, return nothing | ||
@@ -45,7 +43,7 @@ if(!cols){ | ||
GridCell.propTypes = { | ||
xs: PropTypes.oneOf(VALID_COL_NUMBERS), | ||
sm: PropTypes.oneOf(VALID_COL_NUMBERS), | ||
md: PropTypes.oneOf(VALID_COL_NUMBERS), | ||
xs: PropTypes.oneOf([true, ...VALID_COL_NUMBERS]), | ||
sm: PropTypes.oneOf([true, ...VALID_COL_NUMBERS]), | ||
md: PropTypes.oneOf([true, ...VALID_COL_NUMBERS]), | ||
} | ||
export default GridCell; |
@@ -9,8 +9,11 @@ import React, { PropTypes } from 'react'; | ||
justify-content: center; | ||
text-align: center; | ||
`; | ||
const end = ` | ||
justify-content: flex-end; | ||
`; | ||
const Grid = styled.div` | ||
box-sizing: border-box; | ||
display: flex; /* 1 */ | ||
display: flex; | ||
flex-flow: row wrap; | ||
@@ -23,7 +26,10 @@ margin: ${(props) => props.withGutter ? `0 -${GUTTER_SIZE/2}px` : 0}; | ||
${(props) => props.center && props.center === 'xs' && centered} | ||
${(props) => props.end && props.end === 'xs' && end} | ||
${media.sm` | ||
${(props) => props.center && props.center === 'sm' && centered} | ||
${(props) => props.end && props.end === 'sm' && end} | ||
`} | ||
${media.md` | ||
${(props) => props.center && props.center === 'md' && centered} | ||
${(props) => props.end && props.end === 'sm' && end} | ||
`} | ||
@@ -34,3 +40,4 @@ `; | ||
withGutter: PropTypes.bool, | ||
center: PropTypes.oneOf(Object.keys(BREAKPOINTS)) | ||
center: PropTypes.oneOf(Object.keys(BREAKPOINTS)), | ||
end: PropTypes.oneOf(Object.keys(BREAKPOINTS)), | ||
} | ||
@@ -37,0 +44,0 @@ |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
21463
343