diff options
| author | Hsuan Lee <boczeratul@gmail.com> | 2018-10-23 19:51:08 +0800 |
|---|---|---|
| committer | Hsuan Lee <hsuan@cobinhood.com> | 2018-12-10 18:20:24 +0800 |
| commit | 1bd092cd21bf01cc4fe1148272c7ce0d1ab86dab (patch) | |
| tree | 1995b8c0eaee30a1b8a49ddbaf4bbd7cf708dfe8 | |
| parent | d1409b4f746baafdc6c5efc82c783a9fd1724de6 (diff) | |
| download | dexon-wallet-1bd092cd21bf01cc4fe1148272c7ce0d1ab86dab.tar.gz dexon-wallet-1bd092cd21bf01cc4fe1148272c7ce0d1ab86dab.tar.zst dexon-wallet-1bd092cd21bf01cc4fe1148272c7ce0d1ab86dab.zip | |
Update style
| -rw-r--r-- | app/manifest.json | 8 | ||||
| -rw-r--r-- | app/scripts/inpage.js | 3 | ||||
| -rw-r--r-- | ui/app/components/network-display/index.scss | 15 | ||||
| -rw-r--r-- | ui/app/components/page-container/index.scss | 2 | ||||
| -rw-r--r-- | ui/app/css/itcss/settings/variables.scss | 1 |
5 files changed, 9 insertions, 20 deletions
diff --git a/app/manifest.json b/app/manifest.json index 15e8c2c1..0f957f54 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -8,10 +8,10 @@ "commands": { "_execute_browser_action": { "suggested_key": { - "windows": "Alt+Shift+M", - "mac": "Alt+Shift+M", - "chromeos": "Alt+Shift+M", - "linux": "Alt+Shift+M" + "windows": "Alt+Shift+D", + "mac": "Alt+Shift+D", + "chromeos": "Alt+Shift+D", + "linux": "Alt+Shift+D" } } }, diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js index 057d7add..f910afed 100644 --- a/app/scripts/inpage.js +++ b/app/scripts/inpage.js @@ -158,8 +158,9 @@ detectAccountRequest('sendAsync') inpageProvider.publicConfigStore.subscribe(function (state) { web3.eth.defaultAccount = state.selectedAddress }) + // expose provider -window.dexon = inpageProvider +window.dexon = proxiedInpageProvider // need to make sure we aren't affected by overlapping namespaces // and that we dont affect the app with our namespace diff --git a/ui/app/components/network-display/index.scss b/ui/app/components/network-display/index.scss index 67cea650..cb233e3f 100644 --- a/ui/app/components/network-display/index.scss +++ b/ui/app/components/network-display/index.scss @@ -3,27 +3,16 @@ display: flex; align-items: center; justify-content: flex-start; - background-color: lighten(rgb(74, 74, 74), 45%); + background-color: $muddy-gray; padding: 0 10px; border-radius: 4px; height: 25px; - - &--colored { - background-color: lighten(rgb(125, 128, 130), 45%); - } - - &--mainnet { - background-color: lighten($dexon-purple, 68%); - } - - &--testnet { - background-color: lighten($silver-chalice, 68%); - } } &__name { font-size: .75rem; padding-left: 5px; + color: $dim-gray; } &__icon { diff --git a/ui/app/components/page-container/index.scss b/ui/app/components/page-container/index.scss index 78b23dee..a8f4c7d1 100644 --- a/ui/app/components/page-container/index.scss +++ b/ui/app/components/page-container/index.scss @@ -152,7 +152,7 @@ } &__warning-container { - background: $linen; + background: $muddy-gray; padding: 20px; display: flex; align-items: start; diff --git a/ui/app/css/itcss/settings/variables.scss b/ui/app/css/itcss/settings/variables.scss index bb4af1e8..fee7ada6 100644 --- a/ui/app/css/itcss/settings/variables.scss +++ b/ui/app/css/itcss/settings/variables.scss @@ -28,7 +28,6 @@ $dusty-gray: #777777; $alto: #dedede; $alabaster: #fafafa; $silver-chalice: #aeaeae; -$dexon-purple: #2f9ae0; $concrete: #f3f3f3; $tundora: #4d4d4d; $nile-blue: #1b344d; |