AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Adwaita: scale with marks style fix

Browse Source 
reset background-color on the slider.
This commit is contained in:
Lapo Calamandrei 2016-04-19 22:55:55 +02:00
parent 5199b66682
commit c16c9e7c3f
3 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/theme/Adwaita/_common.scss
View File

@ -2937,6 +2937,7 @@ scale {
}
}
}
&.horizontal {
indicator {
min-height: $_marks_lenght;
@ -2945,6 +2946,7 @@ scale {
&.fine-tune indicator { min-height: ($_marks_lenght - 3px); }
}
&.vertical {
indicator {
min-height: 1px;
@ -2953,6 +2955,7 @@ scale {
&.fine-tune indicator { min-width: ($_marks_lenght - 3px); }
}
// *WARNING* scale with marks madness following
// FIXME: OSD and selected list rows missing, I don't feel like adding the other 144 assets needed for those...
@ -2979,6 +2982,7 @@ scale {
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url('#{$_scale_asset}.png'), url('#{$_scale_asset}@2.png'));
$_scale_slider_bg_pos: bottom;

24
gtk/theme/Adwaita/gtk-contained-dark.css
View File

@ -3241,6 +3241,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-dark.png"), url("assets/slider-horz-scale-has-marks-above-dark@2.png"));
min-height: 26px;
min-width: 22px;
@ -3256,6 +3257,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover-dark.png"), url("assets/slider-horz-scale-has-marks-above-hover-dark@2.png"));
min-height: 26px;
min-width: 22px;
@ -3271,6 +3273,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active-dark.png"), url("assets/slider-horz-scale-has-marks-above-active-dark@2.png"));
min-height: 26px;
min-width: 22px;
@ -3286,6 +3289,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png"));
min-height: 26px;
min-width: 22px;
@ -3301,6 +3305,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-dark.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-dark@2.png"));
min-height: 26px;
min-width: 22px;
@ -3316,6 +3321,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive-dark@2.png"));
min-height: 26px;
min-width: 22px;
@ -3330,6 +3336,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-dark.png"), url("assets/slider-horz-scale-has-marks-below-dark@2.png"));
min-height: 26px;
min-width: 22px;
@ -3344,6 +3351,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-hover-dark.png"), url("assets/slider-horz-scale-has-marks-below-hover-dark@2.png"));
min-height: 26px;
min-width: 22px;
@ -3358,6 +3366,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-active-dark.png"), url("assets/slider-horz-scale-has-marks-below-active-dark@2.png"));
min-height: 26px;
min-width: 22px;
@ -3372,6 +3381,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png"));
min-height: 26px;
min-width: 22px;
@ -3386,6 +3396,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-dark.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-dark@2.png"));
min-height: 26px;
min-width: 22px;
@ -3400,6 +3411,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive-dark@2.png"));
min-height: 26px;
min-width: 22px;
@ -3415,6 +3427,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-dark.png"), url("assets/slider-vert-scale-has-marks-above-dark@2.png"));
min-height: 22px;
min-width: 26px;
@ -3430,6 +3443,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-hover-dark.png"), url("assets/slider-vert-scale-has-marks-above-hover-dark@2.png"));
min-height: 22px;
min-width: 26px;
@ -3445,6 +3459,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-active-dark.png"), url("assets/slider-vert-scale-has-marks-above-active-dark@2.png"));
min-height: 22px;
min-width: 26px;
@ -3460,6 +3475,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png"));
min-height: 22px;
min-width: 26px;
@ -3475,6 +3491,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-dark.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-dark@2.png"));
min-height: 22px;
min-width: 26px;
@ -3490,6 +3507,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive-dark@2.png"));
min-height: 22px;
min-width: 26px;
@ -3505,6 +3523,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-dark.png"), url("assets/slider-vert-scale-has-marks-below-dark@2.png"));
min-height: 22px;
min-width: 26px;
@ -3520,6 +3539,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-hover-dark.png"), url("assets/slider-vert-scale-has-marks-below-hover-dark@2.png"));
min-height: 22px;
min-width: 26px;
@ -3535,6 +3555,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-active-dark.png"), url("assets/slider-vert-scale-has-marks-below-active-dark@2.png"));
min-height: 22px;
min-width: 26px;
@ -3550,6 +3571,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png"));
min-height: 22px;
min-width: 26px;
@ -3565,6 +3587,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-dark.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-dark@2.png"));
min-height: 22px;
min-width: 26px;
@ -3580,6 +3603,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive-dark@2.png"));
min-height: 22px;
min-width: 26px;

24
gtk/theme/Adwaita/gtk-contained.css
View File

@ -3270,6 +3270,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above.png"), url("assets/slider-horz-scale-has-marks-above@2.png"));
min-height: 26px;
min-width: 22px;
@ -3285,6 +3286,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-hover.png"), url("assets/slider-horz-scale-has-marks-above-hover@2.png"));
min-height: 26px;
min-width: 22px;
@ -3300,6 +3302,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-active.png"), url("assets/slider-horz-scale-has-marks-above-active@2.png"));
min-height: 26px;
min-width: 22px;
@ -3315,6 +3318,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-insensitive.png"), url("assets/slider-horz-scale-has-marks-above-insensitive@2.png"));
min-height: 26px;
min-width: 22px;
@ -3330,6 +3334,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop.png"), url("assets/slider-horz-scale-has-marks-above-backdrop@2.png"));
min-height: 26px;
min-width: 22px;
@ -3345,6 +3350,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive.png"), url("assets/slider-horz-scale-has-marks-above-backdrop-insensitive@2.png"));
min-height: 26px;
min-width: 22px;
@ -3359,6 +3365,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below.png"), url("assets/slider-horz-scale-has-marks-below@2.png"));
min-height: 26px;
min-width: 22px;
@ -3373,6 +3380,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-hover.png"), url("assets/slider-horz-scale-has-marks-below-hover@2.png"));
min-height: 26px;
min-width: 22px;
@ -3387,6 +3395,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-active.png"), url("assets/slider-horz-scale-has-marks-below-active@2.png"));
min-height: 26px;
min-width: 22px;
@ -3401,6 +3410,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-insensitive.png"), url("assets/slider-horz-scale-has-marks-below-insensitive@2.png"));
min-height: 26px;
min-width: 22px;
@ -3415,6 +3425,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop.png"), url("assets/slider-horz-scale-has-marks-below-backdrop@2.png"));
min-height: 26px;
min-width: 22px;
@ -3429,6 +3440,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive.png"), url("assets/slider-horz-scale-has-marks-below-backdrop-insensitive@2.png"));
min-height: 26px;
min-width: 22px;
@ -3444,6 +3456,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above.png"), url("assets/slider-vert-scale-has-marks-above@2.png"));
min-height: 22px;
min-width: 26px;
@ -3459,6 +3472,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-hover.png"), url("assets/slider-vert-scale-has-marks-above-hover@2.png"));
min-height: 22px;
min-width: 26px;
@ -3474,6 +3488,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-active.png"), url("assets/slider-vert-scale-has-marks-above-active@2.png"));
min-height: 22px;
min-width: 26px;
@ -3489,6 +3504,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-insensitive.png"), url("assets/slider-vert-scale-has-marks-above-insensitive@2.png"));
min-height: 22px;
min-width: 26px;
@ -3504,6 +3520,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop.png"), url("assets/slider-vert-scale-has-marks-above-backdrop@2.png"));
min-height: 22px;
min-width: 26px;
@ -3519,6 +3536,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive.png"), url("assets/slider-vert-scale-has-marks-above-backdrop-insensitive@2.png"));
min-height: 22px;
min-width: 26px;
@ -3534,6 +3552,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below.png"), url("assets/slider-vert-scale-has-marks-below@2.png"));
min-height: 22px;
min-width: 26px;
@ -3549,6 +3568,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-hover.png"), url("assets/slider-vert-scale-has-marks-below-hover@2.png"));
min-height: 22px;
min-width: 26px;
@ -3564,6 +3584,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-active.png"), url("assets/slider-vert-scale-has-marks-below-active@2.png"));
min-height: 22px;
min-width: 26px;
@ -3579,6 +3600,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-insensitive.png"), url("assets/slider-vert-scale-has-marks-below-insensitive@2.png"));
min-height: 22px;
min-width: 26px;
@ -3594,6 +3616,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop.png"), url("assets/slider-vert-scale-has-marks-below-backdrop@2.png"));
min-height: 22px;
min-width: 26px;
@ -3609,6 +3632,7 @@ scale {
margin: -10px;
border-style: none;
border-radius: 0;
background-color: transparent;
background-image: -gtk-scaled(url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive.png"), url("assets/slider-vert-scale-has-marks-below-backdrop-insensitive@2.png"));
min-height: 22px;
min-width: 26px;