* Replace unneeded gtkopacity with transparentize

* gtk3: Remove unneeded color variable

Budgie theming added a new variable to _colors.scss that was only
used at one spot. Replace it with white, which makes more sense since
other panel elements are white as well.
master
David Mohammed 2019-05-16 15:28:40 +01:00 committed by GitHub
parent a6cf4045f6
commit 0564640272
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 23 deletions

View File

@ -960,7 +960,7 @@ panel-toplevel.background {
& notebook {
color: white;
background-color: gtkopacity($panel_bg, 0.8);
background-color: transparentize($panel_bg, 0.8);
}
& button {

View File

@ -30,9 +30,8 @@ $z-depth-4: rgba(0, 0, 0, 0.34);
// transparent-mode
&.transparent {
background-color: gtkopacity($panel_bg, 0.4);
color: $selected_fg_color;
background-color: transparentize($panel_bg, 0.6);
}
button {
@ -46,8 +45,8 @@ $z-depth-4: rgba(0, 0, 0, 0.34);
&:hover {
box-shadow: gtkalpha($panel_bg, 0.4);
background-color: gtkopacity($panel_bg, 0.4);
border-color: gtkopacity($panel_bg, 0.4);
background-color: transparentize($panel_bg, 0.6);
border-color: transparentize($panel_bg, 0.6);
}
}
@ -56,7 +55,7 @@ $z-depth-4: rgba(0, 0, 0, 0.34);
&.vertical button { padding: 4px 0; }
separator { background-color: gtkopacity($fg_color, 0.4); }
separator { background-color: transparentize($fg_color, 0.6); }
&.vertical #tasklist-button { min-height: 32px; }
@ -130,7 +129,7 @@ $z-depth-4: rgba(0, 0, 0, 0.34);
button.flat.launcher {
&:hover {
box-shadow: inset #{$_line} gtkalpha($fg_color, 0.4);
background-color: gtkopacity($fg_color, 0.4);
background-color: transparentize($fg_color, 0.6);
border: none;
}
&:active,
@ -337,11 +336,11 @@ $z-depth-4: rgba(0, 0, 0, 0.34);
// Menu Button
button.budgie-menu-launcher {
// padding: 0 2px;
color: $base_bg_color;
color: white;
border: none;
&:hover {
background-color: gtkopacity($fg_color, 0.4);
background-color: transparentize($fg_color, 0.6);
border: none;
}
}
@ -367,7 +366,7 @@ button.raven-trigger {
border: none;
&:hover {
background-color: gtkopacity($fg_color, 0.4);
background-color: transparentize($fg_color, 0.6);
border: none;
}
}

View File

@ -1,15 +1,10 @@
// When color definition differs for dark and light variant,
// it gets @if ed depending on $variant
@function gtkopacity($c, $a) {
@return scale-color($c, $alpha: percentage(-1 + $a));
}
$base_color: if($variant =='light', #ffffff, #404552);
$base_bg_color: #F5F6F7;
$text_color: if($variant == 'light', #3b3e45, #D3DAE3);
$bg_color: if($variant =='light', $base_bg_color, #383C4A);
$fg_color: if($variant =='light', #3b3e45, #D3DAE3);
$text_color: if($variant == 'light', #5c616c, #D3DAE3);
$bg_color: if($variant =='light', #F5F6F7, #383C4A);
$fg_color: if($variant =='light', #5c616c, #D3DAE3);
$selected_fg_color: #ffffff;
$selected_bg_color: #5294e2;

View File

@ -1,10 +1,5 @@
// When color definition differs for dark and light variant,
// it gets @if ed depending on $variant
@function gtkopacity($c, $a) {
@return scale-color($c, $alpha: percentage(-1 + $a));
}
$base_color: if($variant =='light', %TXT_BG%, %HDR_BG2%);
$base_bg_color: %BG%;
// not implemented for GTK+2 theme: