diff --git a/src/_colors.scss b/src/_colors.scss --- a/src/_colors.scss +++ b/src/_colors.scss @@ -9,208 +9,208 @@ // warning, it's innocuous and can be defeated by using "" + $var /* widget text/foreground color */ -@define-color theme_fg_color #{"" + internal_w_color(text)}; // KCM'd +@define-color theme_fg_color_breeze #{"" + internal_w_color(text)}; // KCM'd /* text color for entries, views and content in general */ -@define-color theme_text_color #{"" + internal_v_color(text)}; // KCM'd +@define-color theme_text_color_breeze #{"" + internal_v_color(text)}; // KCM'd /* widget base background color */ -@define-color theme_bg_color #{"" + internal_w_color(normal)}; // KCM'd +@define-color theme_bg_color_breeze #{"" + internal_w_color(normal)}; // KCM'd /* text widgets and the like base background color */ -@define-color theme_base_color #{"" + internal_v_color(normal)}; // KCM'd +@define-color theme_base_color_breeze #{"" + internal_v_color(normal)}; // KCM'd /* view hover decoration color*/ -@define-color theme_view_hover_decoration_color #{"" + internal_v_color(hover)}; // KCM'd +@define-color theme_view_hover_decoration_color_breeze #{"" + internal_v_color(hover)}; // KCM'd /* background color of hovering selected widgets*/ -@define-color theme_hovering_selected_bg_color #{"" + internal_s_color(hover)}; // KCM'd +@define-color theme_hovering_selected_bg_color_breeze #{"" + internal_s_color(hover)}; // KCM'd /* base background color of selections */ -@define-color theme_selected_bg_color #{"" + internal_s_color(normal)}; // KCM'd +@define-color theme_selected_bg_color_breeze #{"" + internal_s_color(normal)}; // KCM'd /* text/foreground color of selections */ -@define-color theme_selected_fg_color #{"" + internal_s_color(text)}; // KCM'd +@define-color theme_selected_fg_color_breeze #{"" + internal_s_color(text)}; // KCM'd /* decoration color of views */ -@define-color theme_view_active_decoration_color #{"" + internal_v_color(active)}; // KCM'd +@define-color theme_view_active_decoration_color_breeze #{"" + internal_v_color(active)}; // KCM'd /* base background color of insensitive selections */ -@define-color insensitive_selected_bg_color #{"" + internal_insensitive(internal_s_color(normal))}; +@define-color insensitive_selected_bg_color_breeze #{"" + internal_insensitive(internal_s_color(normal))}; /* base background color of insensitive widgets */ -@define-color insensitive_bg_color #{"" + internal_insensitive(internal_w_color(normal))}; +@define-color insensitive_bg_color_breeze #{"" + internal_insensitive(internal_w_color(normal))}; /* text foreground color of insensitive widgets */ -@define-color insensitive_fg_color #{"" + internal_insensitive(internal_w_color(text))}; +@define-color insensitive_fg_color_breeze #{"" + internal_insensitive(internal_w_color(text))}; /* insensitive text widgets and the like base background color */ -@define-color insensitive_base_color #{"" + internal_insensitive(internal_v_color(text))}; +@define-color insensitive_base_color_breeze #{"" + internal_insensitive(internal_v_color(text))}; /* insensitive text widgets and the like base foreground color */ -@define-color insensitive_base_fg_color #{"" + internal_insensitive(internal_v_color(normal))}; +@define-color insensitive_base_fg_color_breeze #{"" + internal_insensitive(internal_v_color(normal))}; /* insensitive selected text widgets and the like base background color */ -@define-color insensitive_selected_fg_color #{"" + internal_insensitive(internal_s_color(text))}; +@define-color insensitive_selected_fg_color_breeze #{"" + internal_insensitive(internal_s_color(text))}; /* widget text/foreground color on backdrop windows */ -@define-color theme_unfocused_fg_color #{"" + internal_backdrop(internal_w_color(text))}; +@define-color theme_unfocused_fg_color_breeze #{"" + internal_backdrop(internal_w_color(text))}; /* text color for entries, views and content in general on backdrop windows */ -@define-color theme_unfocused_text_color #{"" + internal_backdrop(internal_v_color(text))}; +@define-color theme_unfocused_text_color_breeze #{"" + internal_backdrop(internal_v_color(text))}; /* widget base background color on backdrop windows */ -@define-color theme_unfocused_bg_color #{"" + internal_backdrop(internal_w_color(normal))}; +@define-color theme_unfocused_bg_color_breeze #{"" + internal_backdrop(internal_w_color(normal))}; /* text widgets and the like base background color on backdrop windows */ -@define-color theme_unfocused_base_color #{"" + internal_backdrop(internal_v_color(normal))}; +@define-color theme_unfocused_base_color_breeze #{"" + internal_backdrop(internal_v_color(normal))}; /* base background color of selections on backdrop windows, alt */ -@define-color theme_unfocused_selected_bg_color_alt #{"" + internal_backdrop(internal_s_color(normal))}; +@define-color theme_unfocused_selected_bg_color_alt_breeze #{"" + internal_backdrop(internal_s_color(normal))}; /* base background color of selections on backdrop windows */ -@define-color theme_unfocused_selected_bg_color #{"" + internal_backdrop(internal_s_color(backdrop))}; +@define-color theme_unfocused_selected_bg_color_breeze #{"" + internal_backdrop(internal_s_color(backdrop))}; /* text/foreground color of selections on backdrop windows */ -@define-color theme_unfocused_selected_fg_color #{"" + internal_backdrop(internal_s_color(text))}; +@define-color theme_unfocused_selected_fg_color_breeze #{"" + internal_backdrop(internal_s_color(text))}; /* base background color of insensitive selections on backdrop windows */ -@define-color insensitive_unfocused_selected_bg_color #{"" + internal_backdrop(internal_insensitive(internal_s_color(normal)))}; +@define-color insensitive_unfocused_selected_bg_color_breeze #{"" + internal_backdrop(internal_insensitive(internal_s_color(normal)))}; /* text foreground color of insensitive widgets on backdrop windows*/ -@define-color insensitive_unfocused_fg_color #{"" + internal_backdrop(internal_insensitive(internal_w_color(text)))}; +@define-color insensitive_unfocused_fg_color_breeze #{"" + internal_backdrop(internal_insensitive(internal_w_color(text)))}; /* backdground color of insensitive widgets on backdrop windows*/ -@define-color insensitive_unfocused_bg_color #{"" + internal_backdrop(internal_insensitive(internal_w_color(normal)))}; +@define-color insensitive_unfocused_bg_color_breeze #{"" + internal_backdrop(internal_insensitive(internal_w_color(normal)))}; /* text foreground color of insensitive selected widgets on backdrop windows*/ -@define-color insensitive_unfocused_selected_fg_color #{"" + internal_backdrop(internal_insensitive(internal_s_color(text)))}; +@define-color insensitive_unfocused_selected_fg_color_breeze #{"" + internal_backdrop(internal_insensitive(internal_s_color(text)))}; /* view text foreground color of insensitive widgets on backdrop windows */ -@define-color theme_unfocused_view_text_color #{"" + internal_backdrop(internal_insensitive(internal_v_color(text)))}; +@define-color theme_unfocused_view_text_color_breeze #{"" + internal_backdrop(internal_insensitive(internal_v_color(text)))}; /* insensitive view background color on backdrop windows */ -@define-color theme_unfocused_view_bg_color #{"" + internal_backdrop(internal_insensitive(internal_v_color(normal)))}; +@define-color theme_unfocused_view_bg_color_breeze #{"" + internal_backdrop(internal_insensitive(internal_v_color(normal)))}; /* widgets main borders color */ -@define-color borders #{"" +$border_color}; +@define-color borders_breeze #{"" +$border_color}; /* widgets main borders color on backdrop windows */ -@define-color unfocused_borders #{"" + internal_backdrop($border_color)}; +@define-color unfocused_borders_breeze #{"" + internal_backdrop($border_color)}; /* widgets main borders color insensitive */ -@define-color insensitive_borders #{"" + internal_insensitive($border_color)}; +@define-color insensitive_borders_breeze #{"" + internal_insensitive($border_color)}; /* widgets main borders color insensitive backdrop */ -@define-color unfocused_insensitive_borders #{"" + internal_backdrop(internal_insensitive($border_color))}; +@define-color unfocused_insensitive_borders_breeze #{"" + internal_backdrop(internal_insensitive($border_color))}; /* * * Button Colors * */ -@define-color theme_button_background_normal #{"" + internal_b_color(normal)}; -@define-color theme_button_decoration_hover #{"" + internal_b_color(hover)}; -@define-color theme_button_decoration_focus #{"" + internal_b_color(active)}; -@define-color theme_button_foreground_normal #{"" + internal_b_color(text)}; -@define-color theme_button_foreground_active #{"" + internal_b_color(active-text)}; - -@define-color theme_button_background_insensitive #{"" + internal_insensitive(internal_b_color(normal))}; -@define-color theme_button_decoration_hover_insensitive #{"" + internal_insensitive(internal_b_color(hover))}; -@define-color theme_button_decoration_focus_insensitive #{"" + internal_insensitive(internal_b_color(active))}; -@define-color theme_button_foreground_insensitive #{"" + internal_insensitive(internal_b_color(text))}; -@define-color theme_button_foreground_active_insensitive #{"" + internal_insensitive(internal_b_color(active-text))}; - -@define-color theme_button_background_backdrop #{"" + internal_backdrop(internal_b_color(normal))}; -@define-color theme_button_decoration_hover_backdrop #{"" + internal_backdrop(internal_b_color(hover))}; -@define-color theme_button_decoration_focus_backdrop #{"" + internal_backdrop(internal_b_color(active))}; -@define-color theme_button_foreground_backdrop #{"" + internal_backdrop(internal_b_color(text))}; -@define-color theme_button_foreground_active_backdrop #{"" + internal_backdrop(internal_b_color(active-text))}; - -@define-color theme_button_background_backdrop_insensitive #{"" + internal_insensitive(internal_backdrop(internal_b_color(normal)))}; -@define-color theme_button_decoration_hover_backdrop_insensitive #{"" + internal_insensitive(internal_backdrop(internal_b_color(hover)))}; -@define-color theme_button_decoration_focus_backdrop_insensitive #{"" + internal_insensitive(internal_backdrop(internal_b_color(active)))}; -@define-color theme_button_foreground_backdrop_insensitive #{"" + internal_insensitive(internal_backdrop(internal_b_color(text)))}; -@define-color theme_button_foreground_active_backdrop_insensitive #{"" + internal_insensitive(internal_backdrop(internal_b_color(active-text)))}; +@define-color theme_button_background_normal_breeze #{"" + internal_b_color(normal)}; +@define-color theme_button_decoration_hover_breeze #{"" + internal_b_color(hover)}; +@define-color theme_button_decoration_focus_breeze #{"" + internal_b_color(active)}; +@define-color theme_button_foreground_normal_breeze #{"" + internal_b_color(text)}; +@define-color theme_button_foreground_active_breeze #{"" + internal_b_color(active-text)}; + +@define-color theme_button_background_insensitive_breeze #{"" + internal_insensitive(internal_b_color(normal))}; +@define-color theme_button_decoration_hover_insensitive_breeze #{"" + internal_insensitive(internal_b_color(hover))}; +@define-color theme_button_decoration_focus_insensitive_breeze #{"" + internal_insensitive(internal_b_color(active))}; +@define-color theme_button_foreground_insensitive_breeze #{"" + internal_insensitive(internal_b_color(text))}; +@define-color theme_button_foreground_active_insensitive_breeze #{"" + internal_insensitive(internal_b_color(active-text))}; + +@define-color theme_button_background_backdrop_breeze #{"" + internal_backdrop(internal_b_color(normal))}; +@define-color theme_button_decoration_hover_backdrop_breeze #{"" + internal_backdrop(internal_b_color(hover))}; +@define-color theme_button_decoration_focus_backdrop_breeze #{"" + internal_backdrop(internal_b_color(active))}; +@define-color theme_button_foreground_backdrop_breeze #{"" + internal_backdrop(internal_b_color(text))}; +@define-color theme_button_foreground_active_backdrop_breeze #{"" + internal_backdrop(internal_b_color(active-text))}; + +@define-color theme_button_background_backdrop_insensitive_breeze #{"" + internal_insensitive(internal_backdrop(internal_b_color(normal)))}; +@define-color theme_button_decoration_hover_backdrop_insensitive_breeze #{"" + internal_insensitive(internal_backdrop(internal_b_color(hover)))}; +@define-color theme_button_decoration_focus_backdrop_insensitive_breeze #{"" + internal_insensitive(internal_backdrop(internal_b_color(active)))}; +@define-color theme_button_foreground_backdrop_insensitive_breeze #{"" + internal_insensitive(internal_backdrop(internal_b_color(text)))}; +@define-color theme_button_foreground_active_backdrop_insensitive_breeze #{"" + internal_insensitive(internal_backdrop(internal_b_color(active-text)))}; /* these are pretty self explicative */ -@define-color warning_color #{"" + $warning_color}; -@define-color error_color #{"" + $error_color}; -@define-color success_color #{"" + $success_color}; +@define-color warning_color_breeze #{"" + $warning_color}; +@define-color error_color_breeze #{"" + $error_color}; +@define-color success_color_breeze #{"" + $success_color}; -@define-color warning_color_backdrop #{"" + internal_backdrop($warning_color)}; -@define-color error_color_backdrop #{"" + internal_backdrop($error_color)}; -@define-color success_color_backdrop #{"" + internal_backdrop($success_color)}; +@define-color warning_color_backdrop_breeze #{"" + internal_backdrop($warning_color)}; +@define-color error_color_backdrop_breeze #{"" + internal_backdrop($error_color)}; +@define-color success_color_backdrop_breeze #{"" + internal_backdrop($success_color)}; -@define-color warning_color_insensitive #{"" + internal_insensitive($warning_color)}; -@define-color error_color_insensitive #{"" + internal_insensitive($error_color)}; -@define-color success_color_insensitive #{"" + internal_insensitive($success_color)}; +@define-color warning_color_insensitive_breeze #{"" + internal_insensitive($warning_color)}; +@define-color error_color_insensitive_breeze #{"" + internal_insensitive($error_color)}; +@define-color success_color_insensitive_breeze #{"" + internal_insensitive($success_color)}; -@define-color warning_color_insensitive_backdrop #{"" + internal_insensitive(internal_backdrop($warning_color))}; -@define-color error_color_insensitive_backdrop #{"" + internal_insensitive(internal_backdrop($error_color))}; -@define-color success_color_insensitive_backdrop #{"" + internal_insensitive(internal_backdrop($success_color))}; +@define-color warning_color_insensitive_backdrop_breeze #{"" + internal_insensitive(internal_backdrop($warning_color))}; +@define-color error_color_insensitive_backdrop_breeze #{"" + internal_insensitive(internal_backdrop($error_color))}; +@define-color success_color_insensitive_backdrop_breeze #{"" + internal_insensitive(internal_backdrop($success_color))}; -@define-color link_color #{"" + $link_color}; -@define-color link_visited_color #{"" + $link_visited_color}; +@define-color link_color_breeze #{"" + $link_color}; +@define-color link_visited_color_breeze #{"" + $link_visited_color}; /* * * Titlebar Colors * */ -@define-color theme_titlebar_background #{"" + internal_t_color(background)}; -@define-color theme_titlebar_foreground #{"" + internal_t_color(text)}; -@define-color theme_titlebar_background_light #{"" + internal_t_color(background-light)}; -@define-color theme_titlebar_foreground_backdrop #{"" + internal_t_color(backdrop-text)}; -@define-color theme_titlebar_background_backdrop #{"" + internal_t_color(backdrop-background)}; +@define-color theme_titlebar_background_breeze #{"" + internal_t_color(background)}; +@define-color theme_titlebar_foreground_breeze #{"" + internal_t_color(text)}; +@define-color theme_titlebar_background_light_breeze #{"" + internal_t_color(background-light)}; +@define-color theme_titlebar_foreground_backdrop_breeze #{"" + internal_t_color(backdrop-text)}; +@define-color theme_titlebar_background_backdrop_breeze #{"" + internal_t_color(backdrop-background)}; -@define-color theme_titlebar_foreground_insensitive #{"" + internal_insensitive(internal_t_color(text))}; +@define-color theme_titlebar_foreground_insensitive_breeze #{"" + internal_insensitive(internal_t_color(text))}; -@define-color theme_titlebar_foreground_insensitive_backdrop #{"" + internal_insensitive(internal_t_color(backdrop-text))}; +@define-color theme_titlebar_foreground_insensitive_backdrop_breeze #{"" + internal_insensitive(internal_t_color(backdrop-text))}; /* * Tooltips */ -@define-color tooltip_text #{"" + internal_tooltip(text)}; -@define-color tooltip_background #{"" + internal_tooltip(background)}; -@define-color tooltip_border #{"" + internal_tooltip(border)}; +@define-color tooltip_text_breeze #{"" + internal_tooltip(text)}; +@define-color tooltip_background_breeze #{"" + internal_tooltip(background)}; +@define-color tooltip_border_breeze #{"" + internal_tooltip(border)}; /* * Misc */ -@define-color print_paper_backdrop #{"" internal_backdrop(white)}; +@define-color print_paper_backdrop_breeze #{"" internal_backdrop(white)}; //@!define-color destructive_color #{$destructive_color} @@ -242,4 +242,31 @@ //FIXME this is really an API -@define-color content_view_bg #{"" + internal_v_color(normal)}; +@define-color content_view_bg_breeze #{"" + internal_v_color(normal)}; + +/* + * GTK API color re-defs + */ + +@define-color theme_fg_color @theme_fg_color_breeze; +@define-color theme_text_color @theme_text_color_breeze; +@define-color theme_bg_color @theme_bg_color_breeze; +@define-color theme_base_color @theme_base_color_breeze; +@define-color theme_selected_bg_color @theme_selected_bg_color_breeze; +@define-color theme_selected_fg_color @theme_selected_fg_color_breeze; +@define-color insensitive_bg_color @insensitive_bg_color_breeze; +@define-color insensitive_fg_color @insensitive_fg_color_breeze; +@define-color insensitive_base_color @insensitive_base_color_breeze; +@define-color theme_unfocused_fg_color @theme_unfocused_fg_color_breeze; +@define-color theme_unfocused_text_color @theme_unfocused_text_color_breeze; +@define-color theme_unfocused_bg_color @theme_unfocused_bg_color_breeze; +@define-color theme_unfocused_base_color @theme_unfocused_base_color_breeze; +@define-color theme_unfocused_selected_bg_color @theme_unfocused_selected_bg_color_breeze; +@define-color theme_unfocused_selected_fg_color @theme_unfocused_selected_fg_color_breeze; +@define-color unfocused_insensitive_color @unfocused_insensitive_color_breeze; +@define-color borders @borders_breeze; +@define-color unfocused_borders @unfocused_borders_breeze; +@define-color warning_color @warning_color_breeze; +@define-color error_color @error_color_breeze; +@define-color success_color @success_color_breeze; +@define-color content_view_bg @content_view_bg_breeze; \ No newline at end of file diff --git a/src/_functions.scss b/src/_functions.scss --- a/src/_functions.scss +++ b/src/_functions.scss @@ -4,7 +4,7 @@ // escape string entirely @function gtk ($str) { - @return unquote($str); + @return unquote("#{$str}_breeze"); } // alpha function @@ -14,7 +14,7 @@ // shade function @function gtkshade($c, $a) { - @return unquote("shade(#{$c},#{$a})"); + @return unquote("shade(#{$c}_breeze,#{$a})"); } // mix function diff --git a/src/gtk3/widgets/_base.scss b/src/gtk3/widgets/_base.scss --- a/src/gtk3/widgets/_base.scss +++ b/src/gtk3/widgets/_base.scss @@ -143,10 +143,10 @@ .rubberband, rubberband { border: 1px solid gtk("@theme_selected_bg_color"); - background-color: gtkalpha("@theme_selected_bg_color", 0.8); + background-color: gtkalpha(gtk("@theme_selected_bg_color"), 0.8); &:backdrop { border-color: gtk("@theme_unfocused_selected_bg_color"); - background-color: gtkalpha("@theme_unfocused_selected_bg_color", 0.8); + background-color: gtkalpha(gtk("@theme_unfocused_selected_bg_color"), 0.8); } } @@ -213,22 +213,22 @@ padding: 6px 12px; } .sidebar label.highlight { - background-color: gtkmix("@theme_base_color", "@theme_text_color", 0.8); + background-color: gtkmix(gtk("@theme_base_color"), gtk("@theme_text_color"), 0.8); } } %osd, .osd { color: gtk("@theme_fg_color"); border: 1px solid gtk("@borders"); - background-color: gtkalpha("@theme_bg_color",0.8); + background-color: gtkalpha(gtk("@theme_bg_color"),0.8); background-clip: padding-box; box-shadow: none; text-shadow: none; -gtk-icon-shadow: none; &:backdrop { color: gtk("@theme_unfocused_text_color"); - background-color: gtkalpha("@theme_unfocused_bg_color", 0.8); + background-color: gtkalpha(gtk("@theme_unfocused_bg_color"), 0.8); -gtk-icon-shadow: none; } } diff --git a/src/gtk3/widgets/_entry.scss b/src/gtk3/widgets/_entry.scss --- a/src/gtk3/widgets/_entry.scss +++ b/src/gtk3/widgets/_entry.scss @@ -97,11 +97,11 @@ @if $e_color == gtk("@error_color") { color: gtk("@error_color_backdrop"); border-color: gtk("@error_color_backdrop"); - background-color: gtkalpha("@error_color_backdrop", 0.5); + background-color: gtkalpha(gtk("@error_color_backdrop"), 0.5); } @else if $e_color == gtk("@warning_color") { color: gtk("@warning_color_backdrop"); border-color: gtk("@warning_color_backdrop"); - background-color: gtkalpha("@warning_color_backdrop", 0.5); + background-color: gtkalpha(gtk("@warning_color_backdrop"), 0.5); } } } diff --git a/src/gtk3/widgets/_headerbar.scss b/src/gtk3/widgets/_headerbar.scss --- a/src/gtk3/widgets/_headerbar.scss +++ b/src/gtk3/widgets/_headerbar.scss @@ -127,7 +127,7 @@ background-color: gtk("@theme_button_decoration_focus"); } button:not(.titlebutton) { - background-color: gtkalpha("@theme_button_decoration_focus", 0.5); + background-color: gtkalpha(gtk("@theme_button_decoration_focus"), 0.5); &:active, &:focus { background-color: gtk("@theme_button_decoration_focus"); } diff --git a/src/gtk3/widgets/_infobar.scss b/src/gtk3/widgets/_infobar.scss --- a/src/gtk3/widgets/_infobar.scss +++ b/src/gtk3/widgets/_infobar.scss @@ -28,35 +28,35 @@ button { box-shadow: none; background-image:none; - background-color: gtkalpha("@warning_color", 0.5); - border-color: gtkalpha("@warning_color", 0.5); + background-color: gtkalpha(gtk("@warning_color"), 0.5); + border-color: gtkalpha(gtk("@warning_color"), 0.5); color: gtk("@theme_button_foreground_normal"); &:hover { - background-color: gtkalpha("@warning_color", 0.25); + background-color: gtkalpha(gtk("@warning_color"), 0.25); border-color: gtk("@warning_color"); } &:active, &:checked { background-color: gtk("@warning_color"); color: gtk("@theme_bg_color"); border-color: gtk("@warning_color"); } &:disabled { - background-color: gtkalpha("@warning_color_insensitive", 0.5); - border-color: gtkalpha("@warning_color_insensitive", 0.5); + background-color: gtkalpha(gtk("@warning_color_insensitive"), 0.5); + border-color: gtkalpha(gtk("@warning_color_insensitive"), 0.5); color: gtk("@theme_button_foreground_insensitive"); } &:backdrop { - background-color: gtkalpha("@warning_color_backdrop", 0.5); - border-color: gtkalpha("@warning_color_backdrop", 0.5); + background-color: gtkalpha(gtk("@warning_color_backdrop"), 0.5); + border-color: gtkalpha(gtk("@warning_color_backdrop"), 0.5); color: gtk("@theme_button_foreground_backdrop"); &:active, &:checked { background-color: gtk("@warning_color_backdrop"); color: gtk("@theme_unfocused_bg_color"); border-color: gtk("@warning_color_backdrop"); } &:disabled { - background-color: gtkalpha("@warning_color_insensitive_backdrop", 0.5); - border-color: gtkalpha("@warning_color_insensitive_backdrop", 0.5); + background-color: gtkalpha(gtk("@warning_color_insensitive_backdrop"), 0.5); + border-color: gtkalpha(gtk("@warning_color_insensitive_backdrop"), 0.5); color: gtk("@theme_button_foreground_backdrop_insensitive"); } &:disabled:active, diff --git a/src/gtk3/widgets/_link.scss b/src/gtk3/widgets/_link.scss --- a/src/gtk3/widgets/_link.scss +++ b/src/gtk3/widgets/_link.scss @@ -29,7 +29,7 @@ } @at-root %link_selected, &:selected, *:selected & { - color: gtkmix("@theme_selected_fg_color", "@theme_selected_bg_color", 0.8); + color: gtkmix(gtk("@theme_selected_fg_color"), gtk("@theme_selected_bg_color"), 0.8); } } diff --git a/src/gtk3/widgets/_notebook.scss b/src/gtk3/widgets/_notebook.scss --- a/src/gtk3/widgets/_notebook.scss +++ b/src/gtk3/widgets/_notebook.scss @@ -53,13 +53,13 @@ > tabs { > tab { padding: 4px 6px; - border: 1px solid gtkalpha("@theme_fg_color", 0.2); - background-color: gtkalpha("@theme_fg_color", 0.2); + border: 1px solid gtkalpha(gtk("@theme_fg_color"), 0.2); + background-color: gtkalpha(gtk("@theme_fg_color"), 0.2); border-radius: #{$_radius}; border-#{$_border}-color: transparent; &:hover, &.prelight-page { - background-color: gtkalpha("@theme_selected_bg_color", 0.2); - border-color: gtkalpha("@theme_selected_bg_color", 0.2); + background-color: gtkalpha(gtk("@theme_selected_bg_color"), 0.2); + border-color: gtkalpha(gtk("@theme_selected_bg_color"), 0.2); } &:checked { border-color: gtk("@borders"); @@ -93,7 +93,7 @@ border-#{$_border}-color: gtk("@borders"); box-shadow: inset #{$_shadow1} gtk("@theme_bg_color"); &:hover, &.prelight-page { - box-shadow: inset 0px -3px 0px 0px gtkalpha("@theme_selected_bg_color",0.2), inset $_shadow1 gtk("@theme_bg_color"); + box-shadow: inset 0px -3px 0px 0px gtkalpha(gtk("@theme_selected_bg_color"),0.2), inset $_shadow1 gtk("@theme_bg_color"); } &:checked { box-shadow: inset 0px -3px 0px 0px gtk("@theme_selected_bg_color"), inset $_shadow1 gtk("@theme_bg_color"); diff --git a/src/gtk3/widgets/_progressbar.scss b/src/gtk3/widgets/_progressbar.scss --- a/src/gtk3/widgets/_progressbar.scss +++ b/src/gtk3/widgets/_progressbar.scss @@ -25,7 +25,7 @@ background-color: gtkalpha(gtk("@theme_button_foreground_normal"),0.3); } - &:backdrop trough { background-color: gtkalpha("@theme_button_foreground_backdrop",0.3); } // looks like states are not passed to the trough component here + &:backdrop trough { background-color: gtkalpha(gtk("@theme_button_foreground_backdrop"),0.3); } // looks like states are not passed to the trough component here progress { background-color: gtk("@theme_selected_bg_color"); @@ -60,7 +60,7 @@ background-color: $trough_color; &:selected { &:focus, & { - background-color: gtkalpha("@theme_selected_fg_color",0.3); + background-color: gtkalpha(gtk("@theme_selected_fg_color"),0.3); } } } @@ -138,7 +138,7 @@ border-color: transparent; box-shadow: none; &:backdrop { - background-color: gtkalpha("@theme_button_foreground_insensitive",0.3); + background-color: gtkalpha(gtk("@theme_button_foreground_insensitive"),0.3); } } } diff --git a/src/gtk3/widgets/_scale.scss b/src/gtk3/widgets/_scale.scss --- a/src/gtk3/widgets/_scale.scss +++ b/src/gtk3/widgets/_scale.scss @@ -33,11 +33,11 @@ &:disabled { border-style: solid; // needed for double marks scales or they'll get border-radius: 50%; // overridden - background-color: gtkalpha("@theme_button_background_insensitive", 100.0); + background-color: gtkalpha(gtk("@theme_button_background_insensitive"), 100.0); opacity: 1.0; border-color: gtk("@insensitive_borders"); &:backdrop { - background-color: gtkalpha("@theme_button_background_backdrop_insensitive", 100.0); + background-color: gtkalpha(gtk("@theme_button_background_backdrop_insensitive"), 100.0); border-color: gtk("@unfocused_insensitive_borders"); } } diff --git a/src/gtk3/widgets/_scrollbar.scss b/src/gtk3/widgets/_scrollbar.scss --- a/src/gtk3/widgets/_scrollbar.scss +++ b/src/gtk3/widgets/_scrollbar.scss @@ -110,7 +110,7 @@ min-height: 30px; border-radius: 8px; background-clip: padding-box; - background-color: gtkalpha("@theme_fg_color", 0.5); + background-color: gtkalpha(gtk("@theme_fg_color"), 0.5); &:hover { min-width: 6px; background-color: gtk("@theme_button_decoration_hover"); @@ -123,7 +123,7 @@ min-height: 3px; border-radius: 8px; background-clip: padding-box; - background-color: gtkalpha("@theme_fg_color", 0.5); + background-color: gtkalpha(gtk("@theme_fg_color"), 0.5); &:hover { min-height: 6px; background-color: gtk("@theme_button_decoration_hover"); diff --git a/src/gtk3/widgets/_switch.scss b/src/gtk3/widgets/_switch.scss --- a/src/gtk3/widgets/_switch.scss +++ b/src/gtk3/widgets/_switch.scss @@ -13,15 +13,15 @@ border: 0px solid; border-radius: 12px; color: transparent; - background-color: gtkalpha("@theme_button_foreground_normal",0.3); + background-color: gtkalpha(gtk("@theme_button_foreground_normal"),0.3); text-shadow: none; &:checked { background-color: gtk("@theme_selected_bg_color"); } &:backdrop { - background-color: gtkalpha("@theme_button_foreground_backdrop", 0.3); + background-color: gtkalpha(gtk("@theme_button_foreground_backdrop"), 0.3); text-shadow: none; &:checked { diff --git a/src/gtk3/widgets/_treeview.scss b/src/gtk3/widgets/_treeview.scss --- a/src/gtk3/widgets/_treeview.scss +++ b/src/gtk3/widgets/_treeview.scss @@ -6,7 +6,7 @@ border-left-color: gtk("@theme_selected_fg_color"); border-top-color: gtk("@theme_selected_fg_color"); } @else { - background-color: gtkalpha("@theme_selected_bg_color", 0.3); + background-color: gtkalpha(gtk("@theme_selected_bg_color"), 0.3); border-left-color: gtk("@theme_fg_color"); border-top-color: gtk("@theme_fg_color"); } @@ -123,14 +123,14 @@ &:hover { @extend %column_header_button; color: gtk("@theme_button_foreground_normal"); - background-color: gtkalpha("@theme_button_decoration_hover", 0.5); + background-color: gtkalpha(gtk("@theme_button_decoration_hover"), 0.5); box-shadow: none; transition: none; //I shouldn't need this } &:active { @extend %column_header_button; color: gtk("@theme_button_foreground_normal"); - background-color: gtkalpha("@theme_button_decoration_hover", 0.5); + background-color: gtkalpha(gtk("@theme_button_decoration_hover"), 0.5); transition: none; //I shouldn't need this } }