diff options
| author | Dan Finlay <dan@danfinlay.com> | 2018-03-08 05:39:44 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2018-03-08 05:39:44 +0800 |
| commit | d0ba2d2d9428f13208ea54e9fa78f122ed42549b (patch) | |
| tree | 7786903649241ab688b5622719cae34f804abef7 /ui/app/css | |
| parent | 423f084cb47d84e2e9063a6567454f83592f424b (diff) | |
| parent | ca047b1ea0bd6778fc3b0c05b86ff23d0964f98d (diff) | |
| download | tangerine-wallet-browser-d0ba2d2d9428f13208ea54e9fa78f122ed42549b.tar.gz tangerine-wallet-browser-d0ba2d2d9428f13208ea54e9fa78f122ed42549b.tar.zst tangerine-wallet-browser-d0ba2d2d9428f13208ea54e9fa78f122ed42549b.zip | |
Merge branch 'master' into i3076-UseStorageLocalInstead
Diffstat (limited to 'ui/app/css')
| -rw-r--r-- | ui/app/css/itcss/components/account-menu.scss | 5 | ||||
| -rw-r--r-- | ui/app/css/itcss/components/modal.scss | 4 | ||||
| -rw-r--r-- | ui/app/css/itcss/components/new-account.scss | 10 | ||||
| -rw-r--r-- | ui/app/css/itcss/settings/variables.scss | 4 |
4 files changed, 21 insertions, 2 deletions
diff --git a/ui/app/css/itcss/components/account-menu.scss b/ui/app/css/itcss/components/account-menu.scss index 8ad7481c7..4752741aa 100644 --- a/ui/app/css/itcss/components/account-menu.scss +++ b/ui/app/css/itcss/components/account-menu.scss @@ -66,8 +66,9 @@ .keyring-label { margin-top: 5px; - background-color: $black; - color: $dusty-gray; + background-color: $dusty-gray; + color: $black; + font-weight: normal; } } diff --git a/ui/app/css/itcss/components/modal.scss b/ui/app/css/itcss/components/modal.scss index 919e1793b..53e3bff00 100644 --- a/ui/app/css/itcss/components/modal.scss +++ b/ui/app/css/itcss/components/modal.scss @@ -787,6 +787,10 @@ width: auto; flex: 1; } + + @media screen and (max-width: 575px) { + width: auto; + } } } diff --git a/ui/app/css/itcss/components/new-account.scss b/ui/app/css/itcss/components/new-account.scss index 81f919df3..c6c254ede 100644 --- a/ui/app/css/itcss/components/new-account.scss +++ b/ui/app/css/itcss/components/new-account.scss @@ -54,6 +54,16 @@ } +.new-account-import-disclaimer { + width: 120%; + background-color: #F4F9FC; + display: inline-block; + align-items: center; + padding: 20px 30px 20px; + font-size: 12px; + line-height: 1.5; +} + .new-account-import-form { display: flex; flex-flow: column; diff --git a/ui/app/css/itcss/settings/variables.scss b/ui/app/css/itcss/settings/variables.scss index 4c0972527..d96c1ae43 100644 --- a/ui/app/css/itcss/settings/variables.scss +++ b/ui/app/css/itcss/settings/variables.scss @@ -46,6 +46,10 @@ $manatee: #93949d; $spindle: #c7ddec; $mid-gray: #5b5d67; $cape-cod: #38393a; +$java: #29b6af; +$wild-strawberry: #ff4a8d; +$cornflower-blue: #7057ff; +$saffron: #f6c343; /* Z-Indicies |