Merge pull request #542 from megax/patch15

[Gtk-3.20] Fix padding for circular, osd-image, combo and column-header buttons
pull/522/head
Khurshid Alam 2016-08-31 20:03:05 +05:30 committed by GitHub
commit 9c07db416b
5 changed files with 27 additions and 4 deletions

View File

@ -69,6 +69,7 @@
button {
min-height: 16px;
min-width: 16px;
padding: ($spacing - 1px);
}
button:first-child {

View File

@ -381,7 +381,11 @@
.linked.vertical > & { @include linked_vertical_button(shade($bg_color, 1.2)); }
&.circular { // FIXME: aggregate to buttons
&.circular,
&.circular-button { // FIXME: aggregate to buttons
padding: 0;
min-width: 28px;
min-height: 28px;
border-radius: 9999px; // Fixed: https://github.com/GNOME/gtk/commit/a6409458f0d50d673a4dc370b9251993b7835b6b
-gtk-outline-radius: 9999px;
@ -453,6 +457,12 @@
}
&.vertical {
button, entry {
min-width: 0;
padding-left: $spacing - 2px;
padding-right: $spacing - 2px;
}
entry {
// reset all the other props since the spinbutton node is styled here
border-radius: 0;
@ -482,8 +492,8 @@
button.combo {
// otherwise the arrow placement is not symmetric
min-width: 0;
padding-left: 8px;
padding-right: 8px;
padding-left: $spacing + 2px;
padding-right: $spacing + 2px;
}
arrow {

View File

@ -198,6 +198,8 @@
button.flat {
min-height: 16px;
min-width: 16px;
padding: 0;
@extend %close_button;
}
}

View File

@ -8,6 +8,16 @@
@include exports("osd") {
overlay.osd { background-color: transparent; }
button.osd {
@include button($osd_bg, $osd_fg);
&.image-button {
padding: 0;
min-height: 36px;
min-width: 36px;
}
}
.osd {
background-color: $osd_bg;
color: $osd_fg;

View File

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