diff options
| author | Thomas Huang <tmashuang@users.noreply.github.com> | 2019-06-18 01:26:57 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-18 01:26:57 +0800 |
| commit | 3f8f2a9ae13e915705a523c93dfc66bd033f2c60 (patch) | |
| tree | 10c6f004814be09306992390ca31382937d1fe8f /ui/app/css/itcss/components | |
| parent | 4f8bfded797ebfd1af5ea84be894e424e215af4e (diff) | |
| parent | af79692e890c45f2a26bf5fc0abf95988b1e15ea (diff) | |
| download | tangerine-wallet-browser-3f8f2a9ae13e915705a523c93dfc66bd033f2c60.tar.gz tangerine-wallet-browser-3f8f2a9ae13e915705a523c93dfc66bd033f2c60.tar.zst tangerine-wallet-browser-3f8f2a9ae13e915705a523c93dfc66bd033f2c60.zip | |
Merge branch 'develop' into Version-6.6.2
Diffstat (limited to 'ui/app/css/itcss/components')
| -rw-r--r-- | ui/app/css/itcss/components/menu.scss | 7 | ||||
| -rw-r--r-- | ui/app/css/itcss/components/network.scss | 20 | ||||
| -rw-r--r-- | ui/app/css/itcss/components/new-account.scss | 1 |
3 files changed, 20 insertions, 8 deletions
diff --git a/ui/app/css/itcss/components/menu.scss b/ui/app/css/itcss/components/menu.scss index 6409ad545..7d71ea799 100644 --- a/ui/app/css/itcss/components/menu.scss +++ b/ui/app/css/itcss/components/menu.scss @@ -8,7 +8,7 @@ &__item { padding: 18px; display: flex; - flex-flow: row nowrap; + flex-flow: row wrap; align-items: center; position: relative; z-index: 201; @@ -39,6 +39,11 @@ font-size: 16px; line-height: 21px; } + + &__subtext { + font-size: 12px; + padding: 5px 0px 0px 30px; + } } &__divider { diff --git a/ui/app/css/itcss/components/network.scss b/ui/app/css/itcss/components/network.scss index da90b7910..4275ffe92 100644 --- a/ui/app/css/itcss/components/network.scss +++ b/ui/app/css/itcss/components/network.scss @@ -8,9 +8,9 @@ } .network-component.pointer { - border: 2px solid $silver; + border: 2px solid $Grey-200; border-radius: 82px; - padding: 7px 3px; + padding: 6px 3px; flex: 0 0 auto; display: flex; @@ -47,11 +47,15 @@ align-items: center; font-size: .6em; - .fa-caret-down { - line-height: 15px; - font-size: 12px; - padding: 0 4px; - flex: 0 0 auto; + &__down-arrow { + height: 8px; + width: 12px; + display: block; + background-image: url(/images/icons/caret-down.svg); + background-repeat: no-repeat; + background-size: contain; + background-position: center; + margin: 0 8px; } .fa-question-circle { @@ -65,12 +69,14 @@ padding: 0 4px; font-family: Roboto; font-size: 12px; + line-height: 14px; flex: 1 1 auto; color: $tundora; font-weight: 500; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; + height: 16px; } .dropdown-menu-item .fa.delete { diff --git a/ui/app/css/itcss/components/new-account.scss b/ui/app/css/itcss/components/new-account.scss index 7bfa2d443..b3aae8eec 100644 --- a/ui/app/css/itcss/components/new-account.scss +++ b/ui/app/css/itcss/components/new-account.scss @@ -143,6 +143,7 @@ flex-flow: column; align-items: center; margin-top: 29px; + width: 100%; } &__buttons { |