mpana/copilot
1
0
Fork 0
mirror of https://github.com/yldio/copilot.git synced 2024-09-21 13:53:51 +03:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/yldio/joyent-portal

Browse Source
This commit is contained in:
JUDIT GRESKOVITS 2017-05-25 17:49:56 +01:00
commit d93ab9eb74
56 changed files with 1177 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -25,7 +25,7 @@
"precommit": "run-s lint lint-staged test", "precommit": "run-s lint lint-staged test",
"dev:ui-toolkit": "lerna run watch --scope joyent-ui-toolkit", "dev:ui-toolkit": "lerna run watch --scope joyent-ui-toolkit",
"dev:cp-frontend": "lerna run start --scope joyent-cp-frontend", "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:*" "dev": "run-p dev:*"
}, },
"devDependencies": { "devDependencies": {

6
packages/cloudapi-gql/CHANGELOG.md
View File

@ -3,5 +3,11 @@
All notable changes to this project will be documented in this file. 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. 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> <a name="1.0.3"></a>
## 1.0.3 (2017-05-25) ## 1.0.3 (2017-05-25)

2
packages/cloudapi-gql/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "cloudapi-gql", "name": "cloudapi-gql",
"version": "1.0.3", "version": "1.0.4",
"private": true, "private": true,
"license": "MPL-2.0", "license": "MPL-2.0",
"repository": "github:yldio/joyent-portal", "repository": "github:yldio/joyent-portal",

17
packages/cp-frontend/CHANGELOG.md
View File

@ -3,5 +3,22 @@
All notable changes to this project will be documented in this file. 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. 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> <a name="1.0.3"></a>
## 1.0.3 (2017-05-25) ## 1.0.3 (2017-05-25)

12
packages/cp-frontend/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "joyent-cp-frontend", "name": "joyent-cp-frontend",
"version": "1.0.3", "version": "1.1.0",
"private": true, "private": true,
"license": "MPL-2.0", "license": "MPL-2.0",
"repository": "github:yldio/joyent-portal", "repository": "github:yldio/joyent-portal",
@ -20,8 +20,8 @@
"babel-plugin-styled-components": "^1.1.4", "babel-plugin-styled-components": "^1.1.4",
"constant-case": "^2.0.0", "constant-case": "^2.0.0",
"graphql-tag": "^2.0.0", "graphql-tag": "^2.0.0",
"joyent-ui-toolkit": "^1.0.3", "joyent-ui-toolkit": "^1.1.0",
"normalized-styled-components": "^1.0.4", "normalized-styled-components": "^1.0.5",
"prop-types": "^15.5.10", "prop-types": "^15.5.10",
"react": "^15.5.4", "react": "^15.5.4",
"react-apollo": "^1.2.0", "react-apollo": "^1.2.0",
@ -33,12 +33,12 @@
"redux": "^3.6.0", "redux": "^3.6.0",
"redux-actions": "^2.0.3", "redux-actions": "^2.0.3",
"redux-form": "^6.7.0", "redux-form": "^6.7.0",
"remcalc": "^1.0.4", "remcalc": "^1.0.5",
"reselect": "^3.0.1", "reselect": "^3.0.1",
"simple-statistics": "^4.1.0", "simple-statistics": "^4.1.0",
"styled-components": "^2.0.0", "styled-components": "^2.0.0",
"styled-is": "^1.0.6", "styled-is": "^1.0.7",
"unitcalc": "^1.0.4" "unitcalc": "^1.0.5"
}, },
"devDependencies": { "devDependencies": {
"apr-main": "^1.0.7", "apr-main": "^1.0.7",

2
packages/cp-frontend/src/components/layout/container.js
View File

@ -3,7 +3,7 @@ import { Grid } from 'react-styled-flexboxgrid';
import { breakpoints } from 'joyent-ui-toolkit'; import { breakpoints } from 'joyent-ui-toolkit';
export default styled(Grid)` export default Grid.extend`
padding: 2rem; padding: 2rem;
${breakpoints.large` ${breakpoints.large`

2
packages/cp-frontend/src/components/navigation/breadcrumb.js
View File

@ -14,7 +14,7 @@ const StyledDiv = styled.div`
margin-bottom: ${remcalc(18)}; margin-bottom: ${remcalc(18)};
`; `;
const StyledH2 = styled(H2)` const StyledH2 = H2.extend`
color: ${props => props.theme.primary}; color: ${props => props.theme.primary};
margin: 0; margin: 0;
`; `;

2
packages/cp-frontend/src/components/navigation/header.js
View File

@ -15,7 +15,7 @@ const StyledHeader = styled.div`
padding: ${unitcalc(2.5)} ${unitcalc(3)} ${unitcalc(2)} ${unitcalc(3)}; padding: ${unitcalc(2.5)} ${unitcalc(3)} ${unitcalc(2)} ${unitcalc(3)};
`; `;
const StyledLogo = styled(Img)` const StyledLogo = Img.extend`
width: ${remcalc(87)}; width: ${remcalc(87)};
height: ${remcalc(25)}; height: ${remcalc(25)};
`; `;

4
packages/cp-frontend/src/components/navigation/menu.js
View File

@ -9,11 +9,11 @@ import remcalc from 'remcalc';
import { breakpoints, Ul, Li } from 'joyent-ui-toolkit'; import { breakpoints, Ul, Li } from 'joyent-ui-toolkit';
import { LayoutContainer } from '@components/layout'; import { LayoutContainer } from '@components/layout';
const StyledHorizontalList = styled(Ul)` const StyledHorizontalList = Ul.extend`
padding: 0; padding: 0;
`; `;
const StyledHorizontalListItem = styled(Li)` const StyledHorizontalListItem = Li.extend`
${breakpoints.smallOnly` ${breakpoints.smallOnly`
display: block; display: block;
`} `}

6
packages/cp-frontend/src/containers/services/menu.js
View File

@ -20,17 +20,17 @@ import {
// import { servicesForTopologySelector } from '@state/selectors'; // import { servicesForTopologySelector } from '@state/selectors';
const StyledLegend = styled(Legend)` const StyledLegend = Legend.extend`
float: left; float: left;
padding-top: ${unitcalc(2)}; padding-top: ${unitcalc(2)};
margin-right: ${unitcalc(1.5)}; margin-right: ${unitcalc(1.5)};
`; `;
const PaddedRow = styled(Row)` const PaddedRow = Row.extend`
margin-bottom: ${remcalc(18)} margin-bottom: ${remcalc(18)}
`; `;
const StyledForm = styled(FormGroup)` const StyledForm = FormGroup.extend`
width: 60%; width: 60%;
float: left; float: left;
margin: 0; margin: 0;

6
packages/cp-gql-mock-server/CHANGELOG.md
View File

@ -3,5 +3,11 @@
All notable changes to this project will be documented in this file. 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. 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> <a name="1.0.3"></a>
## 1.0.3 (2017-05-25) ## 1.0.3 (2017-05-25)

10
packages/cp-gql-mock-server/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "joyent-cp-gql-mock-server", "name": "joyent-cp-gql-mock-server",
"version": "1.0.3", "version": "1.0.4",
"private": true, "private": true,
"license": "MPL-2.0", "license": "MPL-2.0",
"repository": "github:yldio/joyent-portal", "repository": "github:yldio/joyent-portal",
@ -8,7 +8,8 @@
"scripts": { "scripts": {
"lint": "eslint . --fix --format=tap", "lint": "eslint . --fix --format=tap",
"test": "exit 0", "test": "exit 0",
"start": "node src/index.js" "start": "node src/index.js",
"dev": "nodemon src/index.js"
}, },
"dependencies": { "dependencies": {
"good": "^7.2.0", "good": "^7.2.0",
@ -19,10 +20,11 @@
"graphql-tools": "^0.11.0", "graphql-tools": "^0.11.0",
"hapi": "^16.1.1", "hapi": "^16.1.1",
"joi": "^10.5.0", "joi": "^10.5.0",
"joyent-cp-gql-schema": "^1.0.3" "joyent-cp-gql-schema": "^1.0.4"
}, },
"devDependencies": { "devDependencies": {
"eslint": "^3.19.0", "eslint": "^3.19.0",
"eslint-config-joyent-portal": "1.0.0" "eslint-config-joyent-portal": "1.0.0",
"nodemon": "^1.11.0"
} }
} }

1021
packages/cp-gql-mock-server/yarn.lock
View File

File diff suppressed because it is too large Load Diff

6
packages/cp-gql-schema/CHANGELOG.md
View File

@ -3,5 +3,11 @@
All notable changes to this project will be documented in this file. 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. 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> <a name="1.0.3"></a>
## 1.0.3 (2017-05-25) ## 1.0.3 (2017-05-25)

2
packages/cp-gql-schema/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "joyent-cp-gql-schema", "name": "joyent-cp-gql-schema",
"version": "1.0.3", "version": "1.0.4",
"private": true, "private": true,
"license": "MPL-2.0", "license": "MPL-2.0",
"repository": "github:yldio/joyent-portal", "repository": "github:yldio/joyent-portal",

6
packages/cp-rdb-bootstrap/CHANGELOG.md
View File

@ -3,5 +3,11 @@
All notable changes to this project will be documented in this file. 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. 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> <a name="1.0.3"></a>
## 1.0.3 (2017-05-25) ## 1.0.3 (2017-05-25)

2
packages/cp-rdb-bootstrap/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "joyent-cp-rdb-bootstrap", "name": "joyent-cp-rdb-bootstrap",
"version": "1.0.3", "version": "1.0.4",
"private": true, "private": true,
"license": "MPL-2.0", "license": "MPL-2.0",
"repository": "github:yldio/joyent-portal", "repository": "github:yldio/joyent-portal",

6
packages/normalized-styled-components/CHANGELOG.md
View File

@ -3,5 +3,11 @@
All notable changes to this project will be documented in this file. 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. 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> <a name="1.0.4"></a>
## 1.0.4 (2017-05-25) ## 1.0.4 (2017-05-25)

4
packages/normalized-styled-components/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "normalized-styled-components", "name": "normalized-styled-components",
"version": "1.0.4", "version": "1.0.5",
"license": "MPL-2.0", "license": "MPL-2.0",
"description": "normalize.css with a styled-components mindset", "description": "normalize.css with a styled-components mindset",
"keywords": [ "keywords": [
@ -27,7 +27,7 @@
"prepublish": "run-s build" "prepublish": "run-s build"
}, },
"dependencies": { "dependencies": {
"remcalc": "^1.0.4" "remcalc": "^1.0.5"
}, },
"devDependencies": { "devDependencies": {
"babel-plugin-styled-components": "^1.1.4", "babel-plugin-styled-components": "^1.1.4",

6
packages/pseudo-json-ast/CHANGELOG.md
View File

@ -3,5 +3,11 @@
All notable changes to this project will be documented in this file. 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. 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> <a name="1.0.5"></a>
## 1.0.5 (2017-05-25) ## 1.0.5 (2017-05-25)

2
packages/pseudo-json-ast/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "pseudo-json-ast", "name": "pseudo-json-ast",
"version": "1.0.5", "version": "1.0.6",
"license": "MPL-2.0", "license": "MPL-2.0",
"description": "Parse a JSON string into an object with location properties", "description": "Parse a JSON string into an object with location properties",
"keywords": [ "keywords": [

6
packages/pseudo-yaml-ast/CHANGELOG.md
View File

@ -3,5 +3,11 @@
All notable changes to this project will be documented in this file. 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. 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> <a name="1.0.5"></a>
## 1.0.5 (2017-05-25) ## 1.0.5 (2017-05-25)

2
packages/pseudo-yaml-ast/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "pseudo-yaml-ast", "name": "pseudo-yaml-ast",
"version": "1.0.5", "version": "1.0.6",
"license": "MPL-2.0", "license": "MPL-2.0",
"description": "Parse a YAML string into an object with location properties", "description": "Parse a YAML string into an object with location properties",
"keywords": [ "keywords": [

6
packages/remcalc/CHANGELOG.md
View File

@ -3,5 +3,11 @@
All notable changes to this project will be documented in this file. 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. 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> <a name="1.0.4"></a>
## 1.0.4 (2017-05-25) ## 1.0.4 (2017-05-25)

2
packages/remcalc/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "remcalc", "name": "remcalc",
"version": "1.0.4", "version": "1.0.5",
"license": "MPL-2.0", "license": "MPL-2.0",
"description": "Calculate the `rem`'s from `px` values", "description": "Calculate the `rem`'s from `px` values",
"keywords": [ "keywords": [

6
packages/rnd-id/CHANGELOG.md
View File

@ -3,5 +3,11 @@
All notable changes to this project will be documented in this file. 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. 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> <a name="1.0.4"></a>
## 1.0.4 (2017-05-25) ## 1.0.4 (2017-05-25)

2
packages/rnd-id/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "rnd-id", "name": "rnd-id",
"version": "1.0.4", "version": "1.0.5",
"license": "MPL-2.0", "license": "MPL-2.0",
"description": "Generate a random alpha string", "description": "Generate a random alpha string",
"keywords": [ "keywords": [

11
packages/styled-is/CHANGELOG.md
View File

@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file. 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. 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> <a name="1.0.6"></a>
## 1.0.6 (2017-05-25) ## 1.0.6 (2017-05-25)

2
packages/styled-is/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "styled-is", "name": "styled-is",
"version": "1.0.6", "version": "1.0.7",
"license": "MPL-2.0", "license": "MPL-2.0",
"description": "Flag utility for styled-components", "description": "Flag utility for styled-components",
"keywords": [ "keywords": [

17
packages/ui-toolkit/CHANGELOG.md
View File

@ -3,6 +3,23 @@
All notable changes to this project will be documented in this file. 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. 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> <a name="1.0.3"></a>
## 1.0.3 (2017-05-25) ## 1.0.3 (2017-05-25)

14
packages/ui-toolkit/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "joyent-ui-toolkit", "name": "joyent-ui-toolkit",
"version": "1.0.3", "version": "1.1.0",
"private": true, "private": true,
"license": "MPL-2.0", "license": "MPL-2.0",
"repository": "github:yldio/joyent-portal", "repository": "github:yldio/joyent-portal",
@ -16,13 +16,13 @@
"watch": "cross-env NODE_ENV=development run-s copy-fonts \"compile -- --watch\"", "watch": "cross-env NODE_ENV=development run-s copy-fonts \"compile -- --watch\"",
"styleguide:build": "cross-env NODE_ENV=production styleguidist build", "styleguide:build": "cross-env NODE_ENV=production styleguidist build",
"styleguide": "cross-env NODE_ENV=development styleguidist server", "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": { "dependencies": {
"camel-case": "^3.0.0", "camel-case": "^3.0.0",
"d3": "^4.9.1", "d3": "^4.9.1",
"lodash.isstring": "^4.0.1", "lodash.isstring": "^4.0.1",
"normalized-styled-components": "^1.0.4", "normalized-styled-components": "^1.0.5",
"polished": "^1.1.2", "polished": "^1.1.2",
"prop-types": "^15.5.10", "prop-types": "^15.5.10",
"react": "^15.5.4", "react": "^15.5.4",
@ -31,11 +31,11 @@
"react-router-dom": "^4.1.1", "react-router-dom": "^4.1.1",
"react-styled-flexboxgrid": "^1.1.2", "react-styled-flexboxgrid": "^1.1.2",
"redux-form": "^6.7.0", "redux-form": "^6.7.0",
"remcalc": "^1.0.4", "remcalc": "^1.0.5",
"rnd-id": "^1.0.4", "rnd-id": "^1.0.5",
"styled-components": "^2.0.0", "styled-components": "^2.0.0",
"styled-is": "^1.0.6", "styled-is": "^1.0.7",
"unitcalc": "^1.0.4" "unitcalc": "^1.0.5"
}, },
"devDependencies": { "devDependencies": {
"babel-cli": "^6.24.1", "babel-cli": "^6.24.1",

2
packages/ui-toolkit/src/anchor/index.js
View File

@ -15,7 +15,7 @@ const style = css`
`} `}
`; `;
const StyledAnchor = styled(A)` const StyledAnchor = A.extend`
${style} ${style}
`; `;

6
packages/ui-toolkit/src/baseline/index.js
View File

@ -28,6 +28,6 @@ const unitsFromProps = props =>
) )
.join(';\n'); .join(';\n');
export default Component => styled(Component)` export default Component => Component.extend
${unitsFromProps} ? Component.extend`${unitsFromProps}`
`; : styled(Component)`${unitsFromProps}`;

4
packages/ui-toolkit/src/button/index.js
View File

@ -148,7 +148,7 @@ const style = css`
`} `}
`; `;
const StyledButton = styled(NButton)` const StyledButton = NButton.extend`
min-width: ${remcalc(120)}; min-width: ${remcalc(120)};
${style} ${style}
@ -157,7 +157,7 @@ const StyledButton = styled(NButton)`
} }
`; `;
const StyledAnchor = styled(A)` const StyledAnchor = A.extend`
display: inline-block; display: inline-block;
${style} ${style}
`; `;

2
packages/ui-toolkit/src/card/card.js
View File

@ -9,7 +9,7 @@ import { Row } from 'react-styled-flexboxgrid';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import React from 'react'; import React from 'react';
const StyledCard = styled(Row)` const StyledCard = Row.extend`
position: relative; position: relative;
height: auto; height: auto;
min-height: ${remcalc(126)}; min-height: ${remcalc(126)};

2
packages/ui-toolkit/src/card/description.js
View File

@ -8,7 +8,7 @@ import PropTypes from 'prop-types';
import Title from './title'; import Title from './title';
import React from 'react'; import React from 'react';
const StyledTitle = styled(Title)` const StyledTitle = Title.extend`
${typography.fontFamily}; ${typography.fontFamily};
${typography.normal}; ${typography.normal};

2
packages/ui-toolkit/src/card/group-view.js
View File

@ -4,7 +4,7 @@ import Baseline from '../baseline';
import View from './view'; import View from './view';
import React from 'react'; import React from 'react';
const StyledView = styled(View)` const StyledView = View.extend`
display: block; display: block;
padding: ${remcalc(62, 23, 5, 23)}; padding: ${remcalc(62, 23, 5, 23)};
background-color: ${props => props.grey}; background-color: ${props => props.grey};

2
packages/ui-toolkit/src/card/header.js
View File

@ -6,7 +6,7 @@ import PropTypes from 'prop-types';
import Baseline from '../baseline'; import Baseline from '../baseline';
import Card from './card'; import Card from './card';
const StyledCard = styled(Card)` const StyledCard = Card.extend`
position: absolute; position: absolute;
background-color: ${props => props.theme.primary}; background-color: ${props => props.theme.primary};

2
packages/ui-toolkit/src/card/meta.js
View File

@ -8,7 +8,7 @@ import PropTypes from 'prop-types';
import View from './view'; import View from './view';
import React from 'react'; import React from 'react';
const InnerRow = styled(Row)` const InnerRow = Row.extend`
display: block; display: block;
height: 100%; height: 100%;

4
packages/ui-toolkit/src/card/options.js
View File

@ -8,7 +8,7 @@ import PropTypes from 'prop-types';
import Button from '../button'; import Button from '../button';
import React from 'react'; import React from 'react';
const StyledNav = styled(Nav)` const StyledNav = Nav.extend`
flex: 0 0 ${remcalc(47)}; flex: 0 0 ${remcalc(47)};
border-left: ${remcalc(1)} solid ${props => props.theme.grey}; border-left: ${remcalc(1)} solid ${props => props.theme.grey};
box-sizing: border-box; box-sizing: border-box;
@ -18,7 +18,7 @@ const StyledNav = styled(Nav)`
`}; `};
`; `;
const StyledButton = styled(Button)` const StyledButton = Button.extend`
position: relative; position: relative;
border-width: 0; border-width: 0;
box-shadow: none; box-shadow: none;

2
packages/ui-toolkit/src/card/outlet.js
View File

@ -8,7 +8,7 @@ import styled from 'styled-components';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import React from 'react'; import React from 'react';
const StyledCol = styled(Col)` const StyledCol = Col.extend`
${typography.fontFamily}; ${typography.fontFamily};
${typography.normal}; ${typography.normal};

2
packages/ui-toolkit/src/card/subtitle.js
View File

@ -29,7 +29,7 @@ const Span = styled.span`
`}; `};
`; `;
const StyledTitle = styled(Title)` const StyledTitle = Title.extend`
display: inline-block; display: inline-block;
padding: 0 ${remcalc(18)}; padding: 0 ${remcalc(18)};

2
packages/ui-toolkit/src/card/view.js
View File

@ -7,7 +7,7 @@ import { Row } from 'react-styled-flexboxgrid';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import React from 'react'; import React from 'react';
const StyledView = styled(Row)` const StyledView = Row.extend`
flex: 1; flex: 1;
margin: 0; margin: 0;
height: auto; height: auto;

2
packages/ui-toolkit/src/form/base/toggle.js
View File

@ -9,7 +9,7 @@ import unitcalc from 'unitcalc';
import is from 'styled-is'; import is from 'styled-is';
import rndId from 'rnd-id'; import rndId from 'rnd-id';
const StyledInput = styled(Input)` const StyledInput = Input.extend`
display: none; display: none;
&:checked + label::after { &:checked + label::after {

2
packages/ui-toolkit/src/form/fieldset.js
View File

@ -2,7 +2,7 @@ import styled from 'styled-components';
import { Fieldset } from 'normalized-styled-components'; import { Fieldset } from 'normalized-styled-components';
import Baseline from '../baseline'; import Baseline from '../baseline';
const StyledFieldset = styled(Fieldset)` const StyledFieldset = Fieldset.extend`
display: inline-block; display: inline-block;
margin: 0; margin: 0;
padding: 0; padding: 0;

2
packages/ui-toolkit/src/form/label.js
View File

@ -4,7 +4,7 @@ import styled from 'styled-components';
import remcalc from 'remcalc'; import remcalc from 'remcalc';
import Label from '../label'; import Label from '../label';
const StyledLabel = styled(Label)` const StyledLabel = Label.extend`
margin-right: ${remcalc(12)}; margin-right: ${remcalc(12)};
`; `;

2
packages/ui-toolkit/src/form/legend.js
View File

@ -3,7 +3,7 @@ import { Legend } from 'normalized-styled-components';
import Baseline from '../baseline'; import Baseline from '../baseline';
import typography from '../typography'; import typography from '../typography';
const StyledLegend = styled(Legend)` const StyledLegend = Legend.extend`
${typography.fontFamily}; ${typography.fontFamily};
${typography.semibold}; ${typography.semibold};
`; `;

2
packages/ui-toolkit/src/form/meta.js
View File

@ -7,7 +7,7 @@ import Label from '../label';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import React from 'react'; import React from 'react';
const StyledLabel = styled(Label)` const StyledLabel = Label.extend`
${breakpoints.medium` ${breakpoints.medium`
text-align: right; text-align: right;
`}; `};

2
packages/ui-toolkit/src/form/toggle.js
View File

@ -11,7 +11,7 @@ import Baseline from '../baseline';
import BaseInput from './base/input'; import BaseInput from './base/input';
import typography from '../typography'; import typography from '../typography';
const StyledInput = styled(Input)` const StyledInput = Input.extend`
display: none; display: none;
&:checked + label { &:checked + label {

2
packages/ui-toolkit/src/styleguide/wrapper.js
View File

@ -3,7 +3,7 @@ import styled, { ThemeProvider, injectGlobal } from 'styled-components';
import theme from '../theme'; import theme from '../theme';
import Base, { global } from '../base'; import Base, { global } from '../base';
const StyledBase = styled(Base)` const StyledBase = Base.extend`
background-color: transparent; background-color: transparent;
`; `;

2
packages/ui-toolkit/src/text/headings.js
View File

@ -3,7 +3,7 @@ import { H1 as NH1 } from 'normalized-styled-components';
import remcalc from 'remcalc'; import remcalc from 'remcalc';
import typography from '../typography'; import typography from '../typography';
export const H1 = styled(NH1)` export const H1 = NH1.extend`
${typography.fontFamily}; ${typography.fontFamily};
${typography.medium}; ${typography.medium};

2
packages/ui-toolkit/src/text/small.js
View File

@ -3,7 +3,7 @@ import { Small } from 'normalized-styled-components';
import remcalc from 'remcalc'; import remcalc from 'remcalc';
import typography from '../typography'; import typography from '../typography';
export default styled(Small)` export default Small.extend`
${typography.fontFamily}; ${typography.fontFamily};
${typography.normal}; ${typography.normal};

2
packages/ui-toolkit/src/theme/colors.js
View File

@ -31,7 +31,7 @@ const Preview = styled.div`
width: 100%; width: 100%;
`; `;
const Paragraph = styled(P)` const Paragraph = P.extend`
margin: 0; margin: 0;
`; `;

2
packages/ui-toolkit/src/topology/index.js
View File

@ -11,7 +11,7 @@ import TopologyLink from './link';
import TopologyLinkArrow from './link/arrow'; import TopologyLinkArrow from './link/arrow';
import { calculateLineLayout } from './link/functions'; import { calculateLineLayout } from './link/functions';
const StyledSvg = styled(Svg)` const StyledSvg = Svg.extend`
width: 100%; width: 100%;
height: 1400px; height: 1400px;
`; `;

6
packages/unitcalc/CHANGELOG.md
View File

@ -3,5 +3,11 @@
All notable changes to this project will be documented in this file. 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. 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> <a name="1.0.4"></a>
## 1.0.4 (2017-05-25) ## 1.0.4 (2017-05-25)

4
packages/unitcalc/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "unitcalc", "name": "unitcalc",
"version": "1.0.4", "version": "1.0.5",
"license": "MPL-2.0", "license": "MPL-2.0",
"description": "Calculate the `rem`'s from unit values", "description": "Calculate the `rem`'s from unit values",
"keywords": [ "keywords": [
@ -21,7 +21,7 @@
}, },
"dependencies": { "dependencies": {
"lodash.flatten": "^4.4.0", "lodash.flatten": "^4.4.0",
"remcalc": "^1.0.4" "remcalc": "^1.0.5"
}, },
"devDependencies": { "devDependencies": {
"ava": "0.19.1", "ava": "0.19.1",