diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-01-15 05:48:00 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-01-15 05:48:00 +0000 |
| commit | 7b69c58deb035bee1d590e80b589531ad7443976 (patch) | |
| tree | 04bb0851c032912d1bd77915f2a008ad4ce5516d | |
| parent | 90c428b4a737f6446865889eede6dfccd2b67048 (diff) | |
| parent | f60d245e327a760a188e8b5a40844f5fe092df43 (diff) | |
| download | gtk+-7b69c58deb035bee1d590e80b589531ad7443976.tar.gz | |
Merge branch 'matthiasc/for-master' into 'master'
Matthiasc/for master
See merge request GNOME/gtk!3078
| -rw-r--r-- | gtk/gen-gtk-gresources-xml.py | 6 | ||||
| -rw-r--r-- | gtk/theme/HighContrast/HighContrast-dark.scss (renamed from gtk/theme/HighContrast/HighContrast-inverse.scss) | 0 | ||||
| -rw-r--r-- | gtk/theme/HighContrast/gtk-dark.css (renamed from gtk/theme/HighContrast/gtk-inverse.css) | 2 | ||||
| -rw-r--r-- | gtk/theme/HighContrast/meson.build | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/gtk/gen-gtk-gresources-xml.py b/gtk/gen-gtk-gresources-xml.py index 98ae168c47..3f08c60e80 100644 --- a/gtk/gen-gtk-gresources-xml.py +++ b/gtk/gen-gtk-gresources-xml.py @@ -34,6 +34,7 @@ xml += ''' <file>theme/Empty/gtk.css</file> <file>theme/Adwaita/gtk.css</file> <file>theme/Adwaita/gtk-dark.css</file> + <file alias='theme/Adwaita-dark/gtk.css'>theme/Adwaita/gtk-dark.css</file> <file>theme/Adwaita/Adwaita.css</file> <file>theme/Adwaita/Adwaita-dark.css</file> ''' @@ -48,9 +49,10 @@ for f in get_files('theme/Adwaita/assets', '.svg'): xml += ''' <file>theme/HighContrast/gtk.css</file> - <file alias='theme/HighContrastInverse/gtk.css'>theme/HighContrast/gtk-inverse.css</file> + <file>theme/HighContrast/gtk-dark.css</file> + <file alias='theme/HighContrastInverse/gtk.css'>theme/HighContrast/gtk-dark.css</file> <file>theme/HighContrast/HighContrast.css</file> - <file>theme/HighContrast/HighContrast-inverse.css</file> + <file>theme/HighContrast/HighContrast-dark.css</file> ''' 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 index 51c57c0fbf..51c57c0fbf 100644 --- a/gtk/theme/HighContrast/HighContrast-inverse.scss +++ b/gtk/theme/HighContrast/HighContrast-dark.scss diff --git a/gtk/theme/HighContrast/gtk-inverse.css b/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 = [ |