kirbylife
/
numix-gtk-theme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix padding for nemo toolbar buttons (3.20). fix typo.

pull/313/head
Dustin Falgout 2016-04-10 04:53:28 -05:00
parent 6f961342d9
commit a7fcd6b7b5
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk-3.0/scss/widgets/_button.scss
View File

@ -106,7 +106,7 @@
&:checked:insensitive:last-child, &:checked:insensitive:only-child { box-shadow: none; } &: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, &: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), box-shadow: inset 0 1px alpha($dark_shadow, .07),
inset -1px 0 alpha($dark_shadow, .06); inset -1px 0 alpha($dark_shadow, .06);
} }

4
gtk-3.20/scss/apps/_nemo.scss
View File

@ -88,7 +88,7 @@
border: 0; border: 0;
} }
} }
toolbar { toolbar {
button { button {
@include button($bg_color, $fg_color); @include button($bg_color, $fg_color);
@ -117,7 +117,7 @@
} }
&.primary-toolbar button { &.primary-toolbar button {
padding: 5px 8px; padding: 5px 6px;
} }
} }
} }

9
gtk-3.20/scss/widgets/_button.scss
View File

@ -70,7 +70,9 @@
@mixin linked_button($bg) { @mixin linked_button($bg) {
$border_strength: if(lightness($bg) > 50, 0, .1); $border_strength: if(lightness($bg) > 50, 0, .1);
$shadow_strength: if(lightness($bg) > 50, 0, .1); $shadow_strength: if(lightness($bg) > 50, 0, .1);
@extend %linked_button; @extend %linked_button;
box-shadow: inset -1px 0 border_normal(rgba(0, 0, 0, .12 + $border_strength)), box-shadow: inset -1px 0 border_normal(rgba(0, 0, 0, .12 + $border_strength)),
0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength); 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength);
@ -115,10 +117,13 @@
@mixin button($bg, $fg) { @mixin button($bg, $fg) {
$border_strength: if(lightness($bg) > 50, 0, .1); $border_strength: if(lightness($bg) > 50, 0, .1);
$shadow_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); $button_bg: if(hue($bg) == 0deg, shade($bg, 1.2), $bg);
@extend %button; @extend %button;
@include linear-gradient($button_bg); @include linear-gradient($button_bg);
@include border(rgba(0, 0, 0, .12 + $border_strength)); @include border(rgba(0, 0, 0, .12 + $border_strength));
color: $fg; color: $fg;
box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength); box-shadow: 0 1px 2px -1px alpha($dark_shadow, .12 + $shadow_strength);
@ -133,11 +138,13 @@
&:focus, &:hover { &:focus, &:hover {
@include linear-gradient(shade($button_bg, 1.2)); @include linear-gradient(shade($button_bg, 1.2));
@include border(rgba(0, 0, 0, .2 + $border_strength)); @include border(rgba(0, 0, 0, .2 + $border_strength));
box-shadow: 0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength); box-shadow: 0 1px 2px -1px alpha($dark_shadow, .32 + $shadow_strength);
} }
&:checked { &:checked {
@include linear-gradient(shade($button_bg, .7), to top); @include linear-gradient(shade($button_bg, .7), to top);
color: $white; color: $white;
box-shadow: inset 1px 0 alpha($dark_shadow, .06), box-shadow: inset 1px 0 alpha($dark_shadow, .06),
inset 0 1px alpha($dark_shadow, .07), inset 0 1px alpha($dark_shadow, .07),
@ -146,6 +153,7 @@
&:focus, &:hover { &:focus, &:hover {
@include linear-gradient(shade($button_bg, .65), to top); @include linear-gradient(shade($button_bg, .65), to top);
color: $white; color: $white;
} }
} }
@ -154,6 +162,7 @@
&:active:disabled, &:checked:disabled { &:active:disabled, &:checked:disabled {
@include linear-gradient(shade($button_bg, .9)); @include linear-gradient(shade($button_bg, .9));
color: $fg; color: $fg;
box-shadow: none; box-shadow: none;
} }