AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-21 14:24:19 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Adwaita: resurrect scale-has-marks-above/below classes"

Browse Source 
This reverts commit edcc0c2783.
Since the colorscale styling is wrong in rtl, need to do things
differntly.
This commit is contained in:
Lapo Calamandrei 2016-02-20 19:50:49 +01:00
parent 44f6fcfbd3
commit effee1f35e
3 changed files with 3 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2592,7 +2592,9 @@ scale {
(':disabled', '-insensitive'),
(':backdrop', '-backdrop'),
(':backdrop:disabled', '-backdrop-insensitive') {
&.#{$marks_infix} trough,
&.fine-tune trough#{$nth_child} {}
trough#{$nth_child} {
slider {
margin: 0 1px;

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

@ -2763,10 +2763,8 @@ scale {
-gtk-icon-shadow: none; }
scale marks {
color: alpha(currentColor,0.4); }
scale.scale-has-marks-above trough slider,
scale trough:last-child:not(:only-child) slider {
margin: 0 1px; }
scale.scale-has-marks-above trough slider,
scale trough:last-child:not(:only-child) slider {
border-style: none;
border-radius: 0;
@ -2775,10 +2773,8 @@ scale {
background-position: top;
background-repeat: no-repeat;
box-shadow: none; }
scale.scale-has-marks-above trough slider,
scale trough:last-child:not(:only-child) slider {
margin: 0 1px; }
scale.scale-has-marks-above trough slider:hover,
scale trough:last-child:not(:only-child) slider:hover {
border-style: none;
border-radius: 0;
@ -2787,10 +2783,8 @@ scale {
background-position: top;
background-repeat: no-repeat;
box-shadow: none; }
scale.scale-has-marks-above trough slider,
scale trough:last-child:not(:only-child) slider {
margin: 0 1px; }
scale.scale-has-marks-above trough slider:active,
scale trough:last-child:not(:only-child) slider:active {
border-style: none;
border-radius: 0;
@ -2799,10 +2793,8 @@ scale {
background-position: top;
background-repeat: no-repeat;
box-shadow: none; }
scale.scale-has-marks-above trough slider,
scale trough:last-child:not(:only-child) slider {
margin: 0 1px; }
scale.scale-has-marks-above trough slider:disabled,
scale trough:last-child:not(:only-child) slider:disabled {
border-style: none;
border-radius: 0;
@ -2811,10 +2803,8 @@ scale {
background-position: top;
background-repeat: no-repeat;
box-shadow: none; }
scale.scale-has-marks-above trough slider,
scale trough:last-child:not(:only-child) slider {
margin: 0 1px; }
scale.scale-has-marks-above trough slider:backdrop,
scale trough:last-child:not(:only-child) slider:backdrop {
border-style: none;
border-radius: 0;
@ -2823,10 +2813,8 @@ scale {
background-position: top;
background-repeat: no-repeat;
box-shadow: none; }
scale.scale-has-marks-above trough slider,
scale trough:last-child:not(:only-child) slider {
margin: 0 1px; }
scale.scale-has-marks-above trough slider:backdrop:disabled,
scale trough:last-child:not(:only-child) slider:backdrop:disabled {
border-style: none;
border-radius: 0;
@ -2835,10 +2823,8 @@ scale {
background-position: top;
background-repeat: no-repeat;
box-shadow: none; }
scale.scale-has-marks-below trough slider,
scale trough:first-child:not(:only-child) slider {
margin: 0 1px; }
scale.scale-has-marks-below trough slider,
scale trough:first-child:not(:only-child) slider {
border-style: none;
border-radius: 0;
@ -2846,10 +2832,8 @@ scale {
background-position: bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.scale-has-marks-below trough slider,
scale trough:first-child:not(:only-child) slider {
margin: 0 1px; }
scale.scale-has-marks-below trough slider:hover,
scale trough:first-child:not(:only-child) slider:hover {
border-style: none;
border-radius: 0;
@ -2857,10 +2841,8 @@ scale {
background-position: bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.scale-has-marks-below trough slider,
scale trough:first-child:not(:only-child) slider {
margin: 0 1px; }
scale.scale-has-marks-below trough slider:active,
scale trough:first-child:not(:only-child) slider:active {
border-style: none;
border-radius: 0;
@ -2868,10 +2850,8 @@ scale {
background-position: bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.scale-has-marks-below trough slider,
scale trough:first-child:not(:only-child) slider {
margin: 0 1px; }
scale.scale-has-marks-below trough slider:disabled,
scale trough:first-child:not(:only-child) slider:disabled {
border-style: none;
border-radius: 0;
@ -2879,10 +2859,8 @@ scale {
background-position: bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.scale-has-marks-below trough slider,
scale trough:first-child:not(:only-child) slider {
margin: 0 1px; }
scale.scale-has-marks-below trough slider:backdrop,
scale trough:first-child:not(:only-child) slider:backdrop {
border-style: none;
border-radius: 0;
@ -2890,10 +2868,8 @@ scale {
background-position: bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.scale-has-marks-below trough slider,
scale trough:first-child:not(:only-child) slider {
margin: 0 1px; }
scale.scale-has-marks-below trough slider:backdrop:disabled,
scale trough:first-child:not(:only-child) slider:backdrop:disabled {
border-style: none;
border-radius: 0;
@ -2901,10 +2877,8 @@ scale {
background-position: bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.vertical.scale-has-marks-above trough slider,
scale.vertical trough:last-child:not(:only-child) slider {
margin: 0 1px; }
scale.vertical.scale-has-marks-above trough slider,
scale.vertical trough:last-child:not(:only-child) slider {
border-style: none;
border-radius: 0;
@ -2912,10 +2886,8 @@ scale {
background-position: left bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.vertical.scale-has-marks-above trough slider,
scale.vertical trough:last-child:not(:only-child) slider {
margin: 0 1px; }
scale.vertical.scale-has-marks-above trough slider:hover,
scale.vertical trough:last-child:not(:only-child) slider:hover {
border-style: none;
border-radius: 0;
@ -2923,10 +2895,8 @@ scale {
background-position: left bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.vertical.scale-has-marks-above trough slider,
scale.vertical trough:last-child:not(:only-child) slider {
margin: 0 1px; }
scale.vertical.scale-has-marks-above trough slider:active,
scale.vertical trough:last-child:not(:only-child) slider:active {
border-style: none;
border-radius: 0;
@ -2934,10 +2904,8 @@ scale {
background-position: left bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.vertical.scale-has-marks-above trough slider,
scale.vertical trough:last-child:not(:only-child) slider {
margin: 0 1px; }
scale.vertical.scale-has-marks-above trough slider:disabled,
scale.vertical trough:last-child:not(:only-child) slider:disabled {
border-style: none;
border-radius: 0;
@ -2945,10 +2913,8 @@ scale {
background-position: left bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.vertical.scale-has-marks-above trough slider,
scale.vertical trough:last-child:not(:only-child) slider {
margin: 0 1px; }
scale.vertical.scale-has-marks-above trough slider:backdrop,
scale.vertical trough:last-child:not(:only-child) slider:backdrop {
border-style: none;
border-radius: 0;
@ -2956,10 +2922,8 @@ scale {
background-position: left bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.vertical.scale-has-marks-above trough slider,
scale.vertical trough:last-child:not(:only-child) slider {
margin: 0 1px; }
scale.vertical.scale-has-marks-above trough slider:backdrop:disabled,
scale.vertical trough:last-child:not(:only-child) slider:backdrop:disabled {
border-style: none;
border-radius: 0;
@ -2967,10 +2931,8 @@ scale {
background-position: left bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.vertical.scale-has-marks-below trough slider,
scale.vertical trough:first-child:not(:only-child) slider {
margin: 0 1px; }
scale.vertical.scale-has-marks-below trough slider,
scale.vertical trough:first-child:not(:only-child) slider {
border-style: none;
border-radius: 0;
@ -2978,10 +2940,8 @@ scale {
background-position: right bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.vertical.scale-has-marks-below trough slider,
scale.vertical trough:first-child:not(:only-child) slider {
margin: 0 1px; }
scale.vertical.scale-has-marks-below trough slider:hover,
scale.vertical trough:first-child:not(:only-child) slider:hover {
border-style: none;
border-radius: 0;
@ -2989,10 +2949,8 @@ scale {
background-position: right bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.vertical.scale-has-marks-below trough slider,
scale.vertical trough:first-child:not(:only-child) slider {
margin: 0 1px; }
scale.vertical.scale-has-marks-below trough slider:active,
scale.vertical trough:first-child:not(:only-child) slider:active {
border-style: none;
border-radius: 0;
@ -3000,10 +2958,8 @@ scale {
background-position: right bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.vertical.scale-has-marks-below trough slider,
scale.vertical trough:first-child:not(:only-child) slider {
margin: 0 1px; }
scale.vertical.scale-has-marks-below trough slider:disabled,
scale.vertical trough:first-child:not(:only-child) slider:disabled {
border-style: none;
border-radius: 0;
@ -3011,10 +2967,8 @@ scale {
background-position: right bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.vertical.scale-has-marks-below trough slider,
scale.vertical trough:first-child:not(:only-child) slider {
margin: 0 1px; }
scale.vertical.scale-has-marks-below trough slider:backdrop,
scale.vertical trough:first-child:not(:only-child) slider:backdrop {
border-style: none;
border-radius: 0;
@ -3022,10 +2976,8 @@ scale {
background-position: right bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.vertical.scale-has-marks-below trough slider,
scale.vertical trough:first-child:not(:only-child) slider {
margin: 0 1px; }
scale.vertical.scale-has-marks-below trough slider:backdrop:disabled,
scale.vertical trough:first-child:not(:only-child) slider:backdrop:disabled {
border-style: none;
border-radius: 0;

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

@ -2794,10 +2794,8 @@ scale {
-gtk-icon-shadow: none; }
scale marks {
color: alpha(currentColor,0.4); }
scale.scale-has-marks-above trough slider,
scale trough:last-child:not(:only-child) slider {
margin: 0 1px; }
scale.scale-has-marks-above trough slider,
scale trough:last-child:not(:only-child) slider {
border-style: none;
border-radius: 0;
@ -2806,10 +2804,8 @@ scale {
background-position: top;
background-repeat: no-repeat;
box-shadow: none; }
scale.scale-has-marks-above trough slider,
scale trough:last-child:not(:only-child) slider {
margin: 0 1px; }
scale.scale-has-marks-above trough slider:hover,
scale trough:last-child:not(:only-child) slider:hover {
border-style: none;
border-radius: 0;
@ -2818,10 +2814,8 @@ scale {
background-position: top;
background-repeat: no-repeat;
box-shadow: none; }
scale.scale-has-marks-above trough slider,
scale trough:last-child:not(:only-child) slider {
margin: 0 1px; }
scale.scale-has-marks-above trough slider:active,
scale trough:last-child:not(:only-child) slider:active {
border-style: none;
border-radius: 0;
@ -2830,10 +2824,8 @@ scale {
background-position: top;
background-repeat: no-repeat;
box-shadow: none; }
scale.scale-has-marks-above trough slider,
scale trough:last-child:not(:only-child) slider {
margin: 0 1px; }
scale.scale-has-marks-above trough slider:disabled,
scale trough:last-child:not(:only-child) slider:disabled {
border-style: none;
border-radius: 0;
@ -2842,10 +2834,8 @@ scale {
background-position: top;
background-repeat: no-repeat;
box-shadow: none; }
scale.scale-has-marks-above trough slider,
scale trough:last-child:not(:only-child) slider {
margin: 0 1px; }
scale.scale-has-marks-above trough slider:backdrop,
scale trough:last-child:not(:only-child) slider:backdrop {
border-style: none;
border-radius: 0;
@ -2854,10 +2844,8 @@ scale {
background-position: top;
background-repeat: no-repeat;
box-shadow: none; }
scale.scale-has-marks-above trough slider,
scale trough:last-child:not(:only-child) slider {
margin: 0 1px; }
scale.scale-has-marks-above trough slider:backdrop:disabled,
scale trough:last-child:not(:only-child) slider:backdrop:disabled {
border-style: none;
border-radius: 0;
@ -2866,10 +2854,8 @@ scale {
background-position: top;
background-repeat: no-repeat;
box-shadow: none; }
scale.scale-has-marks-below trough slider,
scale trough:first-child:not(:only-child) slider {
margin: 0 1px; }
scale.scale-has-marks-below trough slider,
scale trough:first-child:not(:only-child) slider {
border-style: none;
border-radius: 0;
@ -2877,10 +2863,8 @@ scale {
background-position: bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.scale-has-marks-below trough slider,
scale trough:first-child:not(:only-child) slider {
margin: 0 1px; }
scale.scale-has-marks-below trough slider:hover,
scale trough:first-child:not(:only-child) slider:hover {
border-style: none;
border-radius: 0;
@ -2888,10 +2872,8 @@ scale {
background-position: bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.scale-has-marks-below trough slider,
scale trough:first-child:not(:only-child) slider {
margin: 0 1px; }
scale.scale-has-marks-below trough slider:active,
scale trough:first-child:not(:only-child) slider:active {
border-style: none;
border-radius: 0;
@ -2899,10 +2881,8 @@ scale {
background-position: bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.scale-has-marks-below trough slider,
scale trough:first-child:not(:only-child) slider {
margin: 0 1px; }
scale.scale-has-marks-below trough slider:disabled,
scale trough:first-child:not(:only-child) slider:disabled {
border-style: none;
border-radius: 0;
@ -2910,10 +2890,8 @@ scale {
background-position: bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.scale-has-marks-below trough slider,
scale trough:first-child:not(:only-child) slider {
margin: 0 1px; }
scale.scale-has-marks-below trough slider:backdrop,
scale trough:first-child:not(:only-child) slider:backdrop {
border-style: none;
border-radius: 0;
@ -2921,10 +2899,8 @@ scale {
background-position: bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.scale-has-marks-below trough slider,
scale trough:first-child:not(:only-child) slider {
margin: 0 1px; }
scale.scale-has-marks-below trough slider:backdrop:disabled,
scale trough:first-child:not(:only-child) slider:backdrop:disabled {
border-style: none;
border-radius: 0;
@ -2932,10 +2908,8 @@ scale {
background-position: bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.vertical.scale-has-marks-above trough slider,
scale.vertical trough:last-child:not(:only-child) slider {
margin: 0 1px; }
scale.vertical.scale-has-marks-above trough slider,
scale.vertical trough:last-child:not(:only-child) slider {
border-style: none;
border-radius: 0;
@ -2943,10 +2917,8 @@ scale {
background-position: left bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.vertical.scale-has-marks-above trough slider,
scale.vertical trough:last-child:not(:only-child) slider {
margin: 0 1px; }
scale.vertical.scale-has-marks-above trough slider:hover,
scale.vertical trough:last-child:not(:only-child) slider:hover {
border-style: none;
border-radius: 0;
@ -2954,10 +2926,8 @@ scale {
background-position: left bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.vertical.scale-has-marks-above trough slider,
scale.vertical trough:last-child:not(:only-child) slider {
margin: 0 1px; }
scale.vertical.scale-has-marks-above trough slider:active,
scale.vertical trough:last-child:not(:only-child) slider:active {
border-style: none;
border-radius: 0;
@ -2965,10 +2935,8 @@ scale {
background-position: left bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.vertical.scale-has-marks-above trough slider,
scale.vertical trough:last-child:not(:only-child) slider {
margin: 0 1px; }
scale.vertical.scale-has-marks-above trough slider:disabled,
scale.vertical trough:last-child:not(:only-child) slider:disabled {
border-style: none;
border-radius: 0;
@ -2976,10 +2944,8 @@ scale {
background-position: left bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.vertical.scale-has-marks-above trough slider,
scale.vertical trough:last-child:not(:only-child) slider {
margin: 0 1px; }
scale.vertical.scale-has-marks-above trough slider:backdrop,
scale.vertical trough:last-child:not(:only-child) slider:backdrop {
border-style: none;
border-radius: 0;
@ -2987,10 +2953,8 @@ scale {
background-position: left bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.vertical.scale-has-marks-above trough slider,
scale.vertical trough:last-child:not(:only-child) slider {
margin: 0 1px; }
scale.vertical.scale-has-marks-above trough slider:backdrop:disabled,
scale.vertical trough:last-child:not(:only-child) slider:backdrop:disabled {
border-style: none;
border-radius: 0;
@ -2998,10 +2962,8 @@ scale {
background-position: left bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.vertical.scale-has-marks-below trough slider,
scale.vertical trough:first-child:not(:only-child) slider {
margin: 0 1px; }
scale.vertical.scale-has-marks-below trough slider,
scale.vertical trough:first-child:not(:only-child) slider {
border-style: none;
border-radius: 0;
@ -3009,10 +2971,8 @@ scale {
background-position: right bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.vertical.scale-has-marks-below trough slider,
scale.vertical trough:first-child:not(:only-child) slider {
margin: 0 1px; }
scale.vertical.scale-has-marks-below trough slider:hover,
scale.vertical trough:first-child:not(:only-child) slider:hover {
border-style: none;
border-radius: 0;
@ -3020,10 +2980,8 @@ scale {
background-position: right bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.vertical.scale-has-marks-below trough slider,
scale.vertical trough:first-child:not(:only-child) slider {
margin: 0 1px; }
scale.vertical.scale-has-marks-below trough slider:active,
scale.vertical trough:first-child:not(:only-child) slider:active {
border-style: none;
border-radius: 0;
@ -3031,10 +2989,8 @@ scale {
background-position: right bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.vertical.scale-has-marks-below trough slider,
scale.vertical trough:first-child:not(:only-child) slider {
margin: 0 1px; }
scale.vertical.scale-has-marks-below trough slider:disabled,
scale.vertical trough:first-child:not(:only-child) slider:disabled {
border-style: none;
border-radius: 0;
@ -3042,10 +2998,8 @@ scale {
background-position: right bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.vertical.scale-has-marks-below trough slider,
scale.vertical trough:first-child:not(:only-child) slider {
margin: 0 1px; }
scale.vertical.scale-has-marks-below trough slider:backdrop,
scale.vertical trough:first-child:not(:only-child) slider:backdrop {
border-style: none;
border-radius: 0;
@ -3053,10 +3007,8 @@ scale {
background-position: right bottom;
background-repeat: no-repeat;
box-shadow: none; }
scale.vertical.scale-has-marks-below trough slider,
scale.vertical trough:first-child:not(:only-child) slider {
margin: 0 1px; }
scale.vertical.scale-has-marks-below trough slider:backdrop:disabled,
scale.vertical trough:first-child:not(:only-child) slider:backdrop:disabled {
border-style: none;
border-radius: 0;