From 2e8b73fe905da97009c1506d76c2d3c61e2d5d38 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Tue, 22 Jan 2019 10:24:00 +0100 Subject: [PATCH] Node info & explorer info density adj. (#635) * Poll for system_health (keep-alive) * Node info & exp,orer info density adj. --- .../src/BlockByHash/Extrinsics.tsx | 5 ++- .../app-explorer/src/BlockByHash/Logs.tsx | 2 +- .../src/BlockHeader/BlockHeader.css | 40 +++++++++++++++---- .../app-explorer/src/BlockHeader/index.tsx | 24 ++++++----- packages/app-explorer/src/BlockHeaders.tsx | 3 +- packages/app-explorer/src/Events.tsx | 5 ++- packages/app-explorer/src/index.css | 17 ++++++-- packages/ui-app/src/styles/app.css | 1 + packages/ui-app/src/styles/components.css | 4 +- 9 files changed, 74 insertions(+), 27 deletions(-) diff --git a/packages/app-explorer/src/BlockByHash/Extrinsics.tsx b/packages/app-explorer/src/BlockByHash/Extrinsics.tsx index e0d7bfb1d0..0673133059 100644 --- a/packages/app-explorer/src/BlockByHash/Extrinsics.tsx +++ b/packages/app-explorer/src/BlockByHash/Extrinsics.tsx @@ -67,7 +67,10 @@ class Extrinsics extends React.PureComponent { } {this.renderSigner(extrinsic)} - + ); diff --git a/packages/app-explorer/src/BlockByHash/Logs.tsx b/packages/app-explorer/src/BlockByHash/Logs.tsx index 8ab5ad140c..b1333154a4 100644 --- a/packages/app-explorer/src/BlockByHash/Logs.tsx +++ b/packages/app-explorer/src/BlockByHash/Logs.tsx @@ -58,7 +58,7 @@ class Logs extends React.PureComponent {
-
+
{content}
diff --git a/packages/app-explorer/src/BlockHeader/BlockHeader.css b/packages/app-explorer/src/BlockHeader/BlockHeader.css index c865163ba5..cf8c2f8922 100644 --- a/packages/app-explorer/src/BlockHeader/BlockHeader.css +++ b/packages/app-explorer/src/BlockHeader/BlockHeader.css @@ -15,15 +15,44 @@ overflow: hidden; } + &.summary { + .header .hash { + /* 0.5 * 0.5 */ + opacity: 0.5625; + } + + &.summary { + .details > .contains { + height: 0; + transition: none; + transform: scale(0); + } + } + + &:hover { + .details > .contains { + height: auto; + margin-top: 0.5rem; + transform: scale(1); + transition: all 200ms ease-in; + } + } + } + .author { font-size: 1rem; - margin-top: 0.5rem; text-align: right; + vertical-align: middle; + + > .ui--AddressMini.padded { + padding: 0; + } } .header { color: rgba(0, 0, 0, 0.6); - margin-bottom: 0.25rem; + display: flex; + line-height: 2.25rem; overflow: hidden; text-align: left; text-overflow: ellipsis; @@ -33,19 +62,16 @@ > div { display: inline-block; font-weight: 100; - margin-bottom: 0.25rem; vertical-align: middle; white-space: nowrap; } > .number { - font-size: 2.75rem; - line-height: 1; + font-size: 2.25rem; } .hash { - font-size: 1.5em; - line-height: 1; + font-size: 1.5rem; } } diff --git a/packages/app-explorer/src/BlockHeader/index.tsx b/packages/app-explorer/src/BlockHeader/index.tsx index 5243e48a5e..e7249fb63e 100644 --- a/packages/app-explorer/src/BlockHeader/index.tsx +++ b/packages/app-explorer/src/BlockHeader/index.tsx @@ -15,6 +15,7 @@ import numberFormat from '@polkadot/ui-reactive/util/numberFormat'; import Extrinsics from './Extrinsics'; type Props = BareProps & { + isSummary?: boolean, value?: HeaderExtended, withExtrinsics?: boolean, withLink?: boolean @@ -22,7 +23,7 @@ type Props = BareProps & { export default class BlockHeader extends React.PureComponent { render () { - const { value, withExtrinsics = false, withLink = false } = this.props; + const { isSummary, value, withExtrinsics = false, withLink = false } = this.props; if (!value) { return null; @@ -31,16 +32,22 @@ export default class BlockHeader extends React.PureComponent { const { author, blockNumber, extrinsicsRoot, parentHash, stateRoot } = value; const parentHex = parentHash.toHex(); const hashHex = value.hash.toHex(); + const textNumber = numberFormat(blockNumber); return ( -
+
-
{numberFormat(blockNumber)} 
-
{ +
{ withLink - ? {hashHex} - : hashHex + ? {textNumber} + : textNumber + } 
+
{hashHex}
+
{ + author + ? + : undefined }
@@ -65,11 +72,6 @@ export default class BlockHeader extends React.PureComponent { : undefined }
-
{ - author - ? - : undefined - }
); diff --git a/packages/app-explorer/src/BlockHeaders.tsx b/packages/app-explorer/src/BlockHeaders.tsx index a153ebe877..e8a2b91982 100644 --- a/packages/app-explorer/src/BlockHeaders.tsx +++ b/packages/app-explorer/src/BlockHeaders.tsx @@ -47,6 +47,7 @@ class BlockHeaders extends React.PureComponent {
{headers.map((header) => ( { } } -export default withCall('rpc.chain.subscribeNewHead', { propName: 'headers', transform })(BlockHeaders); +export default withCall('derive.chain.subscribeNewHead', { propName: 'headers', transform })(BlockHeaders); diff --git a/packages/app-explorer/src/Events.tsx b/packages/app-explorer/src/Events.tsx index 69bc77f14d..b4490003bd 100644 --- a/packages/app-explorer/src/Events.tsx +++ b/packages/app-explorer/src/Events.tsx @@ -71,7 +71,10 @@ class Events extends React.PureComponent { }
- + ); } diff --git a/packages/app-explorer/src/index.css b/packages/app-explorer/src/index.css index d69a76c6e8..33935fdd3a 100644 --- a/packages/app-explorer/src/index.css +++ b/packages/app-explorer/src/index.css @@ -24,8 +24,8 @@ } .explorer--BestNumber { - font-size: 2.75rem; - line-height: 2.75rem; + font-size: 2.25rem; + line-height: 2.25rem; position: relative; text-align: right; } @@ -44,6 +44,13 @@ .explorer--Container { color: inherit; + &:hover > .details { + height: auto; + opacity: 1; + transform: scale(1); + transition: all 200ms ease-in; + } + .header { position: relative; @@ -56,7 +63,11 @@ } } - .value { + > .details { + height: 0; + opacity: 0; + transition: none; + transform: scale(0); word-break: break-all; } } diff --git a/packages/ui-app/src/styles/app.css b/packages/ui-app/src/styles/app.css index c027120d5a..b7c7be20af 100644 --- a/packages/ui-app/src/styles/app.css +++ b/packages/ui-app/src/styles/app.css @@ -19,6 +19,7 @@ body { h1, h2, h3, h4, h5 { color: rgba(0, 0, 0, .6); + font-family: sans-serif; font-weight: 100; } diff --git a/packages/ui-app/src/styles/components.css b/packages/ui-app/src/styles/components.css index d726055690..5d670ff9c9 100644 --- a/packages/ui-app/src/styles/components.css +++ b/packages/ui-app/src/styles/components.css @@ -169,9 +169,9 @@ header .ui--Button-Group { } .ui--CardSummary-large { - font-size: 2.75rem; + font-size: 2.25rem; font-weight: 100; - line-height: 2.75rem; + line-height: 2.25rem; text-align: right; }