From 2a5e1b7d46f1671298dd8400e506976dd760ba39 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 23 Sep 2016 22:10:33 +0200 Subject: [PATCH 1/8] spacing for accounts, contact & contracts consistent --- js/src/ui/Container/container.css | 2 +- js/src/ui/Page/page.css | 2 +- js/src/views/Accounts/List/list.css | 11 ++++++----- js/src/views/Accounts/List/list.js | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/js/src/ui/Container/container.css b/js/src/ui/Container/container.css index 3684a32ed06..61941ddf524 100644 --- a/js/src/ui/Container/container.css +++ b/js/src/ui/Container/container.css @@ -15,7 +15,7 @@ /* along with Parity. If not, see . */ .container { - padding: 0em 1em 1em 1em; + padding: 0em 1.5em 0.25em 1.5em; } .padded { diff --git a/js/src/ui/Page/page.css b/js/src/ui/Page/page.css index 7b0c4e16479..366add13ba3 100644 --- a/js/src/ui/Page/page.css +++ b/js/src/ui/Page/page.css @@ -15,5 +15,5 @@ /* along with Parity. If not, see . */ .layout { - padding: 0 3em; + padding: 0; } diff --git a/js/src/views/Accounts/List/list.css b/js/src/views/Accounts/List/list.css index 6258c7cd1c5..c38359e3ebb 100644 --- a/js/src/views/Accounts/List/list.css +++ b/js/src/views/Accounts/List/list.css @@ -19,18 +19,19 @@ flex-wrap: wrap; } -.account { +.item { flex: 0 1 50%; width: 50%; position: relative; + margin: 0 0 1em 0; } -.account:nth-child(odd)>div { - padding-right: 0.5em !important; +.item:nth-child(odd)>div { + padding-right: 0.75em; } -.account:nth-child(even)>div { - padding-left: 0.5em !important; +.item:nth-child(even)>div { + padding-left: 0.75em; } .empty { diff --git a/js/src/views/Accounts/List/list.js b/js/src/views/Accounts/List/list.js index 5623e3d69ec..5c09d0e3488 100644 --- a/js/src/views/Accounts/List/list.js +++ b/js/src/views/Accounts/List/list.js @@ -56,7 +56,7 @@ export default class List extends Component { return (
Date: Fri, 23 Sep 2016 22:13:07 +0200 Subject: [PATCH 2/8] update status padding/marging for consistency with the rest --- js/src/views/Application/Status/status.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/src/views/Application/Status/status.css b/js/src/views/Application/Status/status.css index c8f81d0e63d..9bfd3714bea 100644 --- a/js/src/views/Application/Status/status.css +++ b/js/src/views/Application/Status/status.css @@ -16,8 +16,8 @@ */ .status { clear: both; - padding: 1em; - margin: 1em 0; + padding: 0 1.5em; + margin: 0 0 1.5em 0; text-align: right; opacity: 0.75; } From e35af6d8d236218b3022e147156b1c1aee19a4b5 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 23 Sep 2016 22:31:43 +0200 Subject: [PATCH 3/8] actualbar with thin border --- js/src/ui/Actionbar/actionbar.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/src/ui/Actionbar/actionbar.css b/js/src/ui/Actionbar/actionbar.css index d290b05490b..ea5c9c66a52 100644 --- a/js/src/ui/Actionbar/actionbar.css +++ b/js/src/ui/Actionbar/actionbar.css @@ -16,7 +16,7 @@ */ .actionbar { padding: 0 24px !important; - margin-bottom: 1.5em; + margin-bottom: 0.25em; height: auto !important; background: rgba(0, 0, 0, 0.25) !important; } From 54b931ae723272264313b643fc3bb35cb7a02fa6 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 23 Sep 2016 22:32:02 +0200 Subject: [PATCH 4/8] containers & list with thin borders --- js/src/ui/Container/container.css | 2 +- js/src/views/Accounts/List/list.css | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/js/src/ui/Container/container.css b/js/src/ui/Container/container.css index 61941ddf524..71101411dca 100644 --- a/js/src/ui/Container/container.css +++ b/js/src/ui/Container/container.css @@ -15,7 +15,7 @@ /* along with Parity. If not, see . */ .container { - padding: 0em 1.5em 0.25em 1.5em; + padding: 0em 0.25em 0.25em 0.25em; } .padded { diff --git a/js/src/views/Accounts/List/list.css b/js/src/views/Accounts/List/list.css index c38359e3ebb..bde57bdbd3d 100644 --- a/js/src/views/Accounts/List/list.css +++ b/js/src/views/Accounts/List/list.css @@ -23,15 +23,15 @@ flex: 0 1 50%; width: 50%; position: relative; - margin: 0 0 1em 0; + margin: 0; } .item:nth-child(odd)>div { - padding-right: 0.75em; + padding-right: 0.125em; } .item:nth-child(even)>div { - padding-left: 0.75em; + padding-left: 0.125em; } .empty { From 4845e1b761c0b6f39f0460f462e791dc5107e655 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 23 Sep 2016 22:32:14 +0200 Subject: [PATCH 5/8] dapps layou conforms to other lists --- js/src/views/Dapps/dapps.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/src/views/Dapps/dapps.css b/js/src/views/Dapps/dapps.css index 26b9e952b69..88a6b1d23b9 100644 --- a/js/src/views/Dapps/dapps.css +++ b/js/src/views/Dapps/dapps.css @@ -26,9 +26,9 @@ } .contract:nth-child(odd)>div { - padding-right: 0.5em !important; + padding-right: 0.125em !important; } .contract:nth-child(even)>div { - padding-left: 0.5em !important; + padding-left: 0.125em !important; } From e3002b53bf56cfd8f939e2087f87b80a7ef4d40e Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 23 Sep 2016 22:32:43 +0200 Subject: [PATCH 6/8] adjust status padding (slightly non-standard for look-good purposes) --- js/src/views/Application/Status/status.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/js/src/views/Application/Status/status.css b/js/src/views/Application/Status/status.css index 9bfd3714bea..345c4b600ba 100644 --- a/js/src/views/Application/Status/status.css +++ b/js/src/views/Application/Status/status.css @@ -16,8 +16,7 @@ */ .status { clear: both; - padding: 0 1.5em; - margin: 0 0 1.5em 0; + padding: 1.25em 0.5em; text-align: right; opacity: 0.75; } From 5400a03c4851b7958d9a0a455abd0217351d4b1d Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 23 Sep 2016 22:34:20 +0200 Subject: [PATCH 7/8] update paritybar with thin borders --- js/src/views/ParityBar/parityBar.css | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/js/src/views/ParityBar/parityBar.css b/js/src/views/ParityBar/parityBar.css index 84c5b9c870c..7d0c6254b9a 100644 --- a/js/src/views/ParityBar/parityBar.css +++ b/js/src/views/ParityBar/parityBar.css @@ -33,14 +33,12 @@ .expanded { right: 16px; width: 964px; - height: 292px; + height: 296px; border-radius: 4px 4px 0 0; overflow-y: scroll; } .expanded .content { - padding: 0; - margin: 0 -1em; } .corner { @@ -98,7 +96,7 @@ height: 36px; padding: 0.5em 1em; background: rgba(0, 0, 0, 0.25); - margin-bottom: 0; + margin-bottom: 0.25em; } .header:after { From c9362b60fc3dce9fc50a20b48e1af1be9acfe893 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Sat, 24 Sep 2016 01:10:36 +0200 Subject: [PATCH 8/8] slight updates to overall statusbar --- js/src/views/Application/Status/status.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/src/views/Application/Status/status.css b/js/src/views/Application/Status/status.css index 345c4b600ba..c46b340226e 100644 --- a/js/src/views/Application/Status/status.css +++ b/js/src/views/Application/Status/status.css @@ -16,9 +16,9 @@ */ .status { clear: both; - padding: 1.25em 0.5em; + padding: 0.25em 0.5em 1.5em 0.5em; text-align: right; - opacity: 0.75; + color: #ddd; } .title {