Merge branch 'master' of https://github.com/yldio/joyent-portal
This commit is contained in:
JUDIT GRESKOVITS
commit
d93ab9eb74
|
|
@ -25,7 +25,7 @@
|
|||
"precommit": "run-s lint lint-staged test",
|
||||
"dev:ui-toolkit": "lerna run watch --scope joyent-ui-toolkit",
|
||||
"dev:cp-frontend": "lerna run start --scope joyent-cp-frontend",
|
||||
"dev:gql-mock-server": "lerna run start --scope joyent-cp-gql-mock-server",
|
||||
"dev:gql-mock-server": "lerna run dev --scope joyent-cp-gql-mock-server",
|
||||
"dev": "run-p dev:*"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
|
|
|||
|
|
@ -3,5 +3,11 @@
|
|||
All notable changes to this project will be documented in this file.
|
||||
See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
||||
|
||||
<a name="1.0.4"></a>
|
||||
## 1.0.4 (2017-05-25)
|
||||
|
||||
|
||||
|
||||
|
||||
<a name="1.0.3"></a>
|
||||
## 1.0.3 (2017-05-25)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "cloudapi-gql",
|
||||
"version": "1.0.3",
|
||||
"version": "1.0.4",
|
||||
"private": true,
|
||||
"license": "MPL-2.0",
|
||||
"repository": "github:yldio/joyent-portal",
|
||||
|
|
|
|||
|
|
@ -3,5 +3,22 @@
|
|||
All notable changes to this project will be documented in this file.
|
||||
See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
||||
|
||||
<a name="1.1.0"></a>
|
||||
# 1.1.0 (2017-05-25)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **cp-frontend:** gracefully handle multiple postinstall executions ([73899b2](https://github.com/yldio/joyent-portal/commit/73899b2))
|
||||
* **cp-frontend:** use `postinstall` hook to patch react-scripts ([d2ac10a](https://github.com/yldio/joyent-portal/commit/d2ac10a))
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **cp-frontend,ui-toolkit:** style inheritance using `.extend` (#458) ([f3e531d](https://github.com/yldio/joyent-portal/commit/f3e531d))
|
||||
|
||||
|
||||
|
||||
|
||||
<a name="1.0.3"></a>
|
||||
## 1.0.3 (2017-05-25)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "joyent-cp-frontend",
|
||||
"version": "1.0.3",
|
||||
"version": "1.1.0",
|
||||
"private": true,
|
||||
"license": "MPL-2.0",
|
||||
"repository": "github:yldio/joyent-portal",
|
||||
|
|
@ -20,8 +20,8 @@
|
|||
"babel-plugin-styled-components": "^1.1.4",
|
||||
"constant-case": "^2.0.0",
|
||||
"graphql-tag": "^2.0.0",
|
||||
"joyent-ui-toolkit": "^1.0.3",
|
||||
"normalized-styled-components": "^1.0.4",
|
||||
"joyent-ui-toolkit": "^1.1.0",
|
||||
"normalized-styled-components": "^1.0.5",
|
||||
"prop-types": "^15.5.10",
|
||||
"react": "^15.5.4",
|
||||
"react-apollo": "^1.2.0",
|
||||
|
|
@ -33,12 +33,12 @@
|
|||
"redux": "^3.6.0",
|
||||
"redux-actions": "^2.0.3",
|
||||
"redux-form": "^6.7.0",
|
||||
"remcalc": "^1.0.4",
|
||||
"remcalc": "^1.0.5",
|
||||
"reselect": "^3.0.1",
|
||||
"simple-statistics": "^4.1.0",
|
||||
"styled-components": "^2.0.0",
|
||||
"styled-is": "^1.0.6",
|
||||
"unitcalc": "^1.0.4"
|
||||
"styled-is": "^1.0.7",
|
||||
"unitcalc": "^1.0.5"
|
||||
},
|
||||
"devDependencies": {
|
||||
"apr-main": "^1.0.7",
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import { Grid } from 'react-styled-flexboxgrid';
|
|||
|
||||
import { breakpoints } from 'joyent-ui-toolkit';
|
||||
|
||||
export default styled(Grid)`
|
||||
export default Grid.extend`
|
||||
padding: 2rem;
|
||||
|
||||
${breakpoints.large`
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ const StyledDiv = styled.div`
|
|||
margin-bottom: ${remcalc(18)};
|
||||
`;
|
||||
|
||||
const StyledH2 = styled(H2)`
|
||||
const StyledH2 = H2.extend`
|
||||
color: ${props => props.theme.primary};
|
||||
margin: 0;
|
||||
`;
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ const StyledHeader = styled.div`
|
|||
padding: ${unitcalc(2.5)} ${unitcalc(3)} ${unitcalc(2)} ${unitcalc(3)};
|
||||
`;
|
||||
|
||||
const StyledLogo = styled(Img)`
|
||||
const StyledLogo = Img.extend`
|
||||
width: ${remcalc(87)};
|
||||
height: ${remcalc(25)};
|
||||
`;
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@ import remcalc from 'remcalc';
|
|||
import { breakpoints, Ul, Li } from 'joyent-ui-toolkit';
|
||||
import { LayoutContainer } from '@components/layout';
|
||||
|
||||
const StyledHorizontalList = styled(Ul)`
|
||||
const StyledHorizontalList = Ul.extend`
|
||||
padding: 0;
|
||||
`;
|
||||
|
||||
const StyledHorizontalListItem = styled(Li)`
|
||||
const StyledHorizontalListItem = Li.extend`
|
||||
${breakpoints.smallOnly`
|
||||
display: block;
|
||||
`}
|
||||
|
|
|
|||
|
|
@ -20,17 +20,17 @@ import {
|
|||
|
||||
// import { servicesForTopologySelector } from '@state/selectors';
|
||||
|
||||
const StyledLegend = styled(Legend)`
|
||||
const StyledLegend = Legend.extend`
|
||||
float: left;
|
||||
padding-top: ${unitcalc(2)};
|
||||
margin-right: ${unitcalc(1.5)};
|
||||
`;
|
||||
|
||||
const PaddedRow = styled(Row)`
|
||||
const PaddedRow = Row.extend`
|
||||
margin-bottom: ${remcalc(18)}
|
||||
`;
|
||||
|
||||
const StyledForm = styled(FormGroup)`
|
||||
const StyledForm = FormGroup.extend`
|
||||
width: 60%;
|
||||
float: left;
|
||||
margin: 0;
|
||||
|
|
|
|||
|
|
@ -3,5 +3,11 @@
|
|||
All notable changes to this project will be documented in this file.
|
||||
See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
||||
|
||||
<a name="1.0.4"></a>
|
||||
## 1.0.4 (2017-05-25)
|
||||
|
||||
|
||||
|
||||
|
||||
<a name="1.0.3"></a>
|
||||
## 1.0.3 (2017-05-25)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "joyent-cp-gql-mock-server",
|
||||
"version": "1.0.3",
|
||||
"version": "1.0.4",
|
||||
"private": true,
|
||||
"license": "MPL-2.0",
|
||||
"repository": "github:yldio/joyent-portal",
|
||||
|
|
@ -8,7 +8,8 @@
|
|||
"scripts": {
|
||||
"lint": "eslint . --fix --format=tap",
|
||||
"test": "exit 0",
|
||||
"start": "node src/index.js"
|
||||
"start": "node src/index.js",
|
||||
"dev": "nodemon src/index.js"
|
||||
},
|
||||
"dependencies": {
|
||||
"good": "^7.2.0",
|
||||
|
|
@ -19,10 +20,11 @@
|
|||
"graphql-tools": "^0.11.0",
|
||||
"hapi": "^16.1.1",
|
||||
"joi": "^10.5.0",
|
||||
"joyent-cp-gql-schema": "^1.0.3"
|
||||
"joyent-cp-gql-schema": "^1.0.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
"eslint": "^3.19.0",
|
||||
"eslint-config-joyent-portal": "1.0.0"
|
||||
"eslint-config-joyent-portal": "1.0.0",
|
||||
"nodemon": "^1.11.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -3,5 +3,11 @@
|
|||
All notable changes to this project will be documented in this file.
|
||||
See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
||||
|
||||
<a name="1.0.4"></a>
|
||||
## 1.0.4 (2017-05-25)
|
||||
|
||||
|
||||
|
||||
|
||||
<a name="1.0.3"></a>
|
||||
## 1.0.3 (2017-05-25)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "joyent-cp-gql-schema",
|
||||
"version": "1.0.3",
|
||||
"version": "1.0.4",
|
||||
"private": true,
|
||||
"license": "MPL-2.0",
|
||||
"repository": "github:yldio/joyent-portal",
|
||||
|
|
|
|||
|
|
@ -3,5 +3,11 @@
|
|||
All notable changes to this project will be documented in this file.
|
||||
See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
||||
|
||||
<a name="1.0.4"></a>
|
||||
## 1.0.4 (2017-05-25)
|
||||
|
||||
|
||||
|
||||
|
||||
<a name="1.0.3"></a>
|
||||
## 1.0.3 (2017-05-25)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "joyent-cp-rdb-bootstrap",
|
||||
"version": "1.0.3",
|
||||
"version": "1.0.4",
|
||||
"private": true,
|
||||
"license": "MPL-2.0",
|
||||
"repository": "github:yldio/joyent-portal",
|
||||
|
|
|
|||
|
|
@ -3,5 +3,11 @@
|
|||
All notable changes to this project will be documented in this file.
|
||||
See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
||||
|
||||
<a name="1.0.5"></a>
|
||||
## 1.0.5 (2017-05-25)
|
||||
|
||||
|
||||
|
||||
|
||||
<a name="1.0.4"></a>
|
||||
## 1.0.4 (2017-05-25)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "normalized-styled-components",
|
||||
"version": "1.0.4",
|
||||
"version": "1.0.5",
|
||||
"license": "MPL-2.0",
|
||||
"description": "normalize.css with a styled-components mindset",
|
||||
"keywords": [
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
"prepublish": "run-s build"
|
||||
},
|
||||
"dependencies": {
|
||||
"remcalc": "^1.0.4"
|
||||
"remcalc": "^1.0.5"
|
||||
},
|
||||
"devDependencies": {
|
||||
"babel-plugin-styled-components": "^1.1.4",
|
||||
|
|
|
|||
|
|
@ -3,5 +3,11 @@
|
|||
All notable changes to this project will be documented in this file.
|
||||
See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
||||
|
||||
<a name="1.0.6"></a>
|
||||
## 1.0.6 (2017-05-25)
|
||||
|
||||
|
||||
|
||||
|
||||
<a name="1.0.5"></a>
|
||||
## 1.0.5 (2017-05-25)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "pseudo-json-ast",
|
||||
"version": "1.0.5",
|
||||
"version": "1.0.6",
|
||||
"license": "MPL-2.0",
|
||||
"description": "Parse a JSON string into an object with location properties",
|
||||
"keywords": [
|
||||
|
|
|
|||
|
|
@ -3,5 +3,11 @@
|
|||
All notable changes to this project will be documented in this file.
|
||||
See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
||||
|
||||
<a name="1.0.6"></a>
|
||||
## 1.0.6 (2017-05-25)
|
||||
|
||||
|
||||
|
||||
|
||||
<a name="1.0.5"></a>
|
||||
## 1.0.5 (2017-05-25)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "pseudo-yaml-ast",
|
||||
"version": "1.0.5",
|
||||
"version": "1.0.6",
|
||||
"license": "MPL-2.0",
|
||||
"description": "Parse a YAML string into an object with location properties",
|
||||
"keywords": [
|
||||
|
|
|
|||
|
|
@ -3,5 +3,11 @@
|
|||
All notable changes to this project will be documented in this file.
|
||||
See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
||||
|
||||
<a name="1.0.5"></a>
|
||||
## 1.0.5 (2017-05-25)
|
||||
|
||||
|
||||
|
||||
|
||||
<a name="1.0.4"></a>
|
||||
## 1.0.4 (2017-05-25)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "remcalc",
|
||||
"version": "1.0.4",
|
||||
"version": "1.0.5",
|
||||
"license": "MPL-2.0",
|
||||
"description": "Calculate the `rem`'s from `px` values",
|
||||
"keywords": [
|
||||
|
|
|
|||
|
|
@ -3,5 +3,11 @@
|
|||
All notable changes to this project will be documented in this file.
|
||||
See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
||||
|
||||
<a name="1.0.5"></a>
|
||||
## 1.0.5 (2017-05-25)
|
||||
|
||||
|
||||
|
||||
|
||||
<a name="1.0.4"></a>
|
||||
## 1.0.4 (2017-05-25)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "rnd-id",
|
||||
"version": "1.0.4",
|
||||
"version": "1.0.5",
|
||||
"license": "MPL-2.0",
|
||||
"description": "Generate a random alpha string",
|
||||
"keywords": [
|
||||
|
|
|
|||
|
|
@ -3,6 +3,17 @@
|
|||
All notable changes to this project will be documented in this file.
|
||||
See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
||||
|
||||
<a name="1.0.7"></a>
|
||||
## 1.0.7 (2017-05-25)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **styled-is:** correct package entrypoints ([44a2f2e](https://github.com/yldio/joyent-portal/commit/44a2f2e))
|
||||
|
||||
|
||||
|
||||
|
||||
<a name="1.0.6"></a>
|
||||
## 1.0.6 (2017-05-25)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "styled-is",
|
||||
"version": "1.0.6",
|
||||
"version": "1.0.7",
|
||||
"license": "MPL-2.0",
|
||||
"description": "Flag utility for styled-components",
|
||||
"keywords": [
|
||||
|
|
|
|||
|
|
@ -3,6 +3,23 @@
|
|||
All notable changes to this project will be documented in this file.
|
||||
See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
||||
|
||||
<a name="1.1.0"></a>
|
||||
# 1.1.0 (2017-05-25)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **ui-toolkit:** compile on postinstall ([7bf95fd](https://github.com/yldio/joyent-portal/commit/7bf95fd))
|
||||
* **ui-toolkit:** copy fonts before compiling ([19f3678](https://github.com/yldio/joyent-portal/commit/19f3678))
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **cp-frontend,ui-toolkit:** style inheritance using `.extend` (#458) ([f3e531d](https://github.com/yldio/joyent-portal/commit/f3e531d))
|
||||
|
||||
|
||||
|
||||
|
||||
<a name="1.0.3"></a>
|
||||
## 1.0.3 (2017-05-25)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "joyent-ui-toolkit",
|
||||
"version": "1.0.3",
|
||||
"version": "1.1.0",
|
||||
"private": true,
|
||||
"license": "MPL-2.0",
|
||||
"repository": "github:yldio/joyent-portal",
|
||||
|
|
@ -16,13 +16,13 @@
|
|||
"watch": "cross-env NODE_ENV=development run-s copy-fonts \"compile -- --watch\"",
|
||||
"styleguide:build": "cross-env NODE_ENV=production styleguidist build",
|
||||
"styleguide": "cross-env NODE_ENV=development styleguidist server",
|
||||
"prepare": "cross-env NODE_ENV=production run-s copy-fonts compile"
|
||||
"postinstall": "cross-env NODE_ENV=production run-s copy-fonts compile"
|
||||
},
|
||||
"dependencies": {
|
||||
"camel-case": "^3.0.0",
|
||||
"d3": "^4.9.1",
|
||||
"lodash.isstring": "^4.0.1",
|
||||
"normalized-styled-components": "^1.0.4",
|
||||
"normalized-styled-components": "^1.0.5",
|
||||
"polished": "^1.1.2",
|
||||
"prop-types": "^15.5.10",
|
||||
"react": "^15.5.4",
|
||||
|
|
@ -31,11 +31,11 @@
|
|||
"react-router-dom": "^4.1.1",
|
||||
"react-styled-flexboxgrid": "^1.1.2",
|
||||
"redux-form": "^6.7.0",
|
||||
"remcalc": "^1.0.4",
|
||||
"rnd-id": "^1.0.4",
|
||||
"remcalc": "^1.0.5",
|
||||
"rnd-id": "^1.0.5",
|
||||
"styled-components": "^2.0.0",
|
||||
"styled-is": "^1.0.6",
|
||||
"unitcalc": "^1.0.4"
|
||||
"styled-is": "^1.0.7",
|
||||
"unitcalc": "^1.0.5"
|
||||
},
|
||||
"devDependencies": {
|
||||
"babel-cli": "^6.24.1",
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ const style = css`
|
|||
`}
|
||||
`;
|
||||
|
||||
const StyledAnchor = styled(A)`
|
||||
const StyledAnchor = A.extend`
|
||||
${style}
|
||||
`;
|
||||
|
||||
|
|
|
|||
|
|
@ -28,6 +28,6 @@ const unitsFromProps = props =>
|
|||
)
|
||||
.join(';\n');
|
||||
|
||||
export default Component => styled(Component)`
|
||||
${unitsFromProps}
|
||||
`;
|
||||
export default Component => Component.extend
|
||||
? Component.extend`${unitsFromProps}`
|
||||
: styled(Component)`${unitsFromProps}`;
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ const style = css`
|
|||
`}
|
||||
`;
|
||||
|
||||
const StyledButton = styled(NButton)`
|
||||
const StyledButton = NButton.extend`
|
||||
min-width: ${remcalc(120)};
|
||||
${style}
|
||||
|
||||
|
|
@ -157,7 +157,7 @@ const StyledButton = styled(NButton)`
|
|||
}
|
||||
`;
|
||||
|
||||
const StyledAnchor = styled(A)`
|
||||
const StyledAnchor = A.extend`
|
||||
display: inline-block;
|
||||
${style}
|
||||
`;
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ import { Row } from 'react-styled-flexboxgrid';
|
|||
import PropTypes from 'prop-types';
|
||||
import React from 'react';
|
||||
|
||||
const StyledCard = styled(Row)`
|
||||
const StyledCard = Row.extend`
|
||||
position: relative;
|
||||
height: auto;
|
||||
min-height: ${remcalc(126)};
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import PropTypes from 'prop-types';
|
|||
import Title from './title';
|
||||
import React from 'react';
|
||||
|
||||
const StyledTitle = styled(Title)`
|
||||
const StyledTitle = Title.extend`
|
||||
${typography.fontFamily};
|
||||
${typography.normal};
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import Baseline from '../baseline';
|
|||
import View from './view';
|
||||
import React from 'react';
|
||||
|
||||
const StyledView = styled(View)`
|
||||
const StyledView = View.extend`
|
||||
display: block;
|
||||
padding: ${remcalc(62, 23, 5, 23)};
|
||||
background-color: ${props => props.grey};
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import PropTypes from 'prop-types';
|
|||
import Baseline from '../baseline';
|
||||
import Card from './card';
|
||||
|
||||
const StyledCard = styled(Card)`
|
||||
const StyledCard = Card.extend`
|
||||
position: absolute;
|
||||
|
||||
background-color: ${props => props.theme.primary};
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import PropTypes from 'prop-types';
|
|||
import View from './view';
|
||||
import React from 'react';
|
||||
|
||||
const InnerRow = styled(Row)`
|
||||
const InnerRow = Row.extend`
|
||||
display: block;
|
||||
height: 100%;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import PropTypes from 'prop-types';
|
|||
import Button from '../button';
|
||||
import React from 'react';
|
||||
|
||||
const StyledNav = styled(Nav)`
|
||||
const StyledNav = Nav.extend`
|
||||
flex: 0 0 ${remcalc(47)};
|
||||
border-left: ${remcalc(1)} solid ${props => props.theme.grey};
|
||||
box-sizing: border-box;
|
||||
|
|
@ -18,7 +18,7 @@ const StyledNav = styled(Nav)`
|
|||
`};
|
||||
`;
|
||||
|
||||
const StyledButton = styled(Button)`
|
||||
const StyledButton = Button.extend`
|
||||
position: relative;
|
||||
border-width: 0;
|
||||
box-shadow: none;
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import styled from 'styled-components';
|
|||
import PropTypes from 'prop-types';
|
||||
import React from 'react';
|
||||
|
||||
const StyledCol = styled(Col)`
|
||||
const StyledCol = Col.extend`
|
||||
${typography.fontFamily};
|
||||
${typography.normal};
|
||||
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ const Span = styled.span`
|
|||
`};
|
||||
`;
|
||||
|
||||
const StyledTitle = styled(Title)`
|
||||
const StyledTitle = Title.extend`
|
||||
display: inline-block;
|
||||
padding: 0 ${remcalc(18)};
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import { Row } from 'react-styled-flexboxgrid';
|
|||
import PropTypes from 'prop-types';
|
||||
import React from 'react';
|
||||
|
||||
const StyledView = styled(Row)`
|
||||
const StyledView = Row.extend`
|
||||
flex: 1;
|
||||
margin: 0;
|
||||
height: auto;
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ import unitcalc from 'unitcalc';
|
|||
import is from 'styled-is';
|
||||
import rndId from 'rnd-id';
|
||||
|
||||
const StyledInput = styled(Input)`
|
||||
const StyledInput = Input.extend`
|
||||
display: none;
|
||||
|
||||
&:checked + label::after {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import styled from 'styled-components';
|
|||
import { Fieldset } from 'normalized-styled-components';
|
||||
import Baseline from '../baseline';
|
||||
|
||||
const StyledFieldset = styled(Fieldset)`
|
||||
const StyledFieldset = Fieldset.extend`
|
||||
display: inline-block;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import styled from 'styled-components';
|
|||
import remcalc from 'remcalc';
|
||||
import Label from '../label';
|
||||
|
||||
const StyledLabel = styled(Label)`
|
||||
const StyledLabel = Label.extend`
|
||||
margin-right: ${remcalc(12)};
|
||||
`;
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import { Legend } from 'normalized-styled-components';
|
|||
import Baseline from '../baseline';
|
||||
import typography from '../typography';
|
||||
|
||||
const StyledLegend = styled(Legend)`
|
||||
const StyledLegend = Legend.extend`
|
||||
${typography.fontFamily};
|
||||
${typography.semibold};
|
||||
`;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import Label from '../label';
|
|||
import PropTypes from 'prop-types';
|
||||
import React from 'react';
|
||||
|
||||
const StyledLabel = styled(Label)`
|
||||
const StyledLabel = Label.extend`
|
||||
${breakpoints.medium`
|
||||
text-align: right;
|
||||
`};
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ import Baseline from '../baseline';
|
|||
import BaseInput from './base/input';
|
||||
import typography from '../typography';
|
||||
|
||||
const StyledInput = styled(Input)`
|
||||
const StyledInput = Input.extend`
|
||||
display: none;
|
||||
|
||||
&:checked + label {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import styled, { ThemeProvider, injectGlobal } from 'styled-components';
|
|||
import theme from '../theme';
|
||||
import Base, { global } from '../base';
|
||||
|
||||
const StyledBase = styled(Base)`
|
||||
const StyledBase = Base.extend`
|
||||
background-color: transparent;
|
||||
`;
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import { H1 as NH1 } from 'normalized-styled-components';
|
|||
import remcalc from 'remcalc';
|
||||
import typography from '../typography';
|
||||
|
||||
export const H1 = styled(NH1)`
|
||||
export const H1 = NH1.extend`
|
||||
${typography.fontFamily};
|
||||
${typography.medium};
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import { Small } from 'normalized-styled-components';
|
|||
import remcalc from 'remcalc';
|
||||
import typography from '../typography';
|
||||
|
||||
export default styled(Small)`
|
||||
export default Small.extend`
|
||||
${typography.fontFamily};
|
||||
${typography.normal};
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ const Preview = styled.div`
|
|||
width: 100%;
|
||||
`;
|
||||
|
||||
const Paragraph = styled(P)`
|
||||
const Paragraph = P.extend`
|
||||
margin: 0;
|
||||
`;
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ import TopologyLink from './link';
|
|||
import TopologyLinkArrow from './link/arrow';
|
||||
import { calculateLineLayout } from './link/functions';
|
||||
|
||||
const StyledSvg = styled(Svg)`
|
||||
const StyledSvg = Svg.extend`
|
||||
width: 100%;
|
||||
height: 1400px;
|
||||
`;
|
||||
|
|
|
|||
|
|
@ -3,5 +3,11 @@
|
|||
All notable changes to this project will be documented in this file.
|
||||
See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
||||
|
||||
<a name="1.0.5"></a>
|
||||
## 1.0.5 (2017-05-25)
|
||||
|
||||
|
||||
|
||||
|
||||
<a name="1.0.4"></a>
|
||||
## 1.0.4 (2017-05-25)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "unitcalc",
|
||||
"version": "1.0.4",
|
||||
"version": "1.0.5",
|
||||
"license": "MPL-2.0",
|
||||
"description": "Calculate the `rem`'s from unit values",
|
||||
"keywords": [
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
},
|
||||
"dependencies": {
|
||||
"lodash.flatten": "^4.4.0",
|
||||
"remcalc": "^1.0.4"
|
||||
"remcalc": "^1.0.5"
|
||||
},
|
||||
"devDependencies": {
|
||||
"ava": "0.19.1",
|
||||
|
|
|
|||
Loading…
Reference in New Issue