From f60d245e327a760a188e8b5a40844f5fe092df43 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 14 Jan 2021 22:55:52 -0500 Subject: [PATCH] Make HighContrastInverse a dark variant Make HighContrastInverse available as the dark variant of HighContrast, in addition to being a standalone theme. This regularizes our theme variants, and doesn't hurt. --- gtk/gen-gtk-gresources-xml.py | 5 +++-- .../{HighContrast-inverse.scss => HighContrast-dark.scss} | 0 gtk/theme/HighContrast/{gtk-inverse.css => gtk-dark.css} | 2 +- gtk/theme/HighContrast/meson.build | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) rename gtk/theme/HighContrast/{HighContrast-inverse.scss => HighContrast-dark.scss} (100%) rename gtk/theme/HighContrast/{gtk-inverse.css => gtk-dark.css} (73%) diff --git a/gtk/gen-gtk-gresources-xml.py b/gtk/gen-gtk-gresources-xml.py index a17f09ee0a..3f08c60e80 100644 --- a/gtk/gen-gtk-gresources-xml.py +++ b/gtk/gen-gtk-gresources-xml.py @@ -49,9 +49,10 @@ for f in get_files('theme/Adwaita/assets', '.svg'): xml += ''' theme/HighContrast/gtk.css - theme/HighContrast/gtk-inverse.css + theme/HighContrast/gtk-dark.css + theme/HighContrast/gtk-dark.css theme/HighContrast/HighContrast.css - theme/HighContrast/HighContrast-inverse.css + theme/HighContrast/HighContrast-dark.css ''' for f in get_files('theme/HighContrast/assets', '.png'): diff --git a/gtk/theme/HighContrast/HighContrast-inverse.scss b/gtk/theme/HighContrast/HighContrast-dark.scss similarity index 100% rename from gtk/theme/HighContrast/HighContrast-inverse.scss rename to gtk/theme/HighContrast/HighContrast-dark.scss diff --git a/gtk/theme/HighContrast/gtk-inverse.css b/gtk/theme/HighContrast/gtk-dark.css similarity index 73% rename from gtk/theme/HighContrast/gtk-inverse.css rename to gtk/theme/HighContrast/gtk-dark.css index 6649fc4ef3..5f32a5edc5 100644 --- a/gtk/theme/HighContrast/gtk-inverse.css +++ b/gtk/theme/HighContrast/gtk-dark.css @@ -1 +1 @@ -@import url("resource:///org/gtk/libgtk/theme/HighContrast/HighContrast-inverse.css"); +@import url("resource:///org/gtk/libgtk/theme/HighContrast/HighContrast-dark.css"); diff --git a/gtk/theme/HighContrast/meson.build b/gtk/theme/HighContrast/meson.build index 700bd90b09..0bc6931392 100644 --- a/gtk/theme/HighContrast/meson.build +++ b/gtk/theme/HighContrast/meson.build @@ -3,7 +3,7 @@ hc_scss_files = files([ ]) hc_theme_variants = [ - 'inverse', + 'dark', ] hc_theme_deps = [