[libadwaita/wip/exalm/recoloring-fixes: 6/32] stylesheet: Move old public colors to _compat-colors.scss




commit 7429bfcb3c005e2d08f17a6a486d2173880966d1
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Wed Sep 1 12:32:10 2021 +0500

    stylesheet: Move old public colors to _compat-colors.scss

 src/stylesheet/Adwaita-dark.scss                   |  2 +-
 src/stylesheet/Adwaita-hc-dark.scss                |  2 +-
 src/stylesheet/Adwaita-hc.scss                     |  2 +-
 src/stylesheet/Adwaita-light.scss                  |  2 +-
 .../{_colors-public.scss => _compat-colors.scss}   | 27 +++-------------------
 src/stylesheet/meson.build                         |  2 +-
 6 files changed, 8 insertions(+), 29 deletions(-)
---
diff --git a/src/stylesheet/Adwaita-dark.scss b/src/stylesheet/Adwaita-dark.scss
index e09248a9..6881aee1 100644
--- a/src/stylesheet/Adwaita-dark.scss
+++ b/src/stylesheet/Adwaita-dark.scss
@@ -7,4 +7,4 @@ $contrast: 'normal';
 @import 'colors';
 @import 'drawing';
 @import 'common';
-@import 'colors-public';
+@import 'compat-colors';
diff --git a/src/stylesheet/Adwaita-hc-dark.scss b/src/stylesheet/Adwaita-hc-dark.scss
index 4aadcfc9..c14fd2bd 100644
--- a/src/stylesheet/Adwaita-hc-dark.scss
+++ b/src/stylesheet/Adwaita-hc-dark.scss
@@ -5,6 +5,6 @@ $contrast: 'high';
 @import 'defaults';
 @import 'functions';
 @import 'colors';
-@import 'colors-public';
 @import 'drawing';
 @import 'common';
+@import 'compat-colors';
diff --git a/src/stylesheet/Adwaita-hc.scss b/src/stylesheet/Adwaita-hc.scss
index 552d2833..a1bfe472 100644
--- a/src/stylesheet/Adwaita-hc.scss
+++ b/src/stylesheet/Adwaita-hc.scss
@@ -5,6 +5,6 @@ $contrast: 'high';
 @import 'defaults';
 @import 'functions';
 @import 'colors';
-@import 'colors-public';
 @import 'drawing';
 @import 'common';
+@import 'compat-colors';
diff --git a/src/stylesheet/Adwaita-light.scss b/src/stylesheet/Adwaita-light.scss
index 7cbd2b87..26c18b4a 100644
--- a/src/stylesheet/Adwaita-light.scss
+++ b/src/stylesheet/Adwaita-light.scss
@@ -13,4 +13,4 @@ $contrast: 'normal';
 @import 'colors';
 @import 'drawing';
 @import 'common';
-@import 'colors-public';
+@import 'compat-colors';
diff --git a/src/stylesheet/_colors-public.scss b/src/stylesheet/_compat-colors.scss
similarity index 53%
rename from src/stylesheet/_colors-public.scss
rename to src/stylesheet/_compat-colors.scss
index afaa3278..5e19c2c7 100644
--- a/src/stylesheet/_colors-public.scss
+++ b/src/stylesheet/_compat-colors.scss
@@ -1,38 +1,17 @@
-//apps rely on some named colors to be exported
-/* 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/foreground color */
-@define-color theme_fg_color #{$fg_color};
 
-/*
-text color for entries, views and content in general */
-@define-color theme_text_color #{$text_color};
+/* Public colors from Default */
 
-/*
-widget base background color */
 @define-color theme_bg_color #{$bg_color};
+@define-color theme_fg_color #{$fg_color};
 
-/*
-text widgets and the like base background color */
 @define-color theme_base_color #{$base_color};
+@define-color theme_text_color #{$text_color};
 
-/*
-base background color of insensitive widgets */
 @define-color insensitive_bg_color #{gtkmix($bg_color, $base_color, 60%)};
-
-/*
-text foreground color of insensitive widgets */
 @define-color insensitive_fg_color #{gtkalpha($fg_color, .5)};
 
-/*
-insensitive text widgets and the like base background color */
 @define-color insensitive_base_color #{$base_color};
 
-/*
-widgets main borders color */
 @define-color borders #{$borders_color};
diff --git a/src/stylesheet/meson.build b/src/stylesheet/meson.build
index 4dbbfa9b..e266d226 100644
--- a/src/stylesheet/meson.build
+++ b/src/stylesheet/meson.build
@@ -14,9 +14,9 @@ if not fs.exists('Adwaita-light.css')
     sassc_opts = [ '-a', '-M', '-t', 'compact' ]
 
     scss_files = files([
-      '_colors-public.scss',
       '_colors.scss',
       '_common.scss',
+      '_compat-colors.scss',
       '_defaults.scss',
       '_drawing.scss',
       '_functions.scss',


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]