From ad4b82505746f6ff78aed682c271afb4d34da49a Mon Sep 17 00:00:00 2001 From: Simon Grim Date: Wed, 3 Oct 2018 00:05:51 +0500 Subject: [PATCH] replace various SASS button.color-* extending by button-color-basic mixin --- sass/base/_utils.sass | 27 +++++++++++++++------------ sass/layout/_groupchat.sass | 2 +- sass/layout/_modal.sass | 2 +- sass/layout/_profile.sass | 4 ++-- sass/pages/_profile.sass | 4 ++-- 5 files changed, 21 insertions(+), 18 deletions(-) diff --git a/sass/base/_utils.sass b/sass/base/_utils.sass index 8b8872c..0d617e6 100644 --- a/sass/base/_utils.sass +++ b/sass/base/_utils.sass @@ -43,22 +43,25 @@ color: #666 +box-shadow(1px 1px 0 rgba(#444, .3)) +@mixin button-color-basic($type: 1) + $color: $main-color-color + $hover-border-color-darken-amount: 22% + @if $type == 2 + $color: #64676C + $hover-border-color-darken-amount: 15% + background: $color + border-color: darken($color, 5%) + color: white + font-weight: 500 + &:hover + border-color: darken($color, $hover-border-color-darken-amount) + button, a.button @include button-basic &.color-1 - background: $main-color-color - border-color: darken($main-color-color, 5%) - color: white - font-weight: 500 - &:hover - border-color: darken($main-color-color, 22%) + @include button-color-basic &.color-2 - background: #64676C - border-color: darken(#64676C, 5%) - color: white - font-weight: 500 - &:hover - border-color: darken(#64676C, 15%) + @include button-color-basic(2) &.small padding: .5rem font-weight: 700 diff --git a/sass/layout/_groupchat.sass b/sass/layout/_groupchat.sass index a10fab4..7e2fd0d 100644 --- a/sass/layout/_groupchat.sass +++ b/sass/layout/_groupchat.sass @@ -143,4 +143,4 @@ float: none display: inline-block padding: 7px - @extend .color-1 + @include button-color-basic diff --git a/sass/layout/_modal.sass b/sass/layout/_modal.sass index 17f4f79..51f78a4 100644 --- a/sass/layout/_modal.sass +++ b/sass/layout/_modal.sass @@ -145,7 +145,7 @@ $header-modal-height : $menu-height right: 2px top: $header-modal-height +2 z-index: 2000 - @extend .color-1 + @include button-color-basic &.new-users-modal diff --git a/sass/layout/_profile.sass b/sass/layout/_profile.sass index d82c268..c4ca928 100644 --- a/sass/layout/_profile.sass +++ b/sass/layout/_profile.sass @@ -109,9 +109,9 @@ $modal-postboard-post-height: 100% .follow - @extend .color-1 + @include button-color-basic .unfollow - @extend .color-2 + @include button-color-basic(2) .known-followers diff --git a/sass/pages/_profile.sass b/sass/pages/_profile.sass index 5c739a7..dc75427 100644 --- a/sass/pages/_profile.sass +++ b/sass/pages/_profile.sass @@ -59,9 +59,9 @@ &.last-child margin-right: 0 &.submit-changes - @extend button.color-1 + @include button-color-basic &.toggle-priv-key - @extend button.color-2 + @include button-color-basic(2) .secret-key-container text-align: left !important font-size: 1rem!important