Browse Source

replace various SASS button.color-* extending by button-color-basic mixin

nin-v2
Simon Grim 6 years ago
parent
commit
ad4b825057
  1. 27
      sass/base/_utils.sass
  2. 2
      sass/layout/_groupchat.sass
  3. 2
      sass/layout/_modal.sass
  4. 4
      sass/layout/_profile.sass
  5. 4
      sass/pages/_profile.sass

27
sass/base/_utils.sass

@ -43,22 +43,25 @@
color: #666 color: #666
+box-shadow(1px 1px 0 rgba(#444, .3)) +box-shadow(1px 1px 0 rgba(#444, .3))
button, a.button @mixin button-color-basic($type: 1)
@include button-basic $color: $main-color-color
&.color-1 $hover-border-color-darken-amount: 22%
background: $main-color-color @if $type == 2
border-color: darken($main-color-color, 5%) $color: #64676C
$hover-border-color-darken-amount: 15%
background: $color
border-color: darken($color, 5%)
color: white color: white
font-weight: 500 font-weight: 500
&:hover &:hover
border-color: darken($main-color-color, 22%) border-color: darken($color, $hover-border-color-darken-amount)
button, a.button
@include button-basic
&.color-1
@include button-color-basic
&.color-2 &.color-2
background: #64676C @include button-color-basic(2)
border-color: darken(#64676C, 5%)
color: white
font-weight: 500
&:hover
border-color: darken(#64676C, 15%)
&.small &.small
padding: .5rem padding: .5rem
font-weight: 700 font-weight: 700

2
sass/layout/_groupchat.sass

@ -143,4 +143,4 @@
float: none float: none
display: inline-block display: inline-block
padding: 7px padding: 7px
@extend .color-1 @include button-color-basic

2
sass/layout/_modal.sass

@ -145,7 +145,7 @@ $header-modal-height : $menu-height
right: 2px right: 2px
top: $header-modal-height +2 top: $header-modal-height +2
z-index: 2000 z-index: 2000
@extend .color-1 @include button-color-basic
&.new-users-modal &.new-users-modal

4
sass/layout/_profile.sass

@ -109,9 +109,9 @@ $modal-postboard-post-height: 100%
.follow .follow
@extend .color-1 @include button-color-basic
.unfollow .unfollow
@extend .color-2 @include button-color-basic(2)
.known-followers .known-followers

4
sass/pages/_profile.sass

@ -59,9 +59,9 @@
&.last-child &.last-child
margin-right: 0 margin-right: 0
&.submit-changes &.submit-changes
@extend button.color-1 @include button-color-basic
&.toggle-priv-key &.toggle-priv-key
@extend button.color-2 @include button-color-basic(2)
.secret-key-container .secret-key-container
text-align: left !important text-align: left !important
font-size: 1rem!important font-size: 1rem!important

Loading…
Cancel
Save