[Gtk-3.20] Redecorate osd toolbar & fix volume slider. Fixes #463

pull/552/head
Csaba Jakosa 2016-08-31 20:08:31 +02:00 committed by Khurshid Alam
parent 03bb8b35d8
commit ff98d448fc
2 changed files with 21 additions and 29 deletions

View File

@ -18,6 +18,25 @@
} }
} }
// stand-alone OSD toolbars
toolbar.osd {
-GtkToolbar-button-relief: normal;
padding: $spacing;
border: 1px solid border_normal($osd_bg);
border-radius: $roundness;
background-color: $osd_bg;
background-image: none;
color: $osd_fg;
separator { color: shade($osd_bg, ($contrast + .1)); }
&.left,
&.right,
&.top,
&.bottom { border-radius: 0; } // positional classes for `attached` osd toolbars
}
.osd { .osd {
background-color: $osd_bg; background-color: $osd_bg;
color: $osd_fg; color: $osd_fg;
@ -34,20 +53,6 @@
entry { @include entry($osd_base, $osd_text_color, $osd_borders_color); } entry { @include entry($osd_base, $osd_text_color, $osd_borders_color); }
toolbar {
-GtkToolbar-button-relief: normal;
padding: $spacing;
border: 1px solid border_normal($osd_bg);
border-radius: $roundness;
background-color: $osd_bg;
background-image: none;
color: $osd_fg;
separator { color: shade($osd_bg, ($contrast + .1)); }
}
/* used by gnome-settings-daemon's media-keys OSD */ /* used by gnome-settings-daemon's media-keys OSD */
trough { background-color: shade($osd_bg, .8); } trough { background-color: shade($osd_bg, .8); }

View File

@ -147,20 +147,7 @@
min-height: 10px; min-height: 10px;
min-width: 10px; min-width: 10px;
padding: $spacing ($spacing * 2);
&.horizontal {
padding: 6px 0;
trough { padding: 0 7px; }
highlight, fill { margin: 0 -7px; }
}
&.vertical {
padding: 0 6px;
trough { padding: 7px 0; }
highlight, fill { margin: -7px 0; }
}
// The slider is inside the trough, negative margin to make it bigger // The slider is inside the trough, negative margin to make it bigger
slider { slider {