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

themes: Optimize code for marks margins on scales

Browse Source 
Separate marks margins for horizontal/vertical scales. Prevents
generation of unused margins.

Closes https://gitlab.gnome.org/GNOME/gtk/issues/1703
This commit is contained in:
Alex Monday 2019-03-02 14:08:11 +05:00
parent 95e2e48582
commit deba92f729
6 changed files with 53 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3229,27 +3229,22 @@ scale {
}
}
marks,
value { color: gtkalpha(currentColor, 0.55); }
marks {
color: gtkalpha(currentColor, 0.55);
@each $marks_class, $marks_pos, $marks_margin in (top, top, bottom),
(bottom, bottom, top),
(top, left, right),
(bottom, right, left) {
//marks margins
@each $scale_orient, $marks_class, $marks_pos, $marks_margin in (horizontal, top, top, bottom),
(horizontal, bottom, bottom, top),
(vertical, top, left, right),
(vertical, bottom, right, left) {
&.#{$scale_orient} marks {
&.#{$marks_class} {
margin-#{$marks_margin}: $_marks_distance;
margin-#{$marks_pos}: -($_marks_distance + $_marks_length);
}
}
}
&.fine-tune marks {
@each $marks_class, $marks_pos, $marks_margin in (top, top, bottom),
(bottom, bottom, top),
(top, left, right),
(bottom, right, left) {
&.#{$scale_orient}.fine-tune marks {
&.#{$marks_class} {
margin-#{$marks_margin}: $_marks_distance;
margin-#{$marks_pos}: -($_marks_distance + $_marks_length - 3px);

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

@ -1293,25 +1293,23 @@ row:selected scale slider:disabled, row:selected scale slider { border-color: #0
.osd scale slider:backdrop:disabled { background-color: #24212a; }
scale value { color: alpha(currentColor,0.55); }
scale marks, scale value { color: alpha(currentColor,0.55); }
scale marks { color: alpha(currentColor,0.55); }
scale.horizontal marks.top { margin-bottom: 6px; margin-top: -12px; }
scale marks.top { margin-bottom: 6px; margin-top: -12px; }
scale.horizontal.fine-tune marks.top { margin-bottom: 6px; margin-top: -9px; }
scale marks.bottom { margin-top: 6px; margin-bottom: -12px; }
scale.horizontal marks.bottom { margin-top: 6px; margin-bottom: -12px; }
scale marks.top { margin-right: 6px; margin-left: -12px; }
scale.horizontal.fine-tune marks.bottom { margin-top: 6px; margin-bottom: -9px; }
scale marks.bottom { margin-left: 6px; margin-right: -12px; }
scale.vertical marks.top { margin-right: 6px; margin-left: -12px; }
scale.fine-tune marks.top { margin-bottom: 6px; margin-top: -9px; }
scale.vertical.fine-tune marks.top { margin-right: 6px; margin-left: -9px; }
scale.fine-tune marks.bottom { margin-top: 6px; margin-bottom: -9px; }
scale.vertical marks.bottom { margin-left: 6px; margin-right: -12px; }
scale.fine-tune marks.top { margin-right: 6px; margin-left: -9px; }
scale.fine-tune marks.bottom { margin-left: 6px; margin-right: -9px; }
scale.vertical.fine-tune marks.bottom { margin-left: 6px; margin-right: -9px; }
scale.horizontal indicator { min-height: 6px; min-width: 1px; }

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

@ -1313,25 +1313,23 @@ row:selected scale slider:disabled, row:selected scale slider { border-color: #1
.osd scale slider:backdrop:disabled { background-color: #24212a; }
scale value { color: alpha(currentColor,0.55); }
scale marks, scale value { color: alpha(currentColor,0.55); }
scale marks { color: alpha(currentColor,0.55); }
scale.horizontal marks.top { margin-bottom: 6px; margin-top: -12px; }
scale marks.top { margin-bottom: 6px; margin-top: -12px; }
scale.horizontal.fine-tune marks.top { margin-bottom: 6px; margin-top: -9px; }
scale marks.bottom { margin-top: 6px; margin-bottom: -12px; }
scale.horizontal marks.bottom { margin-top: 6px; margin-bottom: -12px; }
scale marks.top { margin-right: 6px; margin-left: -12px; }
scale.horizontal.fine-tune marks.bottom { margin-top: 6px; margin-bottom: -9px; }
scale marks.bottom { margin-left: 6px; margin-right: -12px; }
scale.vertical marks.top { margin-right: 6px; margin-left: -12px; }
scale.fine-tune marks.top { margin-bottom: 6px; margin-top: -9px; }
scale.vertical.fine-tune marks.top { margin-right: 6px; margin-left: -9px; }
scale.fine-tune marks.bottom { margin-top: 6px; margin-bottom: -9px; }
scale.vertical marks.bottom { margin-left: 6px; margin-right: -12px; }
scale.fine-tune marks.top { margin-right: 6px; margin-left: -9px; }
scale.fine-tune marks.bottom { margin-left: 6px; margin-right: -9px; }
scale.vertical.fine-tune marks.bottom { margin-left: 6px; margin-right: -9px; }
scale.horizontal indicator { min-height: 6px; min-width: 1px; }

22
gtk/theme/HighContrast/_common.scss
View File

@ -2509,33 +2509,29 @@ scale {
}
}
marks,
value { color: gtkalpha(currentColor, 0.4); }
marks {
color: gtkalpha(currentColor, 0.4);
@each $marks_class, $marks_pos, $marks_margin in (top, top, bottom),
(bottom, bottom, top),
(top, left, right),
(bottom, right, left) {
//marks margins
@each $scale_orient, $marks_class, $marks_pos, $marks_margin in (horizontal, top, top, bottom),
(horizontal, bottom, bottom, top),
(vertical, top, left, right),
(vertical, bottom, right, left) {
&.#{$scale_orient} marks {
&.#{$marks_class} {
margin-#{$marks_margin}: $_marks_distance;
margin-#{$marks_pos}: -($_marks_distance + $_marks_length);
}
}
}
&.fine-tune marks {
@each $marks_class, $marks_pos, $marks_margin in (top, top, bottom),
(bottom, bottom, top),
(top, left, right),
(bottom, right, left) {
&.#{$scale_orient}.fine-tune marks {
&.#{$marks_class} {
margin-#{$marks_margin}: $_marks_distance;
margin-#{$marks_pos}: -($_marks_distance + $_marks_length - 3px);
}
}
}
&.horizontal {
indicator {
min-height: $_marks_length;

20
gtk/theme/HighContrast/gtk-contained-inverse.css
View File

@ -1080,25 +1080,23 @@ row:selected scale slider, row:selected scale slider:disabled { border-color: #a
.osd scale slider:backdrop:disabled { border-width: 2px; border-style: solid; }
scale value { color: alpha(currentColor,0.4); }
scale marks, scale value { color: alpha(currentColor,0.4); }
scale marks { color: alpha(currentColor,0.4); }
scale.horizontal marks.top { margin-bottom: 6px; margin-top: -12px; }
scale marks.top { margin-bottom: 6px; margin-top: -12px; }
scale.horizontal.fine-tune marks.top { margin-bottom: 6px; margin-top: -9px; }
scale marks.bottom { margin-top: 6px; margin-bottom: -12px; }
scale.horizontal marks.bottom { margin-top: 6px; margin-bottom: -12px; }
scale marks.top { margin-right: 6px; margin-left: -12px; }
scale.horizontal.fine-tune marks.bottom { margin-top: 6px; margin-bottom: -9px; }
scale marks.bottom { margin-left: 6px; margin-right: -12px; }
scale.vertical marks.top { margin-right: 6px; margin-left: -12px; }
scale.fine-tune marks.top { margin-bottom: 6px; margin-top: -9px; }
scale.vertical.fine-tune marks.top { margin-right: 6px; margin-left: -9px; }
scale.fine-tune marks.bottom { margin-top: 6px; margin-bottom: -9px; }
scale.vertical marks.bottom { margin-left: 6px; margin-right: -12px; }
scale.fine-tune marks.top { margin-right: 6px; margin-left: -9px; }
scale.fine-tune marks.bottom { margin-left: 6px; margin-right: -9px; }
scale.vertical.fine-tune marks.bottom { margin-left: 6px; margin-right: -9px; }
scale.horizontal indicator { min-height: 6px; min-width: 1px; }

20
gtk/theme/HighContrast/gtk-contained.css
View File

@ -1086,25 +1086,23 @@ row:selected scale slider, row:selected scale slider:disabled { border-color: #0
.osd scale slider:backdrop:disabled { border-width: 2px; border-style: solid; }
scale value { color: alpha(currentColor,0.4); }
scale marks, scale value { color: alpha(currentColor,0.4); }
scale marks { color: alpha(currentColor,0.4); }
scale.horizontal marks.top { margin-bottom: 6px; margin-top: -12px; }
scale marks.top { margin-bottom: 6px; margin-top: -12px; }
scale.horizontal.fine-tune marks.top { margin-bottom: 6px; margin-top: -9px; }
scale marks.bottom { margin-top: 6px; margin-bottom: -12px; }
scale.horizontal marks.bottom { margin-top: 6px; margin-bottom: -12px; }
scale marks.top { margin-right: 6px; margin-left: -12px; }
scale.horizontal.fine-tune marks.bottom { margin-top: 6px; margin-bottom: -9px; }
scale marks.bottom { margin-left: 6px; margin-right: -12px; }
scale.vertical marks.top { margin-right: 6px; margin-left: -12px; }
scale.fine-tune marks.top { margin-bottom: 6px; margin-top: -9px; }
scale.vertical.fine-tune marks.top { margin-right: 6px; margin-left: -9px; }
scale.fine-tune marks.bottom { margin-top: 6px; margin-bottom: -9px; }
scale.vertical marks.bottom { margin-left: 6px; margin-right: -12px; }
scale.fine-tune marks.top { margin-right: 6px; margin-left: -9px; }
scale.fine-tune marks.bottom { margin-left: 6px; margin-right: -9px; }
scale.vertical.fine-tune marks.bottom { margin-left: 6px; margin-right: -9px; }
scale.horizontal indicator { min-height: 6px; min-width: 1px; }