Skip to content

Commit a9f8251

Browse files
megaxlots0logs
authored andcommitted
GTK 3.20 :: Implement scale color code (#459)
* * Implement scale color code. * * Converted old style. * * Fixed gtk warning. (cherry picked from commit The-Megax/Numix@1f623bf)
1 parent 1d941a1 commit a9f8251

1 file changed

Lines changed: 68 additions & 5 deletions

File tree

gtk-3.20/scss/widgets/_progress.scss

Lines changed: 68 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
$_marks_length: 3px;
143143
$_marks_distance: 1px;
144144
$button_bg: if(hue($bg_color) == 0deg, shade($bg_color, 1.2), $bg_color);
145-
$ease-out-quad: cubic-bezier(0.25, 0.46, 0.45, 0.94);
145+
$ease-out-quad: cubic-bezier(.25, .46, .45, .94);
146146
$button_transition: all 200ms $ease-out-quad;
147147

148148
min-height: 10px;
@@ -154,6 +154,7 @@
154154
trough { padding: 0 7px; }
155155
highlight, fill { margin: 0 -7px; }
156156
}
157+
157158
&.vertical {
158159
padding: 0 6px;
159160

@@ -209,9 +210,7 @@
209210
.osd & {
210211
background-color: lighten($osd_bg, 7%);
211212

212-
highlight {
213-
background-color: $selected_bg_color;
214-
}
213+
highlight { background-color: $selected_bg_color; }
215214
}
216215

217216
// Troughs in selected list-rows and infobars
@@ -280,11 +279,13 @@
280279
background-color: mix($selected_fg_color, $selected_bg_color, .85);
281280
border-color: mix($selected_fg_color, $selected_bg_color, .85);
282281
}
282+
283283
&:active {
284284
background-color: mix($selected_fg_color, $selected_bg_color, .5);
285285
border-color: mix($selected_fg_color, $selected_bg_color, .5);
286286
}
287-
&:disabled{
287+
288+
&:disabled {
288289
background-color: mix($selected_fg_color, $selected_bg_color, .55);
289290
border-color: mix($selected_fg_color, $selected_bg_color, .55);
290291
}
@@ -335,6 +336,7 @@
335336
}
336337
}
337338
}
339+
338340
&.horizontal {
339341
indicator {
340342
min-height: $_marks_length;
@@ -343,6 +345,7 @@
343345

344346
&.fine-tune indicator { min-height: ($_marks_length - 1px); }
345347
}
348+
346349
&.vertical {
347350
indicator {
348351
min-height: 1px;
@@ -351,5 +354,65 @@
351354

352355
&.fine-tune indicator { min-width: ($_marks_length - 1px); }
353356
}
357+
358+
&.color {
359+
trough {
360+
padding: 0;
361+
border: 0;
362+
background-image: none;
363+
}
364+
365+
highlight, fill { margin: 0; }
366+
367+
&.horizontal {
368+
padding: 0 0 6px 0;
369+
370+
trough {
371+
border-top-left-radius: 0;
372+
border-top-right-radius: 0;
373+
}
374+
375+
slider {
376+
&:hover, &:backdrop, &:disabled, &:backdrop:disabled, & {
377+
margin-bottom: 0;
378+
margin-top: 0;
379+
}
380+
}
381+
}
382+
383+
&.vertical {
384+
&:dir(ltr) {
385+
padding: 0 0 0 6px;
386+
387+
trough {
388+
border-bottom-right-radius: 0;
389+
border-top-right-radius: 0;
390+
}
391+
392+
slider {
393+
&:hover, &:backdrop, &:disabled, &:backdrop:disabled, & {
394+
margin-left: 0;
395+
margin-right: 0;
396+
}
397+
}
398+
}
399+
400+
&:dir(rtl) {
401+
padding: 0 6px 0 0;
402+
403+
trough {
404+
border-bottom-left-radius: 0;
405+
border-top-left-radius: 0;
406+
}
407+
408+
slider {
409+
&:hover, &:backdrop, &:disabled, &:backdrop:disabled, & {
410+
margin-right: 0;
411+
margin-left: 0;
412+
}
413+
}
414+
}
415+
}
416+
}
354417
}
355418
}

0 commit comments

Comments
 (0)