diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2014-06-13 14:42:38 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2014-06-13 14:44:38 -0400 |
| commit | 3ae4c8f125b2abaedc03c71f3296aad256fbdb47 (patch) | |
| tree | 07972bfa9760ca9cf011bc09e700ff9f676054ed /gtk/Makefile.am | |
| parent | 6cc5908d88c712ee5faa2618320256af2c23f61f (diff) | |
| download | gtk+-3ae4c8f125b2abaedc03c71f3296aad256fbdb47.tar.gz | |
Adwaita: bring back the extra indirection
Without this, we are missing the 'Adwaita' component in the
path when resolving relative resources, and none of the assets
are found.
Diffstat (limited to 'gtk/Makefile.am')
| -rw-r--r-- | gtk/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am index b68f5f3237..ff809583f4 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1384,6 +1384,8 @@ gtk.gresource.xml: Makefile.am done; \ echo -e " <file alias=\"theme/Adwaita.css\">theme/Adwaita/gtk.css</file>" >> $@; \ echo -e " <file alias=\"theme/Adwaita-dark.css\">theme/Adwaita/gtk-dark.css</file>" >> $@; \ + echo -e " <file>theme/Adwaita/gtk-contained.css</file>" >> $@; \ + echo -e " <file>theme/Adwaita/gtk-contained-dark.css</file>" >> $@; \ for f in $(srcdir)/resources/theme/Adwaita/assets/*; do \ n=`basename $$f`; \ echo -e " <file preprocess=\"to-pixdata\">theme/Adwaita/assets/$$n</file>" >> $@; \ @@ -1410,8 +1412,8 @@ adwaita_sources = \ resources/theme/Adwaita/_colors.scss \ resources/theme/Adwaita/_common.scss \ resources/theme/Adwaita/_drawing.scss \ - resources/theme/Adwaita/gtk.scss \ - resources/theme/Adwaita/gtk-dark.scss \ + resources/theme/Adwaita/gtk-contained.scss \ + resources/theme/Adwaita/gtk-contained-dark.scss \ resources/theme/Adwaita/parse-sass.sh \ resources/theme/Adwaita/render-assets.sh \ resources/theme/Adwaita/render-borders.sh \ |