diff options
author | Dan <danjm.com@gmail.com> | 2018-06-01 01:58:03 +0800 |
---|---|---|
committer | Dan <danjm.com@gmail.com> | 2018-06-01 01:58:03 +0800 |
commit | 5091b03e4b2499697cda376a44405139827068cd (patch) | |
tree | da91af2a0ce21871c15611f768f09757ef2c8533 /ui/app/css/itcss/components | |
parent | 6d8344d0d0af3734255a0e9e79d857d84b5fe2aa (diff) | |
parent | cc73d869fed79c63261821fb7ad8f1e5180ffca2 (diff) | |
download | tangerine-wallet-browser-5091b03e4b2499697cda376a44405139827068cd.tar.gz tangerine-wallet-browser-5091b03e4b2499697cda376a44405139827068cd.tar.zst tangerine-wallet-browser-5091b03e4b2499697cda376a44405139827068cd.zip |
Merge branch 'develop' into i3725-refactor-send-component-
Diffstat (limited to 'ui/app/css/itcss/components')
-rw-r--r-- | ui/app/css/itcss/components/buttons.scss | 49 | ||||
-rw-r--r-- | ui/app/css/itcss/components/loading-overlay.scss | 4 |
2 files changed, 27 insertions, 26 deletions
diff --git a/ui/app/css/itcss/components/buttons.scss b/ui/app/css/itcss/components/buttons.scss index 4cbed6093..f93daec04 100644 --- a/ui/app/css/itcss/components/buttons.scss +++ b/ui/app/css/itcss/components/buttons.scss @@ -2,10 +2,10 @@ Buttons */ +.btn-default, .btn-primary, -.btn-primary--lg, -.btn-secondary, -.btn-secondary--lg { +.btn-secondary { + height: 44px; background: $white; display: flex; justify-content: center; @@ -20,10 +20,16 @@ width: 100%; text-transform: uppercase; outline: none; + + &--disabled, + &[disabled] { + cursor: auto; + opacity: .5; + pointer-events: none; + } } -.btn-primary, -.btn-primary--lg { +.btn-primary { color: $curious-blue; border: 2px solid $spindle; @@ -35,17 +41,23 @@ &:hover { border-color: $curious-blue; } +} - &--disabled, - &[disabled] { - cursor: auto; - opacity: .5; - pointer-events: none; +.btn-secondary { + color: $monzo; + border: 2px solid lighten($monzo, 40%); + + &:active { + background: lighten($monzo, 55%); + border-color: $monzo; + } + + &:hover { + border-color: $monzo; } } -.btn-secondary, -.btn-secondary--lg { +.btn-default { color: $scorpion; border: 2px solid $dusty-gray; @@ -57,20 +69,9 @@ &:hover { border-color: $scorpion; } - - &--disabled, - &[disabled] { - cursor: auto; - opacity: .5; - pointer-events: none; - } -} - -.btn-primary, .btn-secondary { - height: 44px; } -.btn-primary--lg, .btn-secondary--lg { +.btn--large { height: 54px; } diff --git a/ui/app/css/itcss/components/loading-overlay.scss b/ui/app/css/itcss/components/loading-overlay.scss index c18b7fa59..b07d6af17 100644 --- a/ui/app/css/itcss/components/loading-overlay.scss +++ b/ui/app/css/itcss/components/loading-overlay.scss @@ -11,8 +11,8 @@ background: rgba(255, 255, 255, .8); @media screen and (max-width: 575px) { - margin-top: 56px; - height: calc(100% - 56px); + margin-top: 66px; + height: calc(100% - 66px); } @media screen and (min-width: 576px) { |