[gtk: 7/7] Merge branch 'theme-reorg' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 469228fcd7683556ded0c44bfaa8a4400e38e5b7
Merge: 7f4041ec30 fd329e0ec5
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Apr 2 03:02:49 2021 +0000

    Merge branch 'theme-reorg' into 'master'
    
    Reorganize our themes
    
    See merge request GNOME/gtk!3079

 demos/widget-factory/widget-factory.c              |  31 +++++----------
 demos/widget-factory/widget-factory.ui             |  16 ++++----
 gtk/gen-gtk-gresources-xml.py                      |  43 ++++++++++----------
 gtk/gtkcssprovider.c                               |  16 +++++---
 gtk/gtksettingsprivate.h                           |   2 +-
 gtk/meson.build                                    |   6 +--
 gtk/theme/Adwaita/gtk-dark.css                     |   1 -
 gtk/theme/Adwaita/gtk.css                          |   1 -
 gtk/theme/Adwaita/meson.build                      |  32 ---------------
 gtk/theme/Adwaita/render-assets.sh                 |  34 ----------------
 gtk/theme/Default/Default-dark.scss                |   7 ++++
 .../Default-hc-dark.scss}                          |   3 +-
 gtk/theme/Default/Default-hc.scss                  |   7 ++++
 .../Adwaita.scss => Default/Default-light.scss}    |   1 +
 gtk/theme/{Adwaita => Default}/README              |  14 +++++--
 gtk/theme/{Adwaita => Default}/_colors-public.scss |   0
 gtk/theme/{Adwaita => Default}/_colors.scss        |  27 +++++++++++++
 gtk/theme/{Adwaita => Default}/_common.scss        |  25 ++++++------
 gtk/theme/{Adwaita => Default}/_drawing.scss       |   0
 .../assets.svg => Default/assets-hc.svg}           |   0
 .../assets-hc}/bullet-symbolic.svg                 |   0
 .../assets-hc}/bullet-symbolic.symbolic.png        | Bin
 .../assets-hc}/bullet 2-symbolic symbolic png      | Bin
 .../assets-hc}/check-symbolic.svg                  |   0
 .../assets-hc}/check-symbolic.symbolic.png         | Bin
 .../assets-hc}/check 2-symbolic symbolic png       | Bin
 .../assets => Default/assets-hc}/dash-symbolic.svg |   0
 .../assets-hc}/dash-symbolic.symbolic.png          | Bin
 .../assets-hc}/dash 2-symbolic symbolic png        | Bin
 ...ider-horz-scale-has-marks-above-active-dark.png | Bin
 ...er-horz-scale-has-marks-above-active-dark 2 png | Bin
 .../slider-horz-scale-has-marks-above-active.png   | Bin
 .../slider-horz-scale-has-marks-above-active 2 png | Bin
 .../slider-horz-scale-has-marks-above-dark.png     | Bin
 .../slider-horz-scale-has-marks-above-dark 2 png   | Bin
 ...lider-horz-scale-has-marks-above-hover-dark.png | Bin
 ...der-horz-scale-has-marks-above-hover-dark 2 png | Bin
 .../slider-horz-scale-has-marks-above-hover.png    | Bin
 .../slider-horz-scale-has-marks-above-hover 2 png  | Bin
 ...horz-scale-has-marks-above-insensitive-dark.png | Bin
 ...rz-scale-has-marks-above-insensitive-dark 2 png | Bin
 ...ider-horz-scale-has-marks-above-insensitive.png | Bin
 ...er-horz-scale-has-marks-above-insensitive 2 png | Bin
 .../slider-horz-scale-has-marks-above.png          | Bin
 .../slider-horz-scale-has-marks-above 2 png        | Bin
 ...ider-horz-scale-has-marks-below-active-dark.png | Bin
 ...er-horz-scale-has-marks-below-active-dark 2 png | Bin
 .../slider-horz-scale-has-marks-below-active.png   | Bin
 .../slider-horz-scale-has-marks-below-active 2 png | Bin
 .../slider-horz-scale-has-marks-below-dark.png     | Bin
 .../slider-horz-scale-has-marks-below-dark 2 png   | Bin
 ...lider-horz-scale-has-marks-below-hover-dark.png | Bin
 ...der-horz-scale-has-marks-below-hover-dark 2 png | Bin
 .../slider-horz-scale-has-marks-below-hover.png    | Bin
 .../slider-horz-scale-has-marks-below-hover 2 png  | Bin
 ...horz-scale-has-marks-below-insensitive-dark.png | Bin
 ...rz-scale-has-marks-below-insensitive-dark 2 png | Bin
 ...ider-horz-scale-has-marks-below-insensitive.png | Bin
 ...er-horz-scale-has-marks-below-insensitive 2 png | Bin
 .../slider-horz-scale-has-marks-below.png          | Bin
 .../slider-horz-scale-has-marks-below 2 png        | Bin
 ...ider-vert-scale-has-marks-above-active-dark.png | Bin
 ...er-vert-scale-has-marks-above-active-dark 2 png | Bin
 .../slider-vert-scale-has-marks-above-active.png   | Bin
 .../slider-vert-scale-has-marks-above-active 2 png | Bin
 .../slider-vert-scale-has-marks-above-dark.png     | Bin
 .../slider-vert-scale-has-marks-above-dark 2 png   | Bin
 ...lider-vert-scale-has-marks-above-hover-dark.png | Bin
 ...der-vert-scale-has-marks-above-hover-dark 2 png | Bin
 .../slider-vert-scale-has-marks-above-hover.png    | Bin
 .../slider-vert-scale-has-marks-above-hover 2 png  | Bin
 ...vert-scale-has-marks-above-insensitive-dark.png | Bin
 ...rt-scale-has-marks-above-insensitive-dark 2 png | Bin
 ...ider-vert-scale-has-marks-above-insensitive.png | Bin
 ...er-vert-scale-has-marks-above-insensitive 2 png | Bin
 .../slider-vert-scale-has-marks-above.png          | Bin
 .../slider-vert-scale-has-marks-above 2 png        | Bin
 ...ider-vert-scale-has-marks-below-active-dark.png | Bin
 ...er-vert-scale-has-marks-below-active-dark 2 png | Bin
 .../slider-vert-scale-has-marks-below-active.png   | Bin
 .../slider-vert-scale-has-marks-below-active 2 png | Bin
 .../slider-vert-scale-has-marks-below-dark.png     | Bin
 .../slider-vert-scale-has-marks-below-dark 2 png   | Bin
 ...lider-vert-scale-has-marks-below-hover-dark.png | Bin
 ...der-vert-scale-has-marks-below-hover-dark 2 png | Bin
 .../slider-vert-scale-has-marks-below-hover.png    | Bin
 .../slider-vert-scale-has-marks-below-hover 2 png  | Bin
 ...vert-scale-has-marks-below-insensitive-dark.png | Bin
 ...rt-scale-has-marks-below-insensitive-dark 2 png | Bin
 ...ider-vert-scale-has-marks-below-insensitive.png | Bin
 ...er-vert-scale-has-marks-below-insensitive 2 png | Bin
 .../slider-vert-scale-has-marks-below.png          | Bin
 .../slider-vert-scale-has-marks-below 2 png        | Bin
 .../assets-hc}/text-select-end-active-dark.png     | Bin
 .../assets-hc}/text-select-end-active-dark 2 png   | Bin
 .../assets-hc}/text-select-end-active.png          | Bin
 .../assets-hc}/text-select-end-active 2 png        | Bin
 .../assets-hc}/text-select-end-dark.png            | Bin
 .../assets-hc}/text-select-end-dark 2 png          | Bin
 .../assets-hc}/text-select-end-hover-dark.png      | Bin
 .../assets-hc}/text-select-end-hover-dark 2 png    | Bin
 .../assets-hc}/text-select-end-hover.png           | Bin
 .../assets-hc}/text-select-end-hover 2 png         | Bin
 .../assets-hc}/text-select-end.png                 | Bin
 .../assets-hc}/text-select-end 2 png               | Bin
 .../assets-hc}/text-select-start-active-dark.png   | Bin
 .../assets-hc}/text-select-start-active-dark 2 png | Bin
 .../assets-hc}/text-select-start-active.png        | Bin
 .../assets-hc}/text-select-start-active 2 png      | Bin
 .../assets-hc}/text-select-start-dark.png          | Bin
 .../assets-hc}/text-select-start-dark 2 png        | Bin
 .../assets-hc}/text-select-start-hover-dark.png    | Bin
 .../assets-hc}/text-select-start-hover-dark 2 png  | Bin
 .../assets-hc}/text-select-start-hover.png         | Bin
 .../assets-hc}/text-select-start-hover 2 png       | Bin
 .../assets-hc}/text-select-start.png               | Bin
 .../assets-hc}/text-select-start 2 png             | Bin
 gtk/theme/{Adwaita => Default}/assets.svg          |   0
 gtk/theme/{Adwaita => Default}/assets.txt          |   0
 .../assets/bullet-symbolic.svg                     |   0
 .../assets/bullet-symbolic.symbolic.png            | Bin
 .../assets/bullet 2-symbolic symbolic png          | Bin
 .../{Adwaita => Default}/assets/check-symbolic.svg |   0
 .../assets/check-symbolic.symbolic.png             | Bin
 .../assets/check 2-symbolic symbolic png           | Bin
 .../assets/dash-symbolic.svg                       |   0
 .../assets/dash-symbolic.symbolic.png              | Bin
 .../assets/dash 2-symbolic symbolic png            | Bin
 ...ider-horz-scale-has-marks-above-active-dark.png | Bin
 ...er-horz-scale-has-marks-above-active-dark 2 png | Bin
 .../slider-horz-scale-has-marks-above-active.png   | Bin
 .../slider-horz-scale-has-marks-above-active 2 png | Bin
 .../slider-horz-scale-has-marks-above-dark.png     | Bin
 .../slider-horz-scale-has-marks-above-dark 2 png   | Bin
 ...lider-horz-scale-has-marks-above-hover-dark.png | Bin
 ...der-horz-scale-has-marks-above-hover-dark 2 png | Bin
 .../slider-horz-scale-has-marks-above-hover.png    | Bin
 .../slider-horz-scale-has-marks-above-hover 2 png  | Bin
 ...horz-scale-has-marks-above-insensitive-dark.png | Bin
 ...rz-scale-has-marks-above-insensitive-dark 2 png | Bin
 ...ider-horz-scale-has-marks-above-insensitive.png | Bin
 ...er-horz-scale-has-marks-above-insensitive 2 png | Bin
 .../assets/slider-horz-scale-has-marks-above.png   | Bin
 .../assets/slider-horz-scale-has-marks-above 2 png | Bin
 ...ider-horz-scale-has-marks-below-active-dark.png | Bin
 ...er-horz-scale-has-marks-below-active-dark 2 png | Bin
 .../slider-horz-scale-has-marks-below-active.png   | Bin
 .../slider-horz-scale-has-marks-below-active 2 png | Bin
 .../slider-horz-scale-has-marks-below-dark.png     | Bin
 .../slider-horz-scale-has-marks-below-dark 2 png   | Bin
 ...lider-horz-scale-has-marks-below-hover-dark.png | Bin
 ...der-horz-scale-has-marks-below-hover-dark 2 png | Bin
 .../slider-horz-scale-has-marks-below-hover.png    | Bin
 .../slider-horz-scale-has-marks-below-hover 2 png  | Bin
 ...horz-scale-has-marks-below-insensitive-dark.png | Bin
 ...rz-scale-has-marks-below-insensitive-dark 2 png | Bin
 ...ider-horz-scale-has-marks-below-insensitive.png | Bin
 ...er-horz-scale-has-marks-below-insensitive 2 png | Bin
 .../assets/slider-horz-scale-has-marks-below.png   | Bin
 .../assets/slider-horz-scale-has-marks-below 2 png | Bin
 ...ider-vert-scale-has-marks-above-active-dark.png | Bin
 ...er-vert-scale-has-marks-above-active-dark 2 png | Bin
 .../slider-vert-scale-has-marks-above-active.png   | Bin
 .../slider-vert-scale-has-marks-above-active 2 png | Bin
 .../slider-vert-scale-has-marks-above-dark.png     | Bin
 .../slider-vert-scale-has-marks-above-dark 2 png   | Bin
 ...lider-vert-scale-has-marks-above-hover-dark.png | Bin
 ...der-vert-scale-has-marks-above-hover-dark 2 png | Bin
 .../slider-vert-scale-has-marks-above-hover.png    | Bin
 .../slider-vert-scale-has-marks-above-hover 2 png  | Bin
 ...vert-scale-has-marks-above-insensitive-dark.png | Bin
 ...rt-scale-has-marks-above-insensitive-dark 2 png | Bin
 ...ider-vert-scale-has-marks-above-insensitive.png | Bin
 ...er-vert-scale-has-marks-above-insensitive 2 png | Bin
 .../assets/slider-vert-scale-has-marks-above.png   | Bin
 .../assets/slider-vert-scale-has-marks-above 2 png | Bin
 ...ider-vert-scale-has-marks-below-active-dark.png | Bin
 ...er-vert-scale-has-marks-below-active-dark 2 png | Bin
 .../slider-vert-scale-has-marks-below-active.png   | Bin
 .../slider-vert-scale-has-marks-below-active 2 png | Bin
 .../slider-vert-scale-has-marks-below-dark.png     | Bin
 .../slider-vert-scale-has-marks-below-dark 2 png   | Bin
 ...lider-vert-scale-has-marks-below-hover-dark.png | Bin
 ...der-vert-scale-has-marks-below-hover-dark 2 png | Bin
 .../slider-vert-scale-has-marks-below-hover.png    | Bin
 .../slider-vert-scale-has-marks-below-hover 2 png  | Bin
 ...vert-scale-has-marks-below-insensitive-dark.png | Bin
 ...rt-scale-has-marks-below-insensitive-dark 2 png | Bin
 ...ider-vert-scale-has-marks-below-insensitive.png | Bin
 ...er-vert-scale-has-marks-below-insensitive 2 png | Bin
 .../assets/slider-vert-scale-has-marks-below.png   | Bin
 .../assets/slider-vert-scale-has-marks-below 2 png | Bin
 .../assets/text-select-end-active-dark.png         | Bin
 .../assets/text-select-end-active-dark 2 png       | Bin
 .../assets/text-select-end-active.png              | Bin
 .../assets/text-select-end-active 2 png            | Bin
 .../assets/text-select-end-dark.png                | Bin
 .../assets/text-select-end-dark 2 png              | Bin
 .../assets/text-select-end-hover-dark.png          | Bin
 .../assets/text-select-end-hover-dark 2 png        | Bin
 .../assets/text-select-end-hover.png               | Bin
 .../assets/text-select-end-hover 2 png             | Bin
 .../assets/text-select-end.png                     | Bin
 .../assets/text-select-end 2 png                   | Bin
 .../assets/text-select-start-active-dark.png       | Bin
 .../assets/text-select-start-active-dark 2 png     | Bin
 .../assets/text-select-start-active.png            | Bin
 .../assets/text-select-start-active 2 png          | Bin
 .../assets/text-select-start-dark.png              | Bin
 .../assets/text-select-start-dark 2 png            | Bin
 .../assets/text-select-start-hover-dark.png        | Bin
 .../assets/text-select-start-hover-dark 2 png      | Bin
 .../assets/text-select-start-hover.png             | Bin
 .../assets/text-select-start-hover 2 png           | Bin
 .../assets/text-select-start.png                   | Bin
 .../assets/text-select-start 2 png                 | Bin
 gtk/theme/Default/gtk-dark.css                     |   1 +
 gtk/theme/Default/gtk-hc-dark.css                  |   1 +
 gtk/theme/Default/gtk-hc.css                       |   1 +
 gtk/theme/Default/gtk-light.css                    |   1 +
 gtk/theme/Default/gtk.css                          |   1 +
 gtk/theme/Default/meson.build                      |  26 ++++++++++++
 gtk/theme/Default/render-assets.sh                 |  38 ++++++++++++++++++
 gtk/theme/HighContrast/HighContrast-dark.scss      |  13 ------
 gtk/theme/HighContrast/HighContrast.scss           |  13 ------
 gtk/theme/HighContrast/_colors-hc.scss             |  26 ------------
 gtk/theme/HighContrast/assets.txt                  |  44 ---------------------
 gtk/theme/HighContrast/gtk-dark.css                |   1 -
 gtk/theme/HighContrast/gtk.css                     |   1 -
 gtk/theme/HighContrast/meson.build                 |  29 --------------
 gtk/theme/HighContrast/render-assets.sh            |  34 ----------------
 231 files changed, 189 insertions(+), 307 deletions(-)
---