Fix flat buttons

pull/224/head
Satyajit Sahoo 2014-12-13 20:05:09 +05:30
parent 1bd02efcda
commit e8f4bef04c
1 changed files with 31 additions and 33 deletions

View File

@ -15,16 +15,6 @@
-GtkWidget-focus-padding: 1; -GtkWidget-focus-padding: 1;
-GtkWidget-focus-line-width: 0; -GtkWidget-focus-line-width: 0;
&.flat {
color: inherit;
border: none;
background-color: transparent;
background-image: none;
box-shadow: none;
}
&.separator, .separator { border: 1px solid currentColor; }
} }
%linked_button { %linked_button {
@ -113,46 +103,54 @@
@mixin button($bg, $fg) { @mixin button($bg, $fg) {
@include linear-gradient(shade($bg, 1.05)); @include linear-gradient(shade($bg, 1.05));
@include border(shade($bg, 1.05));
@extend %button; @extend %button;
border-color: border_normal($bg);
color: $fg; color: $fg;
box-shadow: 0 1px 2px -1px alpha($dark_shadow, .3); box-shadow: 0 1px 2px -1px alpha($dark_shadow, .3);
&:insensitive {
@include linear-gradient(shade($bg, .95));
color: mix($bg, $fg, .5);
box-shadow: none;
}
&, &.flat {
@include border(shade($bg, 1.05));
&:focus, &:hover { &:focus, &:hover {
@include linear-gradient(shade($bg, 1.1)); @include linear-gradient(shade($bg, 1.1));
border-color: border_focus($bg);
box-shadow: 0 1px 3px -1px alpha($dark_shadow, .5); box-shadow: 0 1px 3px -1px alpha($dark_shadow, .5);
} }
&:checked, &:active { &:checked, &:active {
@include linear-gradient(shade($bg, .95)); @include linear-gradient(shade($bg, .95));
border-color: border_active($bg);
box-shadow: inset 1px 0 alpha($dark_shadow, .07), box-shadow: inset 1px 0 alpha($dark_shadow, .07),
inset 0 1px alpha($dark_shadow, .08), inset 0 1px alpha($dark_shadow, .08),
inset -1px 0 alpha($dark_shadow, .07), inset -1px 0 alpha($dark_shadow, .07),
inset 0 -1px alpha($dark_shadow, .05); inset 0 -1px alpha($dark_shadow, .05);
} }
&:insensitive {
@include linear-gradient(shade($bg, .95));
border-color: border_insensitive($bg);
color: mix($bg, $fg, .5);
box-shadow: none;
}
&:active:insensitive, &:active:insensitive,
&:checked:insensitive { &:checked:insensitive {
@include linear-gradient(shade($bg, .8)); @include linear-gradient(shade($bg, .8));
box-shadow: none; box-shadow: none;
} }
}
&.flat {
color: inherit;
border-color: transparent;
background-color: transparent;
background-image: none;
box-shadow: none;
}
&.separator, .separator { &.separator, .separator {
border: 1px solid currentColor;
color: shade($bg, ($contrast + .05)); color: shade($bg, ($contrast + .05));
&:insensitive { color: shade($bg, .85); } &:insensitive { color: shade($bg, .85); }