From 9ea894a56dba6039a3740867a3ab68f441470ab8 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Sat, 18 Oct 2014 16:29:19 +0200 Subject: [PATCH] Adwaita: comment exported colors --- .../theme/Adwaita/_colors-public.scss | 52 ++++++++++++++++++- .../theme/Adwaita/gtk-contained-dark.css | 39 +++++++++++++- gtk/resources/theme/Adwaita/gtk-contained.css | 39 +++++++++++++- 3 files changed, 127 insertions(+), 3 deletions(-) diff --git a/gtk/resources/theme/Adwaita/_colors-public.scss b/gtk/resources/theme/Adwaita/_colors-public.scss index 2a6454f116..6b65cfc401 100644 --- a/gtk/resources/theme/Adwaita/_colors-public.scss +++ b/gtk/resources/theme/Adwaita/_colors-public.scss @@ -1,24 +1,71 @@ //apps rely on some named colors to be exported -/* GTK NAMED COLORS */ +/* GTK NAMED COLORS + ---------------- + use responsibly! */ // Sass thinks we're using the colors in the variables as strings and may shoot // warning, it's innocuous and can be defeated by using "" + $var +/* +widget text/foregroung color */ @define-color theme_fg_color #{$fg_color}; +/* +widget base background color */ @define-color theme_bg_color #{$bg_color}; + +/* +text widgets and the like base background color */ @define-color theme_base_color #{"" + $base_color}; + +/* +base background color of selections */ @define-color theme_selected_bg_color #{$selected_bg_color}; + +/* +text/foreground color of selections */ @define-color theme_selected_fg_color #{"" + $selected_fg_color}; + +/* +base background color of insensitive widgets */ @define-color insensitive_bg_color #{$insensitive_bg_color}; + +/* +text foreground color of insensitive widgets */ @define-color insensitive_fg_color #{$insensitive_fg_color}; + +/* +insensitive text widgets and the like base background color */ @define-color insensitive_base_color #{"" + $base_color}; + +/* +widget text/foreground color on backdrop windows */ @define-color theme_unfocused_fg_color #{$backdrop_fg_color}; + +/* +widget base background color on backdrop windows */ @define-color theme_unfocused_bg_color #{$backdrop_bg_color}; + +/* +text widgets and the like base background color on backdrop windows */ @define-color theme_unfocused_base_color #{$backdrop_base_color}; + +/* +base background color of selections on backdrop windows */ @define-color theme_unfocused_selected_bg_color #{$selected_bg_color}; + +/* +text/foreground color of selections on backdrop windows */ @define-color theme_unfocused_selected_fg_color #{"" + $selected_fg_color}; + +/* +widgets main borders color */ @define-color borders #{$borders_color}; + +/* +widgets main borders color on backdrop windows */ @define-color unfocused_borders #{$backdrop_borders_color}; +/* +these are pretty self explicative */ @define-color warning_color #{$warning_color}; @define-color error_color #{$error_color}; @define-color success_color #{$success_color}; @@ -30,6 +77,9 @@ $_wm_highlight: if($variant=='light', $top_hilight, // Sass gets mad if this is transparentize(black,1)); // done directly in the // color definition +/* +these colors are exported for the window manager and shouldn't be used in applications, +read if you used those and something break with a version upgrade you're on your own... */ @define-color wm_title shade(#{$fg_color}, 1.8); @define-color wm_unfocused_title #{$backdrop_fg_color}; @define-color wm_highlight #{"" + $_wm_highlight}; diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index eec8664925..5c3508d6c5 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -4360,25 +4360,62 @@ GtkCalendar.header .menuitem.titlebutton.button:selected, .list-row:selected { .monospace { font: Monospace; } -/* GTK NAMED COLORS */ +/* GTK NAMED COLORS + ---------------- + use responsibly! */ +/* +widget text/foregroung color */ @define-color theme_fg_color #eeeeec; +/* +widget base background color */ @define-color theme_bg_color #393f3f; +/* +text widgets and the like base background color */ @define-color theme_base_color #292929; +/* +base background color of selections */ @define-color theme_selected_bg_color #215d9c; +/* +text/foreground color of selections */ @define-color theme_selected_fg_color #ffffff; +/* +base background color of insensitive widgets */ @define-color insensitive_bg_color #323636; +/* +text foreground color of insensitive widgets */ @define-color insensitive_fg_color #939695; +/* +insensitive text widgets and the like base background color */ @define-color insensitive_base_color #292929; +/* +widget text/foreground color on backdrop windows */ @define-color theme_unfocused_fg_color #939695; +/* +widget base background color on backdrop windows */ @define-color theme_unfocused_bg_color #393f3f; +/* +text widgets and the like base background color on backdrop windows */ @define-color theme_unfocused_base_color #2c2c2c; +/* +base background color of selections on backdrop windows */ @define-color theme_unfocused_selected_bg_color #215d9c; +/* +text/foreground color of selections on backdrop windows */ @define-color theme_unfocused_selected_fg_color #ffffff; +/* +widgets main borders color */ @define-color borders #1c1f1f; +/* +widgets main borders color on backdrop windows */ @define-color unfocused_borders #1e2222; +/* +these are pretty self explicative */ @define-color warning_color #f57900; @define-color error_color #cc0000; @define-color success_color #5aa411; +/* +these colors are exported for the window manager and shouldn't be used in applications, +read if you used those and something break with a version upgrade you're on your own... */ @define-color wm_title shade(#eeeeec, 1.8); @define-color wm_unfocused_title #939695; @define-color wm_highlight transparent; diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index d5c82ac943..cf0957174b 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -4522,25 +4522,62 @@ GtkCalendar.header .menuitem.titlebutton.button:selected, .list-row:selected { .monospace { font: Monospace; } -/* GTK NAMED COLORS */ +/* GTK NAMED COLORS + ---------------- + use responsibly! */ +/* +widget text/foregroung color */ @define-color theme_fg_color #2e3436; +/* +widget base background color */ @define-color theme_bg_color #ededed; +/* +text widgets and the like base background color */ @define-color theme_base_color #ffffff; +/* +base background color of selections */ @define-color theme_selected_bg_color #4a90d9; +/* +text/foreground color of selections */ @define-color theme_selected_fg_color #ffffff; +/* +base background color of insensitive widgets */ @define-color insensitive_bg_color #f4f4f4; +/* +text foreground color of insensitive widgets */ @define-color insensitive_fg_color #8d9091; +/* +insensitive text widgets and the like base background color */ @define-color insensitive_base_color #ffffff; +/* +widget text/foreground color on backdrop windows */ @define-color theme_unfocused_fg_color #8d9091; +/* +widget base background color on backdrop windows */ @define-color theme_unfocused_bg_color #ededed; +/* +text widgets and the like base background color on backdrop windows */ @define-color theme_unfocused_base_color #fcfcfc; +/* +base background color of selections on backdrop windows */ @define-color theme_unfocused_selected_bg_color #4a90d9; +/* +text/foreground color of selections on backdrop windows */ @define-color theme_unfocused_selected_fg_color #ffffff; +/* +widgets main borders color */ @define-color borders #a1a1a1; +/* +widgets main borders color on backdrop windows */ @define-color unfocused_borders #a8a8a8; +/* +these are pretty self explicative */ @define-color warning_color #f57900; @define-color error_color #cc0000; @define-color success_color #73d216; +/* +these colors are exported for the window manager and shouldn't be used in applications, +read if you used those and something break with a version upgrade you're on your own... */ @define-color wm_title shade(#2e3436, 1.8); @define-color wm_unfocused_title #8d9091; @define-color wm_highlight white;