From 445ff1e28ee572236ec963a27bff227e859f685c Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Mon, 18 Dec 2017 10:06:16 +0100 Subject: Standardize colors to always be in uppercase hex and consolidate material-ui greys --- .../ts/components/dialogs/ledger_config_dialog.tsx | 2 +- packages/website/ts/components/eth_wrappers.tsx | 2 +- packages/website/ts/components/fill_order.tsx | 4 ++-- packages/website/ts/components/footer.tsx | 4 ++-- .../generate_order/generate_order_form.tsx | 2 +- .../components/generate_order/new_token_form.tsx | 6 ++--- .../website/ts/components/inputs/address_input.tsx | 2 +- .../ts/components/inputs/balance_bounded_input.tsx | 4 ++-- .../ts/components/inputs/token_amount_input.tsx | 2 +- .../website/ts/components/inputs/token_input.tsx | 2 +- packages/website/ts/components/top_bar.tsx | 8 +++---- .../website/ts/components/top_bar_menu_item.tsx | 2 +- .../ts/components/ui/drop_down_menu_item.tsx | 2 +- packages/website/ts/components/ui/input_label.tsx | 2 +- packages/website/ts/pages/about/about.tsx | 6 ++--- .../ts/pages/documentation/method_block.tsx | 2 +- .../website/ts/pages/documentation/source_link.tsx | 2 +- packages/website/ts/pages/landing/landing.tsx | 10 ++++---- .../ts/pages/shared/nested_sidebar_menu.tsx | 2 +- packages/website/ts/pages/wiki/wiki.tsx | 4 ++-- packages/website/ts/utils/colors.ts | 28 ++++++++++------------ 21 files changed, 48 insertions(+), 50 deletions(-) (limited to 'packages/website') diff --git a/packages/website/ts/components/dialogs/ledger_config_dialog.tsx b/packages/website/ts/components/dialogs/ledger_config_dialog.tsx index e2a8b932a..05a15526f 100644 --- a/packages/website/ts/components/dialogs/ledger_config_dialog.tsx +++ b/packages/website/ts/components/dialogs/ledger_config_dialog.tsx @@ -146,7 +146,7 @@ export class LedgerConfigDialog extends React.Component
About Wrapped ETH
diff --git a/packages/website/ts/components/fill_order.tsx b/packages/website/ts/components/fill_order.tsx index f7473b79e..f91540c26 100644 --- a/packages/website/ts/components/fill_order.tsx +++ b/packages/website/ts/components/fill_order.tsx @@ -221,7 +221,7 @@ export class FillOrder extends React.Component {
Order details
-
+
Maker:
@@ -273,7 +273,7 @@ export class FillOrder extends React.Component {
= {accounting.formatNumber(orderReceiveAmount, 6)} {makerToken.symbol}
diff --git a/packages/website/ts/components/footer.tsx b/packages/website/ts/components/footer.tsx index 67e966033..4b03c49e6 100644 --- a/packages/website/ts/components/footer.tsx +++ b/packages/website/ts/components/footer.tsx @@ -124,7 +124,7 @@ export class Footer extends React.Component {
© ZeroEx, Intl.
@@ -209,7 +209,7 @@ export class Footer extends React.Component { private renderHeader(title: string) { const headerStyle = { textTransform: 'uppercase', - color: colors.lightGray, + color: colors.grey400, letterSpacing: 2, fontFamily: 'Roboto Mono', fontSize: 13, diff --git a/packages/website/ts/components/generate_order/generate_order_form.tsx b/packages/website/ts/components/generate_order/generate_order_form.tsx index 7f4c25718..587fdc6f1 100644 --- a/packages/website/ts/components/generate_order/generate_order_form.tsx +++ b/packages/website/ts/components/generate_order/generate_order_form.tsx @@ -154,7 +154,7 @@ export class GenerateOrderForm extends React.Component
-
Expiration
+
Expiration
} value={this.state.name} errorText={this.state.nameErrText} @@ -59,7 +59,7 @@ export class NewTokenForm extends React.Component } value={this.state.symbol} errorText={this.state.symbolErrText} @@ -78,7 +78,7 @@ export class NewTokenForm extends React.Component } value={this.state.decimals} errorText={this.state.decimalsErrText} diff --git a/packages/website/ts/components/inputs/address_input.tsx b/packages/website/ts/components/inputs/address_input.tsx index f5ebb4112..d432a038e 100644 --- a/packages/website/ts/components/inputs/address_input.tsx +++ b/packages/website/ts/components/inputs/address_input.tsx @@ -50,7 +50,7 @@ export class AddressInput extends React.Componentamount} @@ -133,7 +133,7 @@ export class BalanceBoundedInput extends const increaseBalanceText = 'Increase balance'; const linkStyle = { cursor: 'pointer', - color: colors.grey900, + color: colors.darkestGray, textDecoration: 'underline', display: 'inline', }; diff --git a/packages/website/ts/components/inputs/token_amount_input.tsx b/packages/website/ts/components/inputs/token_amount_input.tsx index 363904e4d..ddf0d3307 100644 --- a/packages/website/ts/components/inputs/token_amount_input.tsx +++ b/packages/website/ts/components/inputs/token_amount_input.tsx @@ -59,7 +59,7 @@ export class TokenAmountInput extends React.Component Set allowance diff --git a/packages/website/ts/components/inputs/token_input.tsx b/packages/website/ts/components/inputs/token_input.tsx index e406ca27b..806c8b21f 100644 --- a/packages/website/ts/components/inputs/token_input.tsx +++ b/packages/website/ts/components/inputs/token_input.tsx @@ -62,7 +62,7 @@ export class TokenInput extends React.Component
-
+
{token.name}
diff --git a/packages/website/ts/components/top_bar.tsx b/packages/website/ts/components/top_bar.tsx index 82ce0dee2..179840ffc 100644 --- a/packages/website/ts/components/top_bar.tsx +++ b/packages/website/ts/components/top_bar.tsx @@ -220,7 +220,7 @@ export class TopBar extends React.Component { {this.renderPortalMenu()} {this.renderDocsMenu()} {this.renderWiki()} -
Website
+
Website
Home @@ -284,7 +284,7 @@ export class TopBar extends React.Component { const sectionTitle = `${this.props.docsInfo.displayName} Docs`; return (
-
{sectionTitle}
+
{sectionTitle}
{ return (
-
0x Protocol Wiki
+
0x Protocol Wiki
{ return (
-
Portal DApp
+
Portal DApp
- + {this.props.subMenuItems}
diff --git a/packages/website/ts/components/ui/input_label.tsx b/packages/website/ts/components/ui/input_label.tsx index 1f26f5fd2..43f101d11 100644 --- a/packages/website/ts/components/ui/input_label.tsx +++ b/packages/website/ts/components/ui/input_label.tsx @@ -7,7 +7,7 @@ export interface InputLabelProps { const styles = { label: { - color: colors.grey500, + color: colors.grey, fontSize: 12, pointerEvents: 'none', textAlign: 'left', diff --git a/packages/website/ts/pages/about/about.tsx b/packages/website/ts/pages/about/about.tsx index e0780c220..60d8ac66d 100644 --- a/packages/website/ts/pages/about/about.tsx +++ b/packages/website/ts/pages/about/about.tsx @@ -152,12 +152,12 @@ export class About extends React.Component { } public render() { return ( -
+
{
Advisors:
diff --git a/packages/website/ts/pages/documentation/method_block.tsx b/packages/website/ts/pages/documentation/method_block.tsx index df580fcd0..b19a97e2d 100644 --- a/packages/website/ts/pages/documentation/method_block.tsx +++ b/packages/website/ts/pages/documentation/method_block.tsx @@ -150,7 +150,7 @@ export class MethodBlock extends React.Component {parameter.name}
-
+
{isOptional && 'optional'}
diff --git a/packages/website/ts/pages/documentation/source_link.tsx b/packages/website/ts/pages/documentation/source_link.tsx index 9fe919c4e..dceb88b7b 100644 --- a/packages/website/ts/pages/documentation/source_link.tsx +++ b/packages/website/ts/pages/documentation/source_link.tsx @@ -29,7 +29,7 @@ export function SourceLink(props: SourceLinkProps) { href={sourceCodeUrl} target="_blank" className="underline" - style={{color: colors.grey500}} + style={{color: colors.grey}} > Source diff --git a/packages/website/ts/pages/landing/landing.tsx b/packages/website/ts/pages/landing/landing.tsx index 56d021b8d..11d891e4f 100644 --- a/packages/website/ts/pages/landing/landing.tsx +++ b/packages/website/ts/pages/landing/landing.tsx @@ -287,7 +287,7 @@ export class Landing extends React.Component { }); const titleStyle: React.CSSProperties = { fontFamily: 'Roboto Mono', - color: colors.gray, + color: colors.grey, textTransform: 'uppercase', fontWeight: 300, letterSpacing: 3, @@ -329,7 +329,7 @@ export class Landing extends React.Component { return (
{isSmallScreen && @@ -601,7 +601,7 @@ export class Landing extends React.Component { const boxStyle: React.CSSProperties = { maxWidth: 252, height: 386, - backgroundColor: colors.lightestGray, + backgroundColor: colors.lightGrey, borderRadius: 5, padding: '10px 24px 24px', }; @@ -705,14 +705,14 @@ export class Landing extends React.Component { const cases = _.map(useCases, (useCase: UseCase) => { const style = _.isUndefined(useCase.style) || isSmallScreen ? {} : useCase.style; const useCaseBoxStyle = { - color: colors.gray, + color: colors.grey, border: '1px solid #565656', borderRadius: 4, maxWidth: isSmallScreen ? 375 : 'none', ...style, }; const typeStyle: React.CSSProperties = { - color: colors.lightestGray, + color: colors.lightGrey, fontSize: 13, textTransform: 'uppercase', fontFamily: 'Roboto Mono', diff --git a/packages/website/ts/pages/shared/nested_sidebar_menu.tsx b/packages/website/ts/pages/shared/nested_sidebar_menu.tsx index 7a8c9abbd..b06c05a1a 100644 --- a/packages/website/ts/pages/shared/nested_sidebar_menu.tsx +++ b/packages/website/ts/pages/shared/nested_sidebar_menu.tsx @@ -55,7 +55,7 @@ export class NestedSidebarMenu extends React.Component
{finalSectionName.toUpperCase()} diff --git a/packages/website/ts/pages/wiki/wiki.tsx b/packages/website/ts/pages/wiki/wiki.tsx index 68383ac36..78a97e04a 100644 --- a/packages/website/ts/pages/wiki/wiki.tsx +++ b/packages/website/ts/pages/wiki/wiki.tsx @@ -1,6 +1,5 @@ import * as _ from 'lodash'; import CircularProgress from 'material-ui/CircularProgress'; -import {colors} from 'ts/utils/colors'; import * as React from 'react'; import DocumentTitle = require('react-document-title'); import { @@ -11,6 +10,7 @@ import {MarkdownSection} from 'ts/pages/shared/markdown_section'; import {NestedSidebarMenu} from 'ts/pages/shared/nested_sidebar_menu'; import {SectionHeader} from 'ts/pages/shared/section_header'; import {Article, ArticlesBySection, HeaderSizes, Styles, WebsitePaths} from 'ts/types'; +import {colors} from 'ts/utils/colors'; import {configs} from 'ts/utils/configs'; import {constants} from 'ts/utils/constants'; import {utils} from 'ts/utils/utils'; @@ -143,7 +143,7 @@ export class Wiki extends React.Component { headerSize={HeaderSizes.H2} githubLink={githubLink} /> -
+
See a way to make this article better?{' '}