diff --git a/src/_functions.scss b/src/_functions.scss
index e9cfb4a..06090f5 100644
--- a/src/_functions.scss
+++ b/src/_functions.scss
@@ -67,10 +67,10 @@
// Titlebar color
@function t_color($c: text) {
@if $c == text {
- @return $WindowForegroundNormal;
+ @return $WMactiveForeground;
}
@if $c == background {
- @return $WindowBackgroundNormal;
+ @return $WMactiveBackground;
}
@if $c == background-light {
@return $WindowBackgroundNormal;
@@ -79,7 +79,10 @@
@return $WMinactiveForeground;
}
@if $c == backdrop-background {
- @return $WindowBackgroundNormal;
+ @return $WMinactiveBackground;
+ }
+ @if $c == test {
+ @return $ViewForegroundPositive;
}
}
diff --git a/src/gtk320/widgets/_headerbar.scss b/src/gtk320/widgets/_headerbar.scss
index 4cbe870..088b586 100644
--- a/src/gtk320/widgets/_headerbar.scss
+++ b/src/gtk320/widgets/_headerbar.scss
@@ -11,11 +11,12 @@ headerbar {
border-style: solid;
border-color: $border_color;
color: t_color(text);
- background-image: linear-gradient(to bottom,t_color(background-light),t_color(background));
+ background-image: none;
+ background-color: t_color(background);
&:backdrop {
border-color: transparent;
background-image: none;
- background-color: t_color(backdrop-background);
+ background-color: t_color(test);
color: t_color(backdrop-text);
box-shadow: none;
}
@@ -87,7 +88,7 @@ headerbar {
.title {
font-weight: normal;
padding: 0px 12px;
- &:backdrop { color: t_color(backdrop-text)}
+ &:backdrop { color: t_color(test)}
}
.subtitle {
diff --git a/src/render_assets.py b/src/render_assets.py
index 8477d91..6590b83 100755
--- a/src/render_assets.py
+++ b/src/render_assets.py
@@ -531,9 +531,9 @@ def titlebuttons(color1, color2, state):
title_maximize.maximize(color1)
title_maximized.maximize_maximized(color1)
else:
- title_minimize.circle(color1, 9, 9, 9)
- title_maximize.circle(color1, 9, 9, 9)
- title_maximized.circle(color1, 9, 9, 9)
+ title_minimize.circle(color2, 9, 9, 9)
+ title_maximize.circle(color2, 9, 9, 9)
+ title_maximized.circle(color2, 9, 9, 9)
title_minimize.minimize()
title_maximize.maximize()
title_maximized.maximize_maximized()
@@ -732,16 +732,14 @@ view_bg = Color(_colors, 'ViewBackgroundNormal')
view_fg = Color(_colors, 'ViewForegroundNormal')
view_hover = Color(_colors, 'ViewDecorationHover')
view_active = Color(_colors, 'ViewDecorationFocus')
-titlebutton = Color(_colors, 'WindowForegroundNormal')
-titlebutton_active = Color(
- _colors, 'WindowBackgroundNormal', 'WindowForegroundNormal', 0.3)
+titlebutton = Color(_colors, 'WMactiveForeground')
+titlebutton_active = Color(_colors, 'WMactiveForeground')
closebutton_hover = Color(_colors, 'ViewForegroundNegative')
closebutton_hover.lighten_color(0.5)
closebutton_active = Color(_colors, 'ViewForegroundNegative')
titlebutton_inactive = Color(_colors, 'WindowForegroundNormal')
titlebutton_inactive_active = Color(
- _colors, 'WindowBackgroundNormal', 'WindowForegroundNormal', 0.3)
-
+ _colors, 'WMinactiveForeground')
tooltip_fg = Color(_colors, 'TooltipForegroundNormal')
tooltip_bg = Color(_colors, 'TooltipBackgroundNormal')