From 2596c3c940a79f67b409570f5a5a44bb5ee59984 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Tue, 14 May 2019 11:04:49 +0200 Subject: [PATCH] Style cleanups (styled & unused) (#1151) --- packages/app-explorer/src/Main.tsx | 13 ++++++-- packages/app-explorer/src/index.css | 36 ----------------------- packages/app-explorer/src/index.tsx | 11 +++++-- packages/app-storage/src/index.css | 16 +++++----- packages/app-toolbox/src/Hash.tsx | 5 ++-- packages/app-toolbox/src/Sign.tsx | 5 ++-- packages/app-toolbox/src/index.css | 7 ----- packages/app-toolbox/src/index.tsx | 2 -- packages/ui-app/src/Output.tsx | 10 +++++-- packages/ui-app/src/styles/components.css | 22 ++++++++------ 10 files changed, 54 insertions(+), 73 deletions(-) delete mode 100644 packages/app-toolbox/src/index.css diff --git a/packages/app-explorer/src/Main.tsx b/packages/app-explorer/src/Main.tsx index 0acd0f6f50..971553917c 100644 --- a/packages/app-explorer/src/Main.tsx +++ b/packages/app-explorer/src/Main.tsx @@ -6,6 +6,7 @@ import { I18nProps } from '@polkadot/ui-app/types'; import { KeyedEvent } from './types'; import React from 'react'; +import styled from 'styled-components'; import BlockHeaders from './BlockHeaders'; import Events from './Events'; @@ -17,6 +18,14 @@ type Props = I18nProps & { events: Array }; +const Wrapper = styled.div` + .column { + flex: 0 0 50%; + min-width: 0; + padding: 0 1em 1em; + } +`; + class Main extends React.PureComponent { render () { const { events, t } = this.props; @@ -25,7 +34,7 @@ class Main extends React.PureComponent { <> -
+

{t('recent blocks')}

@@ -34,7 +43,7 @@ class Main extends React.PureComponent {

{t('recent events')}

-
+ ); } diff --git a/packages/app-explorer/src/index.css b/packages/app-explorer/src/index.css index 6034b44905..99e80a1a29 100644 --- a/packages/app-explorer/src/index.css +++ b/packages/app-explorer/src/index.css @@ -2,34 +2,6 @@ /* This software may be modified and distributed under the terms /* of the Apache-2.0 license. See the LICENSE file for details. */ -.explorer--App .rx--updated { - background: transparent !important; -} - -.explorer--BestHash, -.explorer--BestNumber { - font-weight: 100; - text-align: right; - opacity: 0.5; -} - -.explorer--BestHash.rx--updated, -.explorer--BestNumber.rx--updated { - opacity: 1; -} - -.explorer--BestHash { - font-size: 1.5em; - line-height: 1.2; -} - -.explorer--BestNumber { - font-size: 2.25rem; - line-height: 2.25rem; - position: relative; - text-align: right; -} - .explorer--BlockByHash-flexable { flex-wrap: wrap; margin-top: -0.5rem; @@ -86,14 +58,6 @@ right: 0rem; } -.explorer--Overview { - .column { - flex: 0 0 50%; - min-width: 0; - padding: 0 1em 1em; - } -} - .explorer--query { width: 20em; } diff --git a/packages/app-explorer/src/index.tsx b/packages/app-explorer/src/index.tsx index cba595c610..96a14b825a 100644 --- a/packages/app-explorer/src/index.tsx +++ b/packages/app-explorer/src/index.tsx @@ -9,6 +9,7 @@ import './index.css'; import React from 'react'; import { Route, Switch } from 'react-router'; +import styled from 'styled-components'; import { EventRecord } from '@polkadot/types'; import { withCalls, withMulti } from '@polkadot/ui-api'; import Tabs, { TabItem } from '@polkadot/ui-app/Tabs'; @@ -32,6 +33,12 @@ type State = { recentEvents: Array; }; +const Wrapper = styled.main` + .rx--updated { + background: transparent !important; + } +`; + class ExplorerApp extends React.Component { constructor (props: Props) { super(props); @@ -89,7 +96,7 @@ class ExplorerApp extends React.Component { : ['node']; return ( -
+
{ -
+ ); } diff --git a/packages/app-storage/src/index.css b/packages/app-storage/src/index.css index 44b67e7bf8..cfb819cd66 100644 --- a/packages/app-storage/src/index.css +++ b/packages/app-storage/src/index.css @@ -4,16 +4,16 @@ .storage--Query { margin-bottom: 0.25em; -} -.storage--Query .ui.disabled.dropdown.selection { - color: #aaa; - opacity: 1; -} + .ui.disabled.dropdown.selection { + color: #aaa; + opacity: 1; + } -.storage--Query .ui--IdentityIcon { - margin: -10px 0; - vertical-align: middle; + .ui--IdentityIcon { + margin: -10px 0; + vertical-align: middle; + } } .storage--actionrow { diff --git a/packages/app-toolbox/src/Hash.tsx b/packages/app-toolbox/src/Hash.tsx index 0819761d21..cd8244fd1a 100644 --- a/packages/app-toolbox/src/Hash.tsx +++ b/packages/app-toolbox/src/Hash.tsx @@ -72,9 +72,10 @@ class Hash extends React.PureComponent { return (
{ return (
{ render () { - const { className, children, help, isError = false, isHidden, label, style, value, withCopy = false, withLabel } = this.props; + const { className, children, help, isError, isHidden, isMonospace, label, style, value, withCopy = false, withLabel } = this.props; return ( { style={style} withLabel={withLabel} > -
+
{value} {children} { withCopy ? ( - + ) : null } diff --git a/packages/ui-app/src/styles/components.css b/packages/ui-app/src/styles/components.css index b2d466d5e5..215fee2307 100644 --- a/packages/ui-app/src/styles/components.css +++ b/packages/ui-app/src/styles/components.css @@ -14,17 +14,21 @@ padding: .75rem 1rem; position: relative; word-wrap: break-word; -} -.ui--output .ui--output-button { - position: absolute; - top: 0.25rem; - right: 0.25rem; -} + &.error { + background: #fff6f6; + border-color: #e0b4b4; + } -.ui--output.error { - background: #fff6f6; - border-color: #e0b4b4; + &.monospace { + font-family: monospace; + } + + .ui--output-button { + position: absolute; + top: 0.25rem; + right: 0.25rem; + } } .ui--Button-Group .button {