From 4846b5bdef32e3b36020e190a3c0d221f39911be Mon Sep 17 00:00:00 2001 From: maxgrapps Date: Wed, 7 Aug 2019 22:24:27 +0300 Subject: [PATCH 1/4] validator info fix --- .../assets/css/theme/_dark-theme.scss | 35 ++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/apps/block_scout_web/assets/css/theme/_dark-theme.scss b/apps/block_scout_web/assets/css/theme/_dark-theme.scss index c0adb0a84b..3785079a11 100644 --- a/apps/block_scout_web/assets/css/theme/_dark-theme.scss +++ b/apps/block_scout_web/assets/css/theme/_dark-theme.scss @@ -234,7 +234,7 @@ $labels-dark: #8a8dba; // header nav, labels } } - .btn-copy-icon, .btn-qr-icon { + .btn-copy-icon, .btn-qr-icon, .btn-address-card-icon { border-color: $dark-primary; path { fill: $dark-primary; @@ -680,4 +680,37 @@ $labels-dark: #8a8dba; // header nav, labels color: #3f436b !important; border-right-color: #3f436b !important; } + + // 'text dark' label + .text-dark { + color: #fff; + } + + // validator info + #validatorModal { + .modal-title { + color: #fff; + } + + .text-muted { + color: $labels-dark; + } + + .modal-footer { + border-top-color: darken($labels-dark, 30); + } + + .modal-content { + background-color: $dark-light-bg; + + .btn-primary { + background-color: $dark-primary; + border-color: $dark-primary; + &:hover { + background-color: $dark-primary; + border-color: $dark-primary; + } + } + } + } } \ No newline at end of file From 2928cbb2c188a010f31f06f9fd53dac97af87ad1 Mon Sep 17 00:00:00 2001 From: maxgrapps <50101080+maxgrapps@users.noreply.github.com> Date: Wed, 7 Aug 2019 22:27:58 +0300 Subject: [PATCH 2/4] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 213c27d218..2ff7f1313b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - [#2456](https://github.com/poanetwork/blockscout/pull/2456) - fetch pending transactions for geth ### Fixes +- [#2524](https://github.com/poanetwork/blockscout/pull/2524) - fix dark theme validator data styles - [#2503](https://github.com/poanetwork/blockscout/pull/2503) - Mitigate autocompletion library influence to page loading performance - [#2502](https://github.com/poanetwork/blockscout/pull/2502) - increase reward task timeout - [#2463](https://github.com/poanetwork/blockscout/pull/2463) - dark theme fixes From 2c6f3a6b45e47d35eceba5c0d72a5ed1ee7ae17e Mon Sep 17 00:00:00 2001 From: maxgrapps Date: Thu, 8 Aug 2019 20:14:15 +0300 Subject: [PATCH 3/4] danger alert color fix for dark theme, address button fix for default theme --- apps/block_scout_web/assets/css/theme/_dai_variables.scss | 1 + apps/block_scout_web/assets/css/theme/_dark-theme.scss | 7 +++++++ .../assets/css/theme/_ethereum_classic_variables.scss | 1 + .../assets/css/theme/_ethereum_variables.scss | 1 + .../assets/css/theme/_goerli_variables.scss | 1 + .../block_scout_web/assets/css/theme/_kovan_variables.scss | 1 + .../block_scout_web/assets/css/theme/_lukso_variables.scss | 1 + .../assets/css/theme/_neutral_variables.scss | 1 + apps/block_scout_web/assets/css/theme/_poa_variables.scss | 1 + .../assets/css/theme/_rinkeby_variables.scss | 1 + .../assets/css/theme/_ropsten_variables.scss | 1 + apps/block_scout_web/assets/css/theme/_rsk_variables.scss | 1 + .../block_scout_web/assets/css/theme/_sokol_variables.scss | 1 + 13 files changed, 19 insertions(+) diff --git a/apps/block_scout_web/assets/css/theme/_dai_variables.scss b/apps/block_scout_web/assets/css/theme/_dai_variables.scss index 0c09660240..6722369c7f 100644 --- a/apps/block_scout_web/assets/css/theme/_dai_variables.scss +++ b/apps/block_scout_web/assets/css/theme/_dai_variables.scss @@ -38,6 +38,7 @@ $btn-line-bg: #fff; // button bg $btn-line-color: $secondary; // button border and font color && hover bg color $btn-copy-color: $secondary; // btn copy $btn-qr-color: $secondary; // btn qr-code +$btn-address-card-icon-color: $secondary; // btn address color //links & tile $tile-body-a-color: $secondary; diff --git a/apps/block_scout_web/assets/css/theme/_dark-theme.scss b/apps/block_scout_web/assets/css/theme/_dark-theme.scss index f9f81c33f2..db607a5ec5 100644 --- a/apps/block_scout_web/assets/css/theme/_dark-theme.scss +++ b/apps/block_scout_web/assets/css/theme/_dark-theme.scss @@ -712,9 +712,16 @@ $labels-dark: #8a8dba; // header nav, labels } } } + } // alert link .alert-link { color: $dark-secondary; } + + // alert danger + .alert-danger { + background-color: $dark-light; + border-color: $dark-light; + } } \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/theme/_ethereum_classic_variables.scss b/apps/block_scout_web/assets/css/theme/_ethereum_classic_variables.scss index dff677d7cc..6b8d6d7f96 100644 --- a/apps/block_scout_web/assets/css/theme/_ethereum_classic_variables.scss +++ b/apps/block_scout_web/assets/css/theme/_ethereum_classic_variables.scss @@ -34,6 +34,7 @@ $btn-line-bg: #fff; // button bg $btn-line-color: $tertiary; // button border and font color && hover bg color $btn-copy-color: $tertiary; // btn copy $btn-qr-color: $tertiary; // btn qr-code +$btn-address-card-icon-color: $tertiary; // btn address color //links & tile $tile-body-a-color: $tertiary; diff --git a/apps/block_scout_web/assets/css/theme/_ethereum_variables.scss b/apps/block_scout_web/assets/css/theme/_ethereum_variables.scss index 0b5cac0c43..a06e0be93e 100644 --- a/apps/block_scout_web/assets/css/theme/_ethereum_variables.scss +++ b/apps/block_scout_web/assets/css/theme/_ethereum_variables.scss @@ -37,6 +37,7 @@ $btn-line-bg: #fff; // button bg $btn-line-color: $secondary; // button border and font color && hover bg color $btn-copy-color: $secondary; // btn copy $btn-qr-color: $secondary; // btn qr-code +$btn-address-card-icon-color: $secondary; // btn address color //links & tile $tile-body-a-color: $secondary; diff --git a/apps/block_scout_web/assets/css/theme/_goerli_variables.scss b/apps/block_scout_web/assets/css/theme/_goerli_variables.scss index 04f953b477..af57f2d1a2 100644 --- a/apps/block_scout_web/assets/css/theme/_goerli_variables.scss +++ b/apps/block_scout_web/assets/css/theme/_goerli_variables.scss @@ -43,6 +43,7 @@ $btn-line-bg: #fff; // button bg $btn-line-color: $sub-accent-color; // button border and font color && hover bg color $btn-copy-color: $sub-accent-color; // btn copy $btn-qr-color: $sub-accent-color; // btn qr-code +$btn-address-card-icon-color: $sub-accent-color; // btn address color //links & tile $tile-body-a-color: $sub-accent-color; diff --git a/apps/block_scout_web/assets/css/theme/_kovan_variables.scss b/apps/block_scout_web/assets/css/theme/_kovan_variables.scss index a4edc629d0..b47c3de0b2 100644 --- a/apps/block_scout_web/assets/css/theme/_kovan_variables.scss +++ b/apps/block_scout_web/assets/css/theme/_kovan_variables.scss @@ -38,6 +38,7 @@ $btn-line-bg: #fff; // button bg $btn-line-color: $tertiary; // button border and font color && hover bg color $btn-copy-color: $tertiary; // btn copy $btn-qr-color: $tertiary; // btn qr-code +$btn-address-card-icon-color: $tertiary; // btn address color //links & tile $tile-body-a-color: $tertiary; diff --git a/apps/block_scout_web/assets/css/theme/_lukso_variables.scss b/apps/block_scout_web/assets/css/theme/_lukso_variables.scss index a7b608bfa8..abfcc05472 100644 --- a/apps/block_scout_web/assets/css/theme/_lukso_variables.scss +++ b/apps/block_scout_web/assets/css/theme/_lukso_variables.scss @@ -44,6 +44,7 @@ $btn-line-bg: #fff; // button bg $btn-line-color: $primary; // button border and font color && hover bg color $btn-copy-color: $primary; // btn copy $btn-qr-color: $primary; // btn qr-code +$btn-address-card-icon-color: $primary; // btn address color // card $card-background-1: $primary; diff --git a/apps/block_scout_web/assets/css/theme/_neutral_variables.scss b/apps/block_scout_web/assets/css/theme/_neutral_variables.scss index 120a11c222..536ecdc105 100644 --- a/apps/block_scout_web/assets/css/theme/_neutral_variables.scss +++ b/apps/block_scout_web/assets/css/theme/_neutral_variables.scss @@ -40,6 +40,7 @@ $btn-line-bg: #fff; // button bg $btn-line-color: $primary; // button border and font color && hover bg color $btn-copy-color: $primary; // btn copy $btn-qr-color: $primary; // btn qr-code +$btn-address-card-icon-color: $primary; // btn address color //links & tile $tile-body-a-color: $primary; diff --git a/apps/block_scout_web/assets/css/theme/_poa_variables.scss b/apps/block_scout_web/assets/css/theme/_poa_variables.scss index 120a11c222..536ecdc105 100644 --- a/apps/block_scout_web/assets/css/theme/_poa_variables.scss +++ b/apps/block_scout_web/assets/css/theme/_poa_variables.scss @@ -40,6 +40,7 @@ $btn-line-bg: #fff; // button bg $btn-line-color: $primary; // button border and font color && hover bg color $btn-copy-color: $primary; // btn copy $btn-qr-color: $primary; // btn qr-code +$btn-address-card-icon-color: $primary; // btn address color //links & tile $tile-body-a-color: $primary; diff --git a/apps/block_scout_web/assets/css/theme/_rinkeby_variables.scss b/apps/block_scout_web/assets/css/theme/_rinkeby_variables.scss index 4fa700c50e..21388bb315 100644 --- a/apps/block_scout_web/assets/css/theme/_rinkeby_variables.scss +++ b/apps/block_scout_web/assets/css/theme/_rinkeby_variables.scss @@ -37,6 +37,7 @@ $btn-line-bg: #fff; // button bg $btn-line-color: $secondary; // button border and font color && hover bg color $btn-copy-color: $secondary; // btn copy $btn-qr-color: $secondary; // btn qr-code +$btn-address-card-icon-color: $secondary; // btn address color //links & tile $tile-body-a-color: $secondary; diff --git a/apps/block_scout_web/assets/css/theme/_ropsten_variables.scss b/apps/block_scout_web/assets/css/theme/_ropsten_variables.scss index 4fa700c50e..21388bb315 100644 --- a/apps/block_scout_web/assets/css/theme/_ropsten_variables.scss +++ b/apps/block_scout_web/assets/css/theme/_ropsten_variables.scss @@ -37,6 +37,7 @@ $btn-line-bg: #fff; // button bg $btn-line-color: $secondary; // button border and font color && hover bg color $btn-copy-color: $secondary; // btn copy $btn-qr-color: $secondary; // btn qr-code +$btn-address-card-icon-color: $secondary; // btn address color //links & tile $tile-body-a-color: $secondary; diff --git a/apps/block_scout_web/assets/css/theme/_rsk_variables.scss b/apps/block_scout_web/assets/css/theme/_rsk_variables.scss index d33996a89e..8d3bff31d2 100644 --- a/apps/block_scout_web/assets/css/theme/_rsk_variables.scss +++ b/apps/block_scout_web/assets/css/theme/_rsk_variables.scss @@ -38,6 +38,7 @@ $btn-line-bg: #fff; // button bg $btn-line-color: $secondary; // button border and font color && hover bg color $btn-copy-color: $secondary; // btn copy $btn-qr-color: $secondary; // btn qr-code +$btn-address-card-icon-color: $secondary; // btn address color // card $card-background-1: $secondary; diff --git a/apps/block_scout_web/assets/css/theme/_sokol_variables.scss b/apps/block_scout_web/assets/css/theme/_sokol_variables.scss index 8d479f397d..2860342f1e 100644 --- a/apps/block_scout_web/assets/css/theme/_sokol_variables.scss +++ b/apps/block_scout_web/assets/css/theme/_sokol_variables.scss @@ -49,6 +49,7 @@ $btn-line-bg: #fff; // button bg $btn-line-color: $sub-accent-color; // button border and font color && hover bg color $btn-copy-color: $sub-accent-color; // btn copy $btn-qr-color: $sub-accent-color; // btn qr-code +$btn-address-card-icon-color: $sub-accent-color; // btn address color //links & tile $tile-body-a-color: $sub-accent-color; From edc53d0fbc5d7f87790ae6a6ac540a9d137bd313 Mon Sep 17 00:00:00 2001 From: maxgrapps Date: Fri, 9 Aug 2019 21:08:38 +0300 Subject: [PATCH 4/4] buttons fix, alerts fix --- .../assets/css/theme/_dark-theme.scss | 66 +++++++++++++++++-- 1 file changed, 60 insertions(+), 6 deletions(-) diff --git a/apps/block_scout_web/assets/css/theme/_dark-theme.scss b/apps/block_scout_web/assets/css/theme/_dark-theme.scss index db607a5ec5..dd1ee83d96 100644 --- a/apps/block_scout_web/assets/css/theme/_dark-theme.scss +++ b/apps/block_scout_web/assets/css/theme/_dark-theme.scss @@ -578,9 +578,41 @@ $labels-dark: #8a8dba; // header nav, labels } } } - .verify-other-explorers-cell { - .exp-logo { - color: #333 !important; + + #explorersModal { + .modal-title { + color: #fff; + } + + .text-muted { + color: $labels-dark; + } + + .modal-footer { + border-top-color: darken($labels-dark, 30); + } + + .modal-content { + background-color: $dark-light-bg; + + .btn-primary { + background-color: $dark-primary; + border-color: $dark-primary; + &:hover { + background-color: $dark-primary; + border-color: $dark-primary; + } + } + } + + .verify-other-explorers-cell { + .exp-logo { + color: #fff; + } + } + + .close { + color: #fff; } } @@ -712,16 +744,38 @@ $labels-dark: #8a8dba; // header nav, labels } } } + + .close { + color: #fff; + } } - // alert link + // alerts .alert-link { - color: $dark-secondary; + color: $labels-dark; } - // alert danger .alert-danger { background-color: $dark-light; border-color: $dark-light; + .alert-link { + color: $alert-danger-color; + } + } + + .tile .alert { + background: rgba(#000, .1); + } + + // primary buttons + .btn-full-primary, .button-primary { + background: $dark-primary; + border-color: $dark-primary; + color: #fff; + &:hover { + background: darken($dark-primary, 6); + border-color: darken($dark-primary, 6); + color: #fff; + } } } \ No newline at end of file