diff --git a/gtk-3.0/scss/widgets/_button.scss b/gtk-3.0/scss/widgets/_button.scss index c1b92aa..2376614 100755 --- a/gtk-3.0/scss/widgets/_button.scss +++ b/gtk-3.0/scss/widgets/_button.scss @@ -106,7 +106,7 @@ &:checked:insensitive:last-child, &:checked:insensitive:only-child { box-shadow: none; } &:active:last-child, &:active:last-child:focus, &:active:last-child:hover, &:active:last-child:hover:focus, - &:checked:last-child, &:checked:last-child:focus, &:checked:last-child:hover, &:checked:last-child:hover:focus, { + &:checked:last-child, &:checked:last-child:focus, &:checked:last-child:hover, &:checked:last-child:hover:focus { box-shadow: inset 0 1px alpha($dark_shadow, .07), inset -1px 0 alpha($dark_shadow, .06); } diff --git a/gtk-3.20/scss/apps/_nemo.scss b/gtk-3.20/scss/apps/_nemo.scss index 302f0ce..d8526d5 100644 --- a/gtk-3.20/scss/apps/_nemo.scss +++ b/gtk-3.20/scss/apps/_nemo.scss @@ -88,7 +88,7 @@ border: 0; } } - + toolbar { button { @include button($bg_color, $fg_color); @@ -117,7 +117,7 @@ } &.primary-toolbar button { - padding: 5px 8px; + padding: 5px 6px; } } } diff --git a/gtk-3.20/scss/widgets/_button.scss b/gtk-3.20/scss/widgets/_button.scss index 73efcd4..e574124 100755 --- a/gtk-3.20/scss/widgets/_button.scss +++ b/gtk-3.20/scss/widgets/_button.scss @@ -70,7 +70,9 @@ @mixin linked_button($bg) { $border_strength: if(lightness($bg) > 50, 0, .1); $shadow_strength: if(lightness($bg) > 50, 0, .1); + @extend %linked_button; + box-shadow: inset -1px 0 border_normal(rgba(0, 0, 0, .12 + $border_strength)), 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength); @@ -115,10 +117,13 @@ @mixin button($bg, $fg) { $border_strength: if(lightness($bg) > 50, 0, .1); $shadow_strength: if(lightness($bg) > 50, 0, .1); + $button_bg: if(hue($bg) == 0deg, shade($bg, 1.2), $bg); + @extend %button; @include linear-gradient($button_bg); @include border(rgba(0, 0, 0, .12 + $border_strength)); + color: $fg; box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength); @@ -133,11 +138,13 @@ &:focus, &:hover { @include linear-gradient(shade($button_bg, 1.2)); @include border(rgba(0, 0, 0, .2 + $border_strength)); + box-shadow: 0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength); } &:checked { @include linear-gradient(shade($button_bg, .7), to top); + color: $white; box-shadow: inset 1px 0 alpha($dark_shadow, .06), inset 0 1px alpha($dark_shadow, .07), @@ -146,6 +153,7 @@ &:focus, &:hover { @include linear-gradient(shade($button_bg, .65), to top); + color: $white; } } @@ -154,6 +162,7 @@ &:active:disabled, &:checked:disabled { @include linear-gradient(shade($button_bg, .9)); + color: $fg; box-shadow: none; }