Merge pull request #394 from megax/patch1

GTK 3.20 :: Black, white converted $black and $white. Other fix.
pull/401/head
Khurshid Alam 2016-04-29 00:13:25 +05:30
commit b6097cca57
5 changed files with 17 additions and 17 deletions

View File

@ -28,12 +28,12 @@
&:hover { background-color: if(variant == light, transparentize($fg_color, .9), transparentize($fg_color, .95)); }
&:active { box-shadow: inset 0 2px 2px -2px transparentize(black, .8); }
&:active { box-shadow: inset 0 2px 2px -2px transparentize($black, .8); }
&:backdrop:hover { background-color: transparent; }
&:selected {
&:active { box-shadow: inset 0 2px 3px -1px transparentize(black, .5); }
&:active { box-shadow: inset 0 2px 3px -1px transparentize($black, .5); }
&.has-open-popup,
&:hover { background-color: mix($fg_color, $selected_bg_color, .1); }

View File

@ -135,7 +135,7 @@
&:hover:not(:active):not(:backdrop) {
background-clip: padding-box;
background-image: none;
background-color: transparentize(white, 0.7);
background-color: transparentize($white, .7);
border-color: transparent;
box-shadow: none;
}

View File

@ -182,7 +182,7 @@
border-radius: 2.5px;
background-color: $_scale_trough_bg;
&:disabled { background-color: transparentize($_scale_trough_bg, 0.45); }
&:disabled { background-color: transparentize($_scale_trough_bg, .45); }
//OSD troughs
.osd & {
@ -196,7 +196,7 @@
// Troughs in selected list-rows and infobars
row:selected &,
infobar & {
background-color: transparentize(black, 0.8);
background-color: transparentize($black, .8);
highlight {
background-color: $selected_fg_color;
@ -204,7 +204,7 @@
&:disabled { background-color: mix($selected_fg_color, $selected_bg_color, .55); }
}
&:disabled { background-color: transparentize(black, 0.9); }
&:disabled { background-color: transparentize($black, .9); }
}
}
@ -213,20 +213,20 @@
border-radius: 2.5px;
background-color: $selected_bg_color;
&:disabled { background-color: transparentize($selected_bg_color, 0.45); }
&:disabled { background-color: transparentize($selected_bg_color, .45); }
}
// this is another differently styled part of the trough, the most relevant use case is for example
// in media player to indicate how much video stream as been cached
fill {
border-radius: 2.5px;
background-color: transparentize($selected_bg_color, 0.5);
background-color: transparentize($selected_bg_color, .5);
&:disabled { background-color: transparent; }
}
slider {
$_slider_border: if($variant=='light', transparentize(shade($button_border, .25), 0.5), darken($button_border,2%));
$_slider_border: if($variant == 'light', transparentize(shade($button_border, .25), .5), darken($button_border, 2%));
background-color: $button_bg;
border: 1px solid $_slider_border;
@ -245,7 +245,7 @@
&:disabled {
background-color: mix($fg_color, $bg_color, .55);
border-color: transparentize($_slider_border, 0.2);
border-color: transparentize($_slider_border, .2);
}
// Selected list-row and infobar sliders
@ -287,10 +287,10 @@
}
}
value { color: alpha(currentColor, 0.4); }
value { color: alpha(currentColor, .4); }
marks {
color: alpha(currentColor, 0.4);
color: alpha(currentColor, .4);
@each $marks_class, $marks_pos, $marks_margin in (top, top, bottom),
(bottom, bottom, top),

View File

@ -62,7 +62,7 @@
min-width: $_slider_small_width;
min-height: $_slider_small_width;
background-color: $fg_color;
border: 1px solid if($variant == "light", white, black);
border: 1px solid if($variant == 'light', $white, $black);
}
// hide steppers

View File

@ -170,8 +170,8 @@
border: 1px solid $selected_borders_color;
background-color: $selected_bg_color;
//background-image: linear-gradient(to bottom, $selected_bg_color, darken($selected_bg_color, .1));
box-shadow: inset 0 1px if($variant == 'light', transparentize(white, .7), transparentize(white, .85)),
0 1px if($variant == 'light', transparentize(black, .8), transparentize(black, .9));
box-shadow: inset 0 1px if($variant == 'light', transparentize($white, .7), transparentize($white, .85)),
0 1px if($variant == 'light', transparentize($black, .8), transparentize($black, .9));
&:selected {
&:focus, & {
@ -179,7 +179,7 @@
color: $selected_fg_color;
box-shadow: none;
} @else {
box-shadow: inset 0 1px transparentize(white, .95);
box-shadow: inset 0 1px transparentize($white, .95);
}
@include linear-gradient($selected_bg_color);
@ -286,7 +286,7 @@
@include exports("separator") {
separator { // vbox and hbox separators
background: transparentize(black, .9);
background: transparentize($black, .9);
min-width: 1px;
min-height: 1px;
}