Merge branch 'rename-theme-resources' into 'master'

Rename GResources for standard GTK themes

See merge request GNOME/gtk!1576
This commit is contained in:
Matthias Clasen 2020-03-27 16:37:31 +00:00
commit 8997dc6f31
5 changed files with 8 additions and 8 deletions

View File

@ -20,8 +20,8 @@ xml += '''
<file>theme/Empty/gtk.css</file>
<file>theme/Adwaita/gtk.css</file>
<file>theme/Adwaita/gtk-dark.css</file>
<file alias='theme/Adwaita/gtk-contained.css'>theme/Adwaita/Adwaita.css</file>
<file alias='theme/Adwaita/gtk-contained-dark.css'>theme/Adwaita/Adwaita-dark.css</file>
<file>theme/Adwaita/Adwaita.css</file>
<file>theme/Adwaita/Adwaita-dark.css</file>
'''
for f in get_files('theme/Adwaita/assets', '.png'):
@ -35,8 +35,8 @@ 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 alias='theme/HighContrast/gtk-contained.css'>theme/HighContrast/HighContrast.css</file>
<file alias='theme/HighContrast/gtk-contained-inverse.css'>theme/HighContrast/HighContrast-inverse.css</file>
<file>theme/HighContrast/HighContrast.css</file>
<file>theme/HighContrast/HighContrast-inverse.css</file>
'''
for f in get_files('theme/HighContrast/assets', '.png'):

View File

@ -1 +1 @@
@import url("resource:///org/gtk/libgtk/theme/Adwaita/gtk-contained-dark.css");
@import url("resource:///org/gtk/libgtk/theme/Adwaita/Adwaita-dark.css");

View File

@ -1 +1 @@
@import url("resource:///org/gtk/libgtk/theme/Adwaita/gtk-contained.css");
@import url("resource:///org/gtk/libgtk/theme/Adwaita/Adwaita.css");

View File

@ -1 +1 @@
@import url("resource:///org/gtk/libgtk/theme/HighContrast/gtk-contained-inverse.css");
@import url("resource:///org/gtk/libgtk/theme/HighContrast/HighContrast-inverse.css");

View File

@ -1 +1 @@
@import url("resource:///org/gtk/libgtk/theme/HighContrast/gtk-contained.css");
@import url("resource:///org/gtk/libgtk/theme/HighContrast/HighContrast.css");