Fix various button paddings

Still not perfect, but looks better than before. The whole area should
be refactored as the extends and overrides are a bit ugly.
pull/354/head
SammysHP 2016-04-16 21:34:20 +02:00
parent 3ad6588875
commit e7726994ee
3 changed files with 7 additions and 12 deletions

View File

@ -45,7 +45,7 @@
} }
%button { %button {
padding: $spacing ($spacing + 2px); padding: $spacing ($spacing * 1.4);
border-width: 1px; border-width: 1px;
border-style: solid; border-style: solid;
border-radius: $roundness; border-radius: $roundness;
@ -262,15 +262,12 @@
} }
button { button {
min-height: 22px;
min-width: 24px;
@include button(shade($bg_color, 1.2), $fg_color); @include button(shade($bg_color, 1.2), $fg_color);
&.linked, .linked & { @include linked_button(shade($bg_color, 1.2)); } &.linked, .linked & { @include linked_button(shade($bg_color, 1.2)); }
spinbutton & { spinbutton & {
color: mix($text_color, $base_color, .4); color: mix($text_color, $base_color, .4);
padding: $spacing ($spacing * 2);
border: 0; border: 0;
border-radius: 0; border-radius: 0;
border-style: none; border-style: none;
@ -360,8 +357,7 @@
button.combo { button.combo {
// otherwise the arrow placement is not symmetric // otherwise the arrow placement is not symmetric
min-width: 0; min-width: 0;
padding-left: 8px; padding: ($spacing - 2px) ($spacing + 1px);
padding-right: 8px;
} }
arrow { arrow {
@ -372,7 +368,6 @@
box button, box entry { box button, box entry {
@extend %linked_button; @extend %linked_button;
padding: ($spacing - 2px) ($spacing + 1px);
} }
.linked:not(.vertical) > & > box > button.combo { .linked:not(.vertical) > & > box > button.combo {

View File

@ -9,7 +9,7 @@
@include linear-gradient($bg); @include linear-gradient($bg);
@include border($bg); @include border($bg);
padding: $spacing * 2; padding: $spacing;
color: $fg; color: $fg;
&:disabled { &:disabled {
@ -33,11 +33,11 @@
button.linked, .linked button { @include linked_button($bg); } button.linked, .linked button { @include linked_button($bg); }
combobox, button { combobox, button {
padding: $spacing - 1px; padding: $spacing - 1px; // FIXME Why override everything, must be applied again for .text-button
&.text-button { padding: $spacing; } &.text-button { padding: $spacing ($spacing * 1.4); }
&.image-button { padding: ($spacing + 1px) ($spacing - 1px) ($spacing + 1px) $spacing; } &.image-button { padding: $spacing; } // FIXME Side effect with toolbar, order important (toolbar buttons might have both, text-button and image-button)
} }
// toolbar separators // toolbar separators

View File

@ -59,7 +59,7 @@
} }
%column_header_button { %column_header_button {
padding: 0 6px; padding: ($spacing * 0.5) $spacing ($spacing * 0.2) $spacing;
border-radius: 0; border-radius: 0;
background-image: none; background-image: none;
text-shadow: none; text-shadow: none;