diff options
| author | Hsuan Lee <hsuan@cobinhood.com> | 2018-11-09 18:51:41 +0800 |
|---|---|---|
| committer | Hsuan Lee <hsuan@cobinhood.com> | 2018-12-10 18:48:50 +0800 |
| commit | 7f0bdbcd8119af5db67abbe2bdd04f90adb66b42 (patch) | |
| tree | 452946dd2a9bc6ca2992cf953b60f01ca6cf6d5f /ui/app | |
| parent | d2e2d7908c20d901a436f055cd4feba289465306 (diff) | |
| download | dexon-wallet-7f0bdbcd8119af5db67abbe2bdd04f90adb66b42.tar.gz dexon-wallet-7f0bdbcd8119af5db67abbe2bdd04f90adb66b42.tar.zst dexon-wallet-7f0bdbcd8119af5db67abbe2bdd04f90adb66b42.zip | |
Hide ETH conversion rate
Diffstat (limited to 'ui/app')
| -rw-r--r-- | ui/app/components/pages/settings/settings-tab/settings-tab.component.js | 4 | ||||
| -rw-r--r-- | ui/app/css/itcss/components/account-dropdown-mini.scss | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ui/app/components/pages/settings/settings-tab/settings-tab.component.js b/ui/app/components/pages/settings/settings-tab/settings-tab.component.js index f6af62bc..a110d3c4 100644 --- a/ui/app/components/pages/settings/settings-tab/settings-tab.component.js +++ b/ui/app/components/pages/settings/settings-tab/settings-tab.component.js @@ -442,11 +442,7 @@ export default class SettingsTab extends PureComponent { htmlFor="native-primary-currency" className="settings-tab__radio-label" > -<<<<<<< HEAD { nativeCurrency } -======= - { t('dex') } ->>>>>>> Update translations </label> </div> <div className="settings-tab__radio-button"> diff --git a/ui/app/css/itcss/components/account-dropdown-mini.scss b/ui/app/css/itcss/components/account-dropdown-mini.scss index 996993db..36a57204 100644 --- a/ui/app/css/itcss/components/account-dropdown-mini.scss +++ b/ui/app/css/itcss/components/account-dropdown-mini.scss @@ -23,7 +23,7 @@ border: 1px solid $geyser; border-radius: 4px; background-color: $white; - box-shadow: 0 3px 6px 0 rgba(0 ,0 ,0 ,.11); + box-shadow: 0 3px 6px 0 rgba(0, 0, 0, 0.11); overflow-y: scroll; } @@ -36,6 +36,10 @@ overflow: hidden; white-space: nowrap; width: 80px; + max-width: 220px; + max-height: 16px; + overflow: hidden; + text-overflow: ellipsis; } .account-list-item__top-row { @@ -45,4 +49,4 @@ .account-list-item__icon { position: initial; } -}
\ No newline at end of file +} |