From b64f345e13412faff89652177180d39cc0e47d4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Se=CC=81rgio=20Ramos?= Date: Wed, 27 Sep 2017 15:44:57 +0100 Subject: [PATCH] style: lint and format --- packages/cloudapi-gql/src/api/machines.js | 15 +++---- packages/cloudapi-gql/src/endpoint.js | 2 +- .../src/schema/types/firewall-rule.js | 2 +- .../src/components/navigation/not-found.js | 1 + .../src/components/instances/firewall-rule.js | 11 +++-- .../src/components/instances/item.js | 14 +++--- .../src/components/instances/key-value.js | 43 +++++++++++++++---- .../src/components/instances/list.js | 27 +++++++++--- .../src/containers/instances/firewall.js | 24 +++++------ .../src/containers/instances/list.js | 4 +- .../src/containers/instances/metadata.js | 42 +++++++++--------- .../src/containers/instances/networks.js | 23 +++++----- .../src/containers/instances/tags.js | 40 ++++++++--------- packages/my-joyent/src/app.js | 4 +- packages/my-joyent/src/router.js | 1 - packages/my-joyent/src/sw.js | 2 +- packages/ui-toolkit/src/base/global.js | 7 ++- packages/ui-toolkit/src/baseline/index.js | 7 ++- packages/ui-toolkit/src/breadcrumb/item.js | 1 + packages/ui-toolkit/src/breakpoints/index.js | 26 ++++++----- packages/ui-toolkit/src/button/index.js | 6 +-- packages/ui-toolkit/src/card/label.js | 2 +- packages/ui-toolkit/src/chevron/index.js | 1 - packages/ui-toolkit/src/divider/index.js | 1 - packages/ui-toolkit/src/form/base/toggle.js | 1 - packages/ui-toolkit/src/form/legend.js | 1 + packages/ui-toolkit/src/form/number-input.js | 1 + packages/ui-toolkit/src/icon-button/index.js | 3 +- .../ui-toolkit/src/layout/view-container.js | 2 +- .../ui-toolkit/src/progress-bar/button.js | 10 ++--- .../ui-toolkit/src/progress-bar/indicator.js | 8 ++-- packages/ui-toolkit/src/section-list/item.js | 3 ++ packages/ui-toolkit/src/slider/index.js | 2 +- .../ui-toolkit/src/status-loader/widget.js | 2 + packages/ui-toolkit/src/styleguide/wrapper.js | 1 + packages/ui-toolkit/src/theme/colors.js | 1 + packages/ui-toolkit/src/typography/index.js | 6 ++- 37 files changed, 203 insertions(+), 144 deletions(-) diff --git a/packages/cloudapi-gql/src/api/machines.js b/packages/cloudapi-gql/src/api/machines.js index 74d5efdd..856c08fc 100644 --- a/packages/cloudapi-gql/src/api/machines.js +++ b/packages/cloudapi-gql/src/api/machines.js @@ -4,13 +4,7 @@ const url = require('url'); const request = require('./request'); -const { - _path, - _getAuthHeaders, - account, - url: host -} = request.client; - +const { _path, _getAuthHeaders, account, url: host } = request.client; const client = request.client; const getAuthHeaders = awaitify(_getAuthHeaders.bind(client)); @@ -36,12 +30,13 @@ const metadata = { const href = url.format({ protocol: 'https', - host: host.replace(/^https\:\/\//, ''), + host: host.replace(/^https:\/\//, ''), pathname }); - return fetch(href, { method: 'GET', headers }) - .then((response) => response.json()); + return fetch(href, { method: 'GET', headers }).then(response => + response.json() + ); }, get: ctx => { return request('getMachineMetadata', ctx); diff --git a/packages/cloudapi-gql/src/endpoint.js b/packages/cloudapi-gql/src/endpoint.js index f04af109..fc71f92f 100644 --- a/packages/cloudapi-gql/src/endpoint.js +++ b/packages/cloudapi-gql/src/endpoint.js @@ -1,7 +1,7 @@ // const argv = require('minimist')(process.argv.slice(2)); // const { makeExecutableSchema, addMockFunctionsToSchema } = require('graphql-tools'); -const { query, mutation } = require('./schema'); +// const { query, mutation } = require('./schema'); // console.log(new GraphQLSchema({ // query, diff --git a/packages/cloudapi-gql/src/schema/types/firewall-rule.js b/packages/cloudapi-gql/src/schema/types/firewall-rule.js index 986079f3..95aa7890 100644 --- a/packages/cloudapi-gql/src/schema/types/firewall-rule.js +++ b/packages/cloudapi-gql/src/schema/types/firewall-rule.js @@ -49,7 +49,7 @@ module.exports = new GraphQLObjectType({ } }, rule: { - type: GraphQLString, //FirewallRuleSyntaxType, + type: GraphQLString, // FirewallRuleSyntaxType, description: 'Firewall rule', resolve: ({ rule }) => { return rule; diff --git a/packages/joyent-boilerplate/src/components/navigation/not-found.js b/packages/joyent-boilerplate/src/components/navigation/not-found.js index 3caf2142..395f4ac1 100644 --- a/packages/joyent-boilerplate/src/components/navigation/not-found.js +++ b/packages/joyent-boilerplate/src/components/navigation/not-found.js @@ -5,6 +5,7 @@ import remcalc from 'remcalc'; import { H1, P, Button, ViewContainer } from 'joyent-ui-toolkit'; const StyledContainer = styled.div` + /* trick prettier */ margin-top: ${remcalc(60)}; `; diff --git a/packages/my-joy-beta/src/components/instances/firewall-rule.js b/packages/my-joy-beta/src/components/instances/firewall-rule.js index 1fd846ab..5e70e0ad 100644 --- a/packages/my-joy-beta/src/components/instances/firewall-rule.js +++ b/packages/my-joy-beta/src/components/instances/firewall-rule.js @@ -1,5 +1,4 @@ import React from 'react'; -import forceArray from 'force-array'; import { Card, @@ -9,12 +8,18 @@ import { CardView } from 'joyent-ui-toolkit'; -export default ({ rule = '', global = false, enabled = false, first, last }) => ( +export default ({ + rule = '', + global = false, + enabled = false, + first, + last +}) => ( {rule} - + diff --git a/packages/my-joy-beta/src/components/instances/item.js b/packages/my-joy-beta/src/components/instances/item.js index 350b4f99..f0e529f0 100644 --- a/packages/my-joy-beta/src/components/instances/item.js +++ b/packages/my-joy-beta/src/components/instances/item.js @@ -41,17 +41,21 @@ export default ({ name, state, primaryIp, last, first }) => ( {name} - - {primaryIp} - + {primaryIp} - + {titleCase(state)} - + diff --git a/packages/my-joy-beta/src/components/instances/key-value.js b/packages/my-joy-beta/src/components/instances/key-value.js index f6c48bda..e2699259 100644 --- a/packages/my-joy-beta/src/components/instances/key-value.js +++ b/packages/my-joy-beta/src/components/instances/key-value.js @@ -14,7 +14,14 @@ import { const { SmallOnly, Small } = QueryBreakpoints; -const TextareaKeyValue = ({ name, formName, formValue, handleSubmit, onRemove, textarea }) => ( +const TextareaKeyValue = ({ + name, + formName, + formValue, + handleSubmit, + onRemove, + textarea +}) => (
@@ -23,7 +30,14 @@ const TextareaKeyValue = ({ name, formName, formValue, handleSubmit, onRemove, t - @@ -34,7 +48,7 @@ const TextareaKeyValue = ({ name, formName, formValue, handleSubmit, onRemove, t - + @@ -47,7 +61,14 @@ const TextareaKeyValue = ({ name, formName, formValue, handleSubmit, onRemove, t ); -const InputKeyValue = ({ name, formName, formValue, handleSubmit, onRemove, textarea }) => ( +const InputKeyValue = ({ + name, + formName, + formValue, + handleSubmit, + onRemove, + textarea +}) => (
@@ -61,7 +82,14 @@ const InputKeyValue = ({ name, formName, formValue, handleSubmit, onRemove, text - @@ -77,6 +105,5 @@ const InputKeyValue = ({ name, formName, formValue, handleSubmit, onRemove, text ); -export default ({ textarea, ...rest }) => textarea - ? - : ; +export default ({ textarea, ...rest }) => + textarea ? : ; diff --git a/packages/my-joy-beta/src/components/instances/list.js b/packages/my-joy-beta/src/components/instances/list.js index 6e9e6622..88329190 100644 --- a/packages/my-joy-beta/src/components/instances/list.js +++ b/packages/my-joy-beta/src/components/instances/list.js @@ -1,10 +1,22 @@ import React from 'react'; import forceArray from 'force-array'; -import { FormGroup, Input, FormLabel, ViewContainer, StatusLoader } from 'joyent-ui-toolkit'; +import { + FormGroup, + Input, + FormLabel, + ViewContainer, + StatusLoader +} from 'joyent-ui-toolkit'; + import Item from './item'; -export default ({ instances, loading, handleChange = () => null, handleSubmit }) => { +export default ({ + instances, + loading, + handleChange = () => null, + handleSubmit +}) => { const _instances = forceArray(instances); const items = _instances.map((instance, i, all) => ( @@ -16,11 +28,12 @@ export default ({ instances, loading, handleChange = () => null, handleSubmit }) /> )); - const _loading = (!items.length && loading) ? ( - - - - ) : null; + const _loading = + !items.length && loading ? ( + + + + ) : null; return (
handleSubmit(ctx => handleChange(ctx))}> diff --git a/packages/my-joy-beta/src/containers/instances/firewall.js b/packages/my-joy-beta/src/containers/instances/firewall.js index f0a76f36..8feabd95 100644 --- a/packages/my-joy-beta/src/containers/instances/firewall.js +++ b/packages/my-joy-beta/src/containers/instances/firewall.js @@ -1,5 +1,4 @@ import React from 'react'; -import ReactJson from 'react-json-view'; import PropTypes from 'prop-types'; import forceArray from 'force-array'; import { compose, graphql } from 'react-apollo'; @@ -11,7 +10,6 @@ import { ViewContainer, Title, StatusLoader, Message } from 'joyent-ui-toolkit'; import GetFirewallRules from '@graphql/list-firewall-rules.gql'; import { FirewallRule as InstanceFirewallRule } from '@components/instances'; - const Firewall = ({ firewallEnabled = false, firewallRules = [], @@ -20,18 +18,18 @@ const Firewall = ({ }) => { const values = forceArray(firewallRules); const _title = Firewall; - const _loading = !(loading && !values.length) ? null : ( - - ); + const _loading = !(loading && !values.length) ? null : ; - const _firewall = !_loading && values.map((rule, i, all) => ( - - )); + const _firewall = + !_loading && + values.map((rule, i, all) => ( + + )); const _error = !(error && !_loading) ? null : ( { const _title = Instances; const _instances = forceArray(instances); - const _loading = (!instances.length && loading); + const _loading = !instances.length && loading; const _error = !error ? null : ( metadata.map(({ key, formName, formValue, value, name }) => { - const MetadataForm = reduxForm({ - form: `instance-metadata-${key}`, - initialValues: { - [formName]: name, - [formValue]: value - } - })(KeyValue); +const MetadataForms = (metadata = []) => + metadata.map(({ key, formName, formValue, value, name }) => { + const MetadataForm = reduxForm({ + form: `instance-metadata-${key}`, + initialValues: { + [formName]: name, + [formValue]: value + } + })(KeyValue); - return ( - console.log(key, val)} - onRemove={key => console.log('remove', key)} - textarea - /> - ); -}); + return ( + console.log(key, val)} + onRemove={key => console.log('remove', key)} + textarea + /> + ); + }); const Metadata = ({ metadata = [], loading, error }) => { const _title = Metadata; @@ -79,7 +80,6 @@ export default compose( [] ); - const metadata = Object.keys(values).reduce((all, name) => { const key = paramCase(name); diff --git a/packages/my-joy-beta/src/containers/instances/networks.js b/packages/my-joy-beta/src/containers/instances/networks.js index c028d901..0ae47c1a 100644 --- a/packages/my-joy-beta/src/containers/instances/networks.js +++ b/packages/my-joy-beta/src/containers/instances/networks.js @@ -10,22 +10,21 @@ import { ViewContainer, Title, StatusLoader, Message } from 'joyent-ui-toolkit'; import GetNetworks from '@graphql/list-networks.gql'; import { Network as InstanceNetwork } from '@components/instances'; - const Networks = ({ networks = [], loading, error }) => { const values = forceArray(networks); const _title = Networks; - const _loading = !(loading && !values.length) ? null : ( - - ); + const _loading = !(loading && !values.length) ? null : ; - const _networks = !_loading && values.map((network, i, all) => ( - - )); + const _networks = + !_loading && + values.map((network, i, all) => ( + + )); const _error = !(error && !_loading) ? null : ( tags.map(({ key, formName, formValue, value, name }) => { - const TagForm = reduxForm({ - form: `instance-tags-${key}`, - initialValues: { - [formName]: name, - [formValue]: value - } - })(KeyValue); +const TagForms = (tags = []) => + tags.map(({ key, formName, formValue, value, name }) => { + const TagForm = reduxForm({ + form: `instance-tags-${key}`, + initialValues: { + [formName]: name, + [formValue]: value + } + })(KeyValue); - return ( - console.log(key, val)} - onRemove={key => console.log('remove', key)} - /> - ); -}); + return ( + console.log(key, val)} + onRemove={key => console.log('remove', key)} + /> + ); + }); const Tags = ({ tags = [], loading, error }) => { const _title = Tags; @@ -79,7 +80,6 @@ export default compose( [] ); - const tags = Object.keys(values).reduce((all, name) => { const key = paramCase(name); diff --git a/packages/my-joyent/src/app.js b/packages/my-joyent/src/app.js index 0ea12cf2..0f1be0ea 100644 --- a/packages/my-joyent/src/app.js +++ b/packages/my-joyent/src/app.js @@ -1,5 +1,5 @@ -import React, { Component } from 'react'; -import { ThemeProvider, injectGlobal } from 'styled-components'; +import React from 'react'; +import { ThemeProvider } from 'styled-components'; import { theme, RootContainer } from 'joyent-ui-toolkit'; import { ApolloProvider } from 'react-apollo'; diff --git a/packages/my-joyent/src/router.js b/packages/my-joyent/src/router.js index 71b7c188..1bf16bfc 100644 --- a/packages/my-joyent/src/router.js +++ b/packages/my-joyent/src/router.js @@ -1,6 +1,5 @@ import React from 'react'; import { BrowserRouter, Route, Switch } from 'react-router-dom'; -import styled from 'styled-components'; import { PageContainer } from 'joyent-ui-toolkit'; diff --git a/packages/my-joyent/src/sw.js b/packages/my-joyent/src/sw.js index 568fe094..eb7a28cf 100644 --- a/packages/my-joyent/src/sw.js +++ b/packages/my-joyent/src/sw.js @@ -105,4 +105,4 @@ export function unregister() { registration.unregister(); }); } -} \ No newline at end of file +} diff --git a/packages/ui-toolkit/src/base/global.js b/packages/ui-toolkit/src/base/global.js index b8cb4f17..f2052665 100644 --- a/packages/ui-toolkit/src/base/global.js +++ b/packages/ui-toolkit/src/base/global.js @@ -24,7 +24,9 @@ export default ({ theme }) => css` ${unloadedFontFamily}; } - html, body, #root { + html, + body, + #root { height: 100%; } @@ -32,7 +34,8 @@ export default ({ theme }) => css` ${loadedFontFamily}; } - .CodeMirror, .ReactCodeMirror { + .CodeMirror, + .ReactCodeMirror { height: 100% !important; } diff --git a/packages/ui-toolkit/src/baseline/index.js b/packages/ui-toolkit/src/baseline/index.js index e8f1ac6d..adc33ca7 100644 --- a/packages/ui-toolkit/src/baseline/index.js +++ b/packages/ui-toolkit/src/baseline/index.js @@ -7,10 +7,9 @@ const sides = ['top', 'right', 'bottom', 'left']; const unitProps = (() => { const sided = rule => sides.map(side => `${rule}-${side}`); - const measures = ['margin', 'padding'].reduce( - (props, rule) => [...props, rule, ...sided(rule)], - [] - ).concat(['height', 'width']); + const measures = ['margin', 'padding'] + .reduce((props, rule) => [...props, rule, ...sided(rule)], []) + .concat(['height', 'width']); return sides.reduce((acc, side) => [...acc, `border-${side}-width`], [ 'border', diff --git a/packages/ui-toolkit/src/breadcrumb/item.js b/packages/ui-toolkit/src/breadcrumb/item.js index a7736ee4..a0ce59e1 100644 --- a/packages/ui-toolkit/src/breadcrumb/item.js +++ b/packages/ui-toolkit/src/breadcrumb/item.js @@ -33,6 +33,7 @@ const Arrow = styled.div` `; const Container = styled.div` + /* trick prettier */ display: inline-block; `; diff --git a/packages/ui-toolkit/src/breakpoints/index.js b/packages/ui-toolkit/src/breakpoints/index.js index b4bb8928..19535924 100644 --- a/packages/ui-toolkit/src/breakpoints/index.js +++ b/packages/ui-toolkit/src/breakpoints/index.js @@ -49,17 +49,21 @@ const breakpoint = label => (...args) => css` `; const toQuery = label => ({ children, ...rest }) => ( - - {children} - + {children} ); -export const styled = Object.keys(screens).reduce((sum, label) => ({ - ...sum, - [label]: breakpoint(label) -}), {}); +export const styled = Object.keys(screens).reduce( + (sum, label) => ({ + ...sum, + [label]: breakpoint(label) + }), + {} +); -export const query = Object.keys(screens).reduce((sum, label) => ({ - ...sum, - [pascalCase(label)]: toQuery(label) -}), {}); +export const query = Object.keys(screens).reduce( + (sum, label) => ({ + ...sum, + [pascalCase(label)]: toQuery(label) + }), + {} +); diff --git a/packages/ui-toolkit/src/button/index.js b/packages/ui-toolkit/src/button/index.js index 3715c339..c3419733 100644 --- a/packages/ui-toolkit/src/button/index.js +++ b/packages/ui-toolkit/src/button/index.js @@ -89,7 +89,7 @@ const style = css` background-color: ${props => props.theme.whiteActive}; border-color: ${props => props.theme.grey}; } - `} + `}; ${is('tertiary')` color: ${props => props.theme.tertiary}; @@ -106,7 +106,7 @@ const style = css` background-color: ${props => props.theme.background}; border-color: ${props => props.theme.grey}; } - `} + `}; ${is('tertiary', 'selected')` background-color: ${props => props.theme.tertiaryActive}; @@ -145,7 +145,7 @@ const style = css` background-color: ${props => props.theme.disabled}; border-color: ${props => props.theme.disabled}; } - `} + `}; ${is('rect')` border-radius: 0; diff --git a/packages/ui-toolkit/src/card/label.js b/packages/ui-toolkit/src/card/label.js index b5ab23c3..92e327dc 100644 --- a/packages/ui-toolkit/src/card/label.js +++ b/packages/ui-toolkit/src/card/label.js @@ -2,7 +2,6 @@ import React from 'react'; import remcalc from 'remcalc'; import styled from 'styled-components'; import is, { isNot } from 'styled-is'; -import unitcalc from 'unitcalc'; const Dot = styled.span` width: ${remcalc(6)}; @@ -20,6 +19,7 @@ const Dot = styled.span` `; const Icon = styled.span` + /* trick prettier */ background-color: none; `; diff --git a/packages/ui-toolkit/src/chevron/index.js b/packages/ui-toolkit/src/chevron/index.js index f56b9a2c..2522a46c 100644 --- a/packages/ui-toolkit/src/chevron/index.js +++ b/packages/ui-toolkit/src/chevron/index.js @@ -1,5 +1,4 @@ import is from 'styled-is'; -import typography from '../typography'; import P from '../text/p'; export default P.extend` diff --git a/packages/ui-toolkit/src/divider/index.js b/packages/ui-toolkit/src/divider/index.js index fbb1b94a..88e2034f 100644 --- a/packages/ui-toolkit/src/divider/index.js +++ b/packages/ui-toolkit/src/divider/index.js @@ -5,7 +5,6 @@ import is from 'styled-is'; import Baseline from '../baseline'; - const Divider = styled(Row)` background-color: ${props => props.theme.grey}; diff --git a/packages/ui-toolkit/src/form/base/toggle.js b/packages/ui-toolkit/src/form/base/toggle.js index b5e0fba2..7b402e7c 100644 --- a/packages/ui-toolkit/src/form/base/toggle.js +++ b/packages/ui-toolkit/src/form/base/toggle.js @@ -2,7 +2,6 @@ import React from 'react'; import styled from 'styled-components'; import { Input } from 'normalized-styled-components'; import { Broadcast, Subscriber } from 'react-broadcast'; -import { border, borderRadius } from '../../boxes'; import BaseInput from './input'; import remcalc from 'remcalc'; import is from 'styled-is'; diff --git a/packages/ui-toolkit/src/form/legend.js b/packages/ui-toolkit/src/form/legend.js index 99c664b6..d47827f1 100644 --- a/packages/ui-toolkit/src/form/legend.js +++ b/packages/ui-toolkit/src/form/legend.js @@ -3,6 +3,7 @@ import Baseline from '../baseline'; import typography from '../typography'; const StyledLegend = Legend.extend` + /* trick prettier */ ${typography.semibold}; `; diff --git a/packages/ui-toolkit/src/form/number-input.js b/packages/ui-toolkit/src/form/number-input.js index e0cf55a1..3acfe9d3 100644 --- a/packages/ui-toolkit/src/form/number-input.js +++ b/packages/ui-toolkit/src/form/number-input.js @@ -9,6 +9,7 @@ import unitcalc from 'unitcalc'; import { PlusIcon, MinusIcon } from '../icons'; const StyledContainer = styled.div` + /* trick prettier */ margin-bottom: ${unitcalc(4)}; `; diff --git a/packages/ui-toolkit/src/icon-button/index.js b/packages/ui-toolkit/src/icon-button/index.js index b07a0e37..731d7d4b 100644 --- a/packages/ui-toolkit/src/icon-button/index.js +++ b/packages/ui-toolkit/src/icon-button/index.js @@ -89,7 +89,8 @@ const style = css` `; const StyledButton = NButton.extend` - ${style} + /* trick prettier */ + ${style}; `; const StyledAnchor = A.extend` diff --git a/packages/ui-toolkit/src/layout/view-container.js b/packages/ui-toolkit/src/layout/view-container.js index 00bd3fa0..0513c0c8 100644 --- a/packages/ui-toolkit/src/layout/view-container.js +++ b/packages/ui-toolkit/src/layout/view-container.js @@ -1,4 +1,4 @@ -import is, { isNot } from 'styled-is'; +import is from 'styled-is'; import { Grid } from 'react-styled-flexboxgrid'; import remcalc from 'remcalc'; diff --git a/packages/ui-toolkit/src/progress-bar/button.js b/packages/ui-toolkit/src/progress-bar/button.js index 7defbc58..e4797141 100644 --- a/packages/ui-toolkit/src/progress-bar/button.js +++ b/packages/ui-toolkit/src/progress-bar/button.js @@ -54,24 +54,24 @@ const StyledContainer = styled.div` ${isOr('active', 'completed')` border-top: ${remcalc(1)} solid ${props => props.theme.greenDark}; border-bottom: ${remcalc(1)} solid ${props => props.theme.greenDark}; - `} + `}; ${is('first')` border-left: ${remcalc(1)} solid ${props => props.theme.greenDark}; padding-left: ${remcalc(13)}; - `} + `}; ${isNot('first', 'completed', 'active')` border-right: ${remcalc(1)} solid ${props => props.theme.grey}; - `} + `}; ${isOr('active', 'completed')` border-right: ${remcalc(1)} solid ${props => props.theme.greenDark}; - `} + `}; ${isNot('last')` border-right: none; - `} + `}; `; const StyledArrow = styled.span` diff --git a/packages/ui-toolkit/src/progress-bar/indicator.js b/packages/ui-toolkit/src/progress-bar/indicator.js index ad8dd41b..a1b5c166 100644 --- a/packages/ui-toolkit/src/progress-bar/indicator.js +++ b/packages/ui-toolkit/src/progress-bar/indicator.js @@ -10,11 +10,11 @@ const Tick = styled(TickIcon)` ${is('active')` fill: ${props => props.theme.secondary}; - `} + `}; ${is('completed')` fill: ${props => props.theme.white}; - `} + `}; `; const StyledIndicator = styled.span` @@ -30,11 +30,11 @@ const StyledIndicator = styled.span` ${isOr('completed', 'active')` border: ${remcalc(1)} solid ${props => props.theme.greenDark}; - `} + `}; ${is('completed')` background: ${props => props.theme.green}; - `} + `}; `; const Indicator = ({ first, completed, active, last, ...rest }) => { diff --git a/packages/ui-toolkit/src/section-list/item.js b/packages/ui-toolkit/src/section-list/item.js index f34381ec..debbb382 100644 --- a/packages/ui-toolkit/src/section-list/item.js +++ b/packages/ui-toolkit/src/section-list/item.js @@ -34,13 +34,16 @@ const style = css` `; export const Anchor = Baseline(A.extend` + /* trick prettier */ ${style}; `); export const NavLink = Baseline(styled(RRNavLink)` + /* trick prettier */ ${style}; `); export const Link = Baseline(styled(RRLink)` + /* trick prettier */ ${style}; `); diff --git a/packages/ui-toolkit/src/slider/index.js b/packages/ui-toolkit/src/slider/index.js index f0e5c4ec..06162603 100644 --- a/packages/ui-toolkit/src/slider/index.js +++ b/packages/ui-toolkit/src/slider/index.js @@ -60,7 +60,7 @@ Slider.propTypes = { draggableTrack: PropTypes.bool, onChangeStart: PropTypes.func, children: PropTypes.node, - greyed: PropTypes.bool, + greyed: PropTypes.bool }; Slider.defaultProps = { diff --git a/packages/ui-toolkit/src/status-loader/widget.js b/packages/ui-toolkit/src/status-loader/widget.js index fe97920e..0838c453 100644 --- a/packages/ui-toolkit/src/status-loader/widget.js +++ b/packages/ui-toolkit/src/status-loader/widget.js @@ -32,10 +32,12 @@ const StyledFirstRect = styled.rect` `; const StyledSecondRect = StyledFirstRect.extend` + /* trick prettier */ animation-delay: 0.5s; `; const StyledThirdRect = StyledFirstRect.extend` + /* trick prettier */ animation-delay: 1s; `; diff --git a/packages/ui-toolkit/src/styleguide/wrapper.js b/packages/ui-toolkit/src/styleguide/wrapper.js index 2d20c917..f25cf165 100644 --- a/packages/ui-toolkit/src/styleguide/wrapper.js +++ b/packages/ui-toolkit/src/styleguide/wrapper.js @@ -4,6 +4,7 @@ import theme from '../theme'; import Base, { global } from '../base'; const StyledBase = Base.extend` + /* trick prettier */ background-color: transparent; `; diff --git a/packages/ui-toolkit/src/theme/colors.js b/packages/ui-toolkit/src/theme/colors.js index ed6b64d8..d3269951 100644 --- a/packages/ui-toolkit/src/theme/colors.js +++ b/packages/ui-toolkit/src/theme/colors.js @@ -32,6 +32,7 @@ const Preview = styled.div` `; const Paragraph = P.extend` + /* trick prettier */ margin: 0; `; diff --git a/packages/ui-toolkit/src/typography/index.js b/packages/ui-toolkit/src/typography/index.js index a20e343a..020f71e1 100644 --- a/packages/ui-toolkit/src/typography/index.js +++ b/packages/ui-toolkit/src/typography/index.js @@ -1,5 +1,5 @@ import { css } from 'styled-components'; -import theme from '../theme' +import theme from '../theme'; const baseFonts = ` -apple-system, @@ -18,20 +18,24 @@ export const loadedFontFamily = css` `; export const unloadedFontFamily = css` + /* trick prettier */ font-family: ${baseFonts}; `; export const color = theme.text; export const semibold = css` + /* trick prettier */ font-weight: 600; `; export const medium = css` + /* trick prettier */ font-weight: 500; `; export const normal = css` + /* trick prettier */ font-weight: 400; `;