AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-16 21:50:34 +00:00
Code Issues Projects Releases Wiki Activity

Adwaita: set scale trough margins where they belong.

Browse Source
This commit is contained in:
Lapo Calamandrei 2014-11-12 17:30:59 +01:00
parent 5108a27e6c
commit bac7408be4
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/resources/theme/Adwaita/_common.scss
View File

@ -2235,18 +2235,22 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
.scale,
.scale.scale-has-marks-above.scale-has-marks-below,
.scale.vertical.scale-has-marks-above.scale-has-marks-below {
// FIXME: rationalize
-GtkScale-slider-length: 20;
-GtkRange-slider-width: 20;
-GtkRange-trough-border: 2;
outline-offset: -9px;
outline-radius: 4px;
margin: 10px;
&.fine-tune {
margin: 8px;
outline-offset: -7px;
outline-radius: 6px;
&.trough { border-radius: 4px; }
&.trough {
margin: 8px;
border-radius: 4px;
}
}
&.slider {
//FIXME: better gradient on the slider and hover state
@include button(normal);
@ -2297,6 +2301,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
}
}
&.trough {
margin: 10px;
border: 1px solid $borders_color;
border-radius: 3px;
background-color: mix($bg_color,$borders_color,60%);

6
gtk/resources/theme/Adwaita/gtk-contained-dark.css
View File

@ -2930,17 +2930,16 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
-GtkRange-slider-width: 20;
-GtkRange-trough-border: 2;
outline-offset: -9px;
outline-radius: 4px;
margin: 10px; }
outline-radius: 4px; }
.scale.fine-tune,
.scale.scale-has-marks-above.scale-has-marks-below.fine-tune,
.scale.vertical.scale-has-marks-above.scale-has-marks-below.fine-tune {
margin: 8px;
outline-offset: -7px;
outline-radius: 6px; }
.scale.fine-tune.trough,
.scale.scale-has-marks-above.scale-has-marks-below.fine-tune.trough,
.scale.vertical.scale-has-marks-above.scale-has-marks-below.fine-tune.trough {
margin: 8px;
border-radius: 4px; }
.scale.slider,
.scale.scale-has-marks-above.scale-has-marks-below.slider,
@ -3048,6 +3047,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
.scale.trough,
.scale.scale-has-marks-above.scale-has-marks-below.trough,
.scale.vertical.scale-has-marks-above.scale-has-marks-below.trough {
margin: 10px;
border: 1px solid #1c1f1f;
border-radius: 3px;
background-color: #2d3232;

6
gtk/resources/theme/Adwaita/gtk-contained.css
View File

@ -3083,17 +3083,16 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
-GtkRange-slider-width: 20;
-GtkRange-trough-border: 2;
outline-offset: -9px;
outline-radius: 4px;
margin: 10px; }
outline-radius: 4px; }
.scale.fine-tune,
.scale.scale-has-marks-above.scale-has-marks-below.fine-tune,
.scale.vertical.scale-has-marks-above.scale-has-marks-below.fine-tune {
margin: 8px;
outline-offset: -7px;
outline-radius: 6px; }
.scale.fine-tune.trough,
.scale.scale-has-marks-above.scale-has-marks-below.fine-tune.trough,
.scale.vertical.scale-has-marks-above.scale-has-marks-below.fine-tune.trough {
margin: 8px;
border-radius: 4px; }
.scale.slider,
.scale.scale-has-marks-above.scale-has-marks-below.slider,
@ -3201,6 +3200,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
.scale.trough,
.scale.scale-has-marks-above.scale-has-marks-below.trough,
.scale.vertical.scale-has-marks-above.scale-has-marks-below.trough {
margin: 10px;
border: 1px solid #a1a1a1;
border-radius: 3px;
background-color: #cecece;