[gtk: 2/2] Merge branch 'ci-pages' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 6c6b3d0d118bdf55602aa8e8263c174e16dfc91a
Merge: 11ab39617e 2ab9be54fb
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Feb 12 22:35:58 2020 +0000

    Merge branch 'ci-pages' into 'master'
    
    Rename the SCSS files for our themes
    
    Closes #2423
    
    See merge request GNOME/gtk!1423

 gtk/gen-gtk-gresources-xml.py                      |  8 ++---
 gtk/meson.build                                    | 25 ++++++++------
 .../{gtk-contained-dark.scss => Adwaita-dark.scss} |  0
 .../Adwaita/{gtk-contained.scss => Adwaita.scss}   |  0
 gtk/theme/Adwaita/meson.build                      | 40 ++++++++++++----------
 ...ined-inverse.scss => HighContrast-inverse.scss} |  0
 .../{gtk-contained.scss => HighContrast.scss}      |  0
 gtk/theme/HighContrast/meson.build                 | 40 ++++++++++++----------
 8 files changed, 61 insertions(+), 52 deletions(-)
---