From 0dcf95b898cbe2bca8b1e83b0c62fde64a8f2b91 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 15 Jan 2021 00:25:30 -0500 Subject: [PATCH 1/6] Reorganize our themes Rename the included theme to Default, with 4 variants: light, dark, hc, hc-dark. This replaces Adwaita, Adwaita:dark, HighContrast and HighContrastInverse. We still make the themes available under these names, and we still set up Adwaita-dark and HighContrastInverse as the dark variants of Adwaita and HighContrast. The unification of the theme variants under Default is not quite perfect; it would be nice to merge the assets/ and assets-hc/ subdirectories and render all assets from a single svg file. --- gtk/gen-gtk-gresources-xml.py | 44 +++++++++--------- 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 +++ .../Default-light.scss} | 1 + gtk/theme/{Adwaita => Default}/README | 14 ++++-- .../{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-hc}/dash-symbolic.svg | 0 .../assets-hc}/dash-symbolic.symbolic.png | Bin .../assets-hc}/dash@2-symbolic.symbolic.png | Bin ...horz-scale-has-marks-above-active-dark.png | Bin ...rz-scale-has-marks-above-active-dark@2.png | Bin ...ider-horz-scale-has-marks-above-active.png | Bin ...er-horz-scale-has-marks-above-active@2.png | Bin ...slider-horz-scale-has-marks-above-dark.png | Bin ...ider-horz-scale-has-marks-above-dark@2.png | Bin ...-horz-scale-has-marks-above-hover-dark.png | Bin ...orz-scale-has-marks-above-hover-dark@2.png | Bin ...lider-horz-scale-has-marks-above-hover.png | Bin ...der-horz-scale-has-marks-above-hover@2.png | Bin ...scale-has-marks-above-insensitive-dark.png | Bin ...ale-has-marks-above-insensitive-dark@2.png | Bin ...horz-scale-has-marks-above-insensitive.png | Bin ...rz-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 ...horz-scale-has-marks-below-active-dark.png | Bin ...rz-scale-has-marks-below-active-dark@2.png | Bin ...ider-horz-scale-has-marks-below-active.png | Bin ...er-horz-scale-has-marks-below-active@2.png | Bin ...slider-horz-scale-has-marks-below-dark.png | Bin ...ider-horz-scale-has-marks-below-dark@2.png | Bin ...-horz-scale-has-marks-below-hover-dark.png | Bin ...orz-scale-has-marks-below-hover-dark@2.png | Bin ...lider-horz-scale-has-marks-below-hover.png | Bin ...der-horz-scale-has-marks-below-hover@2.png | Bin ...scale-has-marks-below-insensitive-dark.png | Bin ...ale-has-marks-below-insensitive-dark@2.png | Bin ...horz-scale-has-marks-below-insensitive.png | Bin ...rz-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 ...vert-scale-has-marks-above-active-dark.png | Bin ...rt-scale-has-marks-above-active-dark@2.png | Bin ...ider-vert-scale-has-marks-above-active.png | Bin ...er-vert-scale-has-marks-above-active@2.png | Bin ...slider-vert-scale-has-marks-above-dark.png | Bin ...ider-vert-scale-has-marks-above-dark@2.png | Bin ...-vert-scale-has-marks-above-hover-dark.png | Bin ...ert-scale-has-marks-above-hover-dark@2.png | Bin ...lider-vert-scale-has-marks-above-hover.png | Bin ...der-vert-scale-has-marks-above-hover@2.png | Bin ...scale-has-marks-above-insensitive-dark.png | Bin ...ale-has-marks-above-insensitive-dark@2.png | Bin ...vert-scale-has-marks-above-insensitive.png | Bin ...rt-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 ...vert-scale-has-marks-below-active-dark.png | Bin ...rt-scale-has-marks-below-active-dark@2.png | Bin ...ider-vert-scale-has-marks-below-active.png | Bin ...er-vert-scale-has-marks-below-active@2.png | Bin ...slider-vert-scale-has-marks-below-dark.png | Bin ...ider-vert-scale-has-marks-below-dark@2.png | Bin ...-vert-scale-has-marks-below-hover-dark.png | Bin ...ert-scale-has-marks-below-hover-dark@2.png | Bin ...lider-vert-scale-has-marks-below-hover.png | Bin ...der-vert-scale-has-marks-below-hover@2.png | Bin ...scale-has-marks-below-insensitive-dark.png | Bin ...ale-has-marks-below-insensitive-dark@2.png | Bin ...vert-scale-has-marks-below-insensitive.png | Bin ...rt-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 .../text-select-end-active-dark.png | Bin .../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 .../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 .../text-select-start-active-dark.png | Bin .../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 .../text-select-start-hover-dark.png | Bin .../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 .../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 ...horz-scale-has-marks-above-active-dark.png | Bin ...rz-scale-has-marks-above-active-dark@2.png | Bin ...ider-horz-scale-has-marks-above-active.png | Bin ...er-horz-scale-has-marks-above-active@2.png | Bin ...slider-horz-scale-has-marks-above-dark.png | Bin ...ider-horz-scale-has-marks-above-dark@2.png | Bin ...-horz-scale-has-marks-above-hover-dark.png | Bin ...orz-scale-has-marks-above-hover-dark@2.png | Bin ...lider-horz-scale-has-marks-above-hover.png | Bin ...der-horz-scale-has-marks-above-hover@2.png | Bin ...scale-has-marks-above-insensitive-dark.png | Bin ...ale-has-marks-above-insensitive-dark@2.png | Bin ...horz-scale-has-marks-above-insensitive.png | Bin ...rz-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 ...horz-scale-has-marks-below-active-dark.png | Bin ...rz-scale-has-marks-below-active-dark@2.png | Bin ...ider-horz-scale-has-marks-below-active.png | Bin ...er-horz-scale-has-marks-below-active@2.png | Bin ...slider-horz-scale-has-marks-below-dark.png | Bin ...ider-horz-scale-has-marks-below-dark@2.png | Bin ...-horz-scale-has-marks-below-hover-dark.png | Bin ...orz-scale-has-marks-below-hover-dark@2.png | Bin ...lider-horz-scale-has-marks-below-hover.png | Bin ...der-horz-scale-has-marks-below-hover@2.png | Bin ...scale-has-marks-below-insensitive-dark.png | Bin ...ale-has-marks-below-insensitive-dark@2.png | Bin ...horz-scale-has-marks-below-insensitive.png | Bin ...rz-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 ...vert-scale-has-marks-above-active-dark.png | Bin ...rt-scale-has-marks-above-active-dark@2.png | Bin ...ider-vert-scale-has-marks-above-active.png | Bin ...er-vert-scale-has-marks-above-active@2.png | Bin ...slider-vert-scale-has-marks-above-dark.png | Bin ...ider-vert-scale-has-marks-above-dark@2.png | Bin ...-vert-scale-has-marks-above-hover-dark.png | Bin ...ert-scale-has-marks-above-hover-dark@2.png | Bin ...lider-vert-scale-has-marks-above-hover.png | Bin ...der-vert-scale-has-marks-above-hover@2.png | Bin ...scale-has-marks-above-insensitive-dark.png | Bin ...ale-has-marks-above-insensitive-dark@2.png | Bin ...vert-scale-has-marks-above-insensitive.png | Bin ...rt-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 ...vert-scale-has-marks-below-active-dark.png | Bin ...rt-scale-has-marks-below-active-dark@2.png | Bin ...ider-vert-scale-has-marks-below-active.png | Bin ...er-vert-scale-has-marks-below-active@2.png | Bin ...slider-vert-scale-has-marks-below-dark.png | Bin ...ider-vert-scale-has-marks-below-dark@2.png | Bin ...-vert-scale-has-marks-below-hover-dark.png | Bin ...ert-scale-has-marks-below-hover-dark@2.png | Bin ...lider-vert-scale-has-marks-below-hover.png | Bin ...der-vert-scale-has-marks-below-hover@2.png | Bin ...scale-has-marks-below-insensitive-dark.png | Bin ...ale-has-marks-below-insensitive-dark@2.png | Bin ...vert-scale-has-marks-below-insensitive.png | Bin ...rt-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/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 .../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 -------------- 227 files changed, 162 insertions(+), 270 deletions(-) delete mode 100644 gtk/theme/Adwaita/gtk-dark.css delete mode 100644 gtk/theme/Adwaita/gtk.css delete mode 100644 gtk/theme/Adwaita/meson.build delete mode 100755 gtk/theme/Adwaita/render-assets.sh create mode 100644 gtk/theme/Default/Default-dark.scss rename gtk/theme/{Adwaita/Adwaita-dark.scss => Default/Default-hc-dark.scss} (83%) create mode 100644 gtk/theme/Default/Default-hc.scss rename gtk/theme/{Adwaita/Adwaita.scss => Default/Default-light.scss} (95%) rename gtk/theme/{Adwaita => Default}/README (77%) rename gtk/theme/{Adwaita => Default}/_colors-public.scss (100%) rename gtk/theme/{Adwaita => Default}/_colors.scss (77%) rename gtk/theme/{Adwaita => Default}/_common.scss (98%) rename gtk/theme/{Adwaita => Default}/_drawing.scss (100%) rename gtk/theme/{HighContrast/assets.svg => Default/assets-hc.svg} (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/bullet-symbolic.svg (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/bullet-symbolic.symbolic.png (100%) rename gtk/theme/{Adwaita/assets => Default/assets-hc}/bullet@2-symbolic.symbolic.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/check-symbolic.svg (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/check-symbolic.symbolic.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/check@2-symbolic.symbolic.png (100%) rename gtk/theme/{Adwaita/assets => Default/assets-hc}/dash-symbolic.svg (100%) rename gtk/theme/{Adwaita/assets => Default/assets-hc}/dash-symbolic.symbolic.png (100%) rename gtk/theme/{Adwaita/assets => Default/assets-hc}/dash@2-symbolic.symbolic.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-horz-scale-has-marks-above-active-dark.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-horz-scale-has-marks-above-active-dark@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-horz-scale-has-marks-above-active.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-horz-scale-has-marks-above-active@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-horz-scale-has-marks-above-dark.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-horz-scale-has-marks-above-dark@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-horz-scale-has-marks-above-hover-dark.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-horz-scale-has-marks-above-hover-dark@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-horz-scale-has-marks-above-hover.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-horz-scale-has-marks-above-hover@2.png (100%) rename gtk/theme/{Adwaita/assets => Default/assets-hc}/slider-horz-scale-has-marks-above-insensitive-dark.png (100%) rename gtk/theme/{Adwaita/assets => Default/assets-hc}/slider-horz-scale-has-marks-above-insensitive-dark@2.png (100%) rename gtk/theme/{Adwaita/assets => Default/assets-hc}/slider-horz-scale-has-marks-above-insensitive.png (100%) rename gtk/theme/{Adwaita/assets => Default/assets-hc}/slider-horz-scale-has-marks-above-insensitive@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-horz-scale-has-marks-above.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-horz-scale-has-marks-above@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-horz-scale-has-marks-below-active-dark.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-horz-scale-has-marks-below-active-dark@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-horz-scale-has-marks-below-active.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-horz-scale-has-marks-below-active@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-horz-scale-has-marks-below-dark.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-horz-scale-has-marks-below-dark@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-horz-scale-has-marks-below-hover-dark.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-horz-scale-has-marks-below-hover-dark@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-horz-scale-has-marks-below-hover.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-horz-scale-has-marks-below-hover@2.png (100%) rename gtk/theme/{Adwaita/assets => Default/assets-hc}/slider-horz-scale-has-marks-below-insensitive-dark.png (100%) rename gtk/theme/{Adwaita/assets => Default/assets-hc}/slider-horz-scale-has-marks-below-insensitive-dark@2.png (100%) rename gtk/theme/{Adwaita/assets => Default/assets-hc}/slider-horz-scale-has-marks-below-insensitive.png (100%) rename gtk/theme/{Adwaita/assets => Default/assets-hc}/slider-horz-scale-has-marks-below-insensitive@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-horz-scale-has-marks-below.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-horz-scale-has-marks-below@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-vert-scale-has-marks-above-active-dark.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-vert-scale-has-marks-above-active-dark@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-vert-scale-has-marks-above-active.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-vert-scale-has-marks-above-active@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-vert-scale-has-marks-above-dark.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-vert-scale-has-marks-above-dark@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-vert-scale-has-marks-above-hover-dark.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-vert-scale-has-marks-above-hover-dark@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-vert-scale-has-marks-above-hover.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-vert-scale-has-marks-above-hover@2.png (100%) rename gtk/theme/{Adwaita/assets => Default/assets-hc}/slider-vert-scale-has-marks-above-insensitive-dark.png (100%) rename gtk/theme/{Adwaita/assets => Default/assets-hc}/slider-vert-scale-has-marks-above-insensitive-dark@2.png (100%) rename gtk/theme/{Adwaita/assets => Default/assets-hc}/slider-vert-scale-has-marks-above-insensitive.png (100%) rename gtk/theme/{Adwaita/assets => Default/assets-hc}/slider-vert-scale-has-marks-above-insensitive@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-vert-scale-has-marks-above.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-vert-scale-has-marks-above@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-vert-scale-has-marks-below-active-dark.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-vert-scale-has-marks-below-active-dark@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-vert-scale-has-marks-below-active.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-vert-scale-has-marks-below-active@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-vert-scale-has-marks-below-dark.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-vert-scale-has-marks-below-dark@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-vert-scale-has-marks-below-hover-dark.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-vert-scale-has-marks-below-hover-dark@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-vert-scale-has-marks-below-hover.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-vert-scale-has-marks-below-hover@2.png (100%) rename gtk/theme/{Adwaita/assets => Default/assets-hc}/slider-vert-scale-has-marks-below-insensitive-dark.png (100%) rename gtk/theme/{Adwaita/assets => Default/assets-hc}/slider-vert-scale-has-marks-below-insensitive-dark@2.png (100%) rename gtk/theme/{Adwaita/assets => Default/assets-hc}/slider-vert-scale-has-marks-below-insensitive.png (100%) rename gtk/theme/{Adwaita/assets => Default/assets-hc}/slider-vert-scale-has-marks-below-insensitive@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-vert-scale-has-marks-below.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/slider-vert-scale-has-marks-below@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/text-select-end-active-dark.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/text-select-end-active-dark@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/text-select-end-active.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/text-select-end-active@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/text-select-end-dark.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/text-select-end-dark@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/text-select-end-hover-dark.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/text-select-end-hover-dark@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/text-select-end-hover.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/text-select-end-hover@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/text-select-end.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/text-select-end@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/text-select-start-active-dark.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/text-select-start-active-dark@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/text-select-start-active.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/text-select-start-active@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/text-select-start-dark.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/text-select-start-dark@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/text-select-start-hover-dark.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/text-select-start-hover-dark@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/text-select-start-hover.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/text-select-start-hover@2.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/text-select-start.png (100%) rename gtk/theme/{HighContrast/assets => Default/assets-hc}/text-select-start@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets.svg (100%) rename gtk/theme/{Adwaita => Default}/assets.txt (100%) rename gtk/theme/{Adwaita => Default}/assets/bullet-symbolic.svg (100%) rename gtk/theme/{Adwaita => Default}/assets/bullet-symbolic.symbolic.png (100%) rename gtk/theme/{HighContrast => Default}/assets/bullet@2-symbolic.symbolic.png (100%) rename gtk/theme/{Adwaita => Default}/assets/check-symbolic.svg (100%) rename gtk/theme/{Adwaita => Default}/assets/check-symbolic.symbolic.png (100%) rename gtk/theme/{Adwaita => Default}/assets/check@2-symbolic.symbolic.png (100%) rename gtk/theme/{HighContrast => Default}/assets/dash-symbolic.svg (100%) rename gtk/theme/{HighContrast => Default}/assets/dash-symbolic.symbolic.png (100%) rename gtk/theme/{HighContrast => Default}/assets/dash@2-symbolic.symbolic.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-horz-scale-has-marks-above-active-dark.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-horz-scale-has-marks-above-active-dark@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-horz-scale-has-marks-above-active.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-horz-scale-has-marks-above-active@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-horz-scale-has-marks-above-dark.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-horz-scale-has-marks-above-dark@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-horz-scale-has-marks-above-hover-dark.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-horz-scale-has-marks-above-hover-dark@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-horz-scale-has-marks-above-hover.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-horz-scale-has-marks-above-hover@2.png (100%) rename gtk/theme/{HighContrast => Default}/assets/slider-horz-scale-has-marks-above-insensitive-dark.png (100%) rename gtk/theme/{HighContrast => Default}/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png (100%) rename gtk/theme/{HighContrast => Default}/assets/slider-horz-scale-has-marks-above-insensitive.png (100%) rename gtk/theme/{HighContrast => Default}/assets/slider-horz-scale-has-marks-above-insensitive@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-horz-scale-has-marks-above.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-horz-scale-has-marks-above@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-horz-scale-has-marks-below-active-dark.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-horz-scale-has-marks-below-active-dark@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-horz-scale-has-marks-below-active.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-horz-scale-has-marks-below-active@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-horz-scale-has-marks-below-dark.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-horz-scale-has-marks-below-dark@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-horz-scale-has-marks-below-hover-dark.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-horz-scale-has-marks-below-hover-dark@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-horz-scale-has-marks-below-hover.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-horz-scale-has-marks-below-hover@2.png (100%) rename gtk/theme/{HighContrast => Default}/assets/slider-horz-scale-has-marks-below-insensitive-dark.png (100%) rename gtk/theme/{HighContrast => Default}/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png (100%) rename gtk/theme/{HighContrast => Default}/assets/slider-horz-scale-has-marks-below-insensitive.png (100%) rename gtk/theme/{HighContrast => Default}/assets/slider-horz-scale-has-marks-below-insensitive@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-horz-scale-has-marks-below.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-horz-scale-has-marks-below@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-vert-scale-has-marks-above-active-dark.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-vert-scale-has-marks-above-active-dark@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-vert-scale-has-marks-above-active.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-vert-scale-has-marks-above-active@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-vert-scale-has-marks-above-dark.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-vert-scale-has-marks-above-dark@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-vert-scale-has-marks-above-hover-dark.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-vert-scale-has-marks-above-hover-dark@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-vert-scale-has-marks-above-hover.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-vert-scale-has-marks-above-hover@2.png (100%) rename gtk/theme/{HighContrast => Default}/assets/slider-vert-scale-has-marks-above-insensitive-dark.png (100%) rename gtk/theme/{HighContrast => Default}/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png (100%) rename gtk/theme/{HighContrast => Default}/assets/slider-vert-scale-has-marks-above-insensitive.png (100%) rename gtk/theme/{HighContrast => Default}/assets/slider-vert-scale-has-marks-above-insensitive@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-vert-scale-has-marks-above.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-vert-scale-has-marks-above@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-vert-scale-has-marks-below-active-dark.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-vert-scale-has-marks-below-active-dark@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-vert-scale-has-marks-below-active.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-vert-scale-has-marks-below-active@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-vert-scale-has-marks-below-dark.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-vert-scale-has-marks-below-dark@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-vert-scale-has-marks-below-hover-dark.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-vert-scale-has-marks-below-hover-dark@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-vert-scale-has-marks-below-hover.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-vert-scale-has-marks-below-hover@2.png (100%) rename gtk/theme/{HighContrast => Default}/assets/slider-vert-scale-has-marks-below-insensitive-dark.png (100%) rename gtk/theme/{HighContrast => Default}/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png (100%) rename gtk/theme/{HighContrast => Default}/assets/slider-vert-scale-has-marks-below-insensitive.png (100%) rename gtk/theme/{HighContrast => Default}/assets/slider-vert-scale-has-marks-below-insensitive@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-vert-scale-has-marks-below.png (100%) rename gtk/theme/{Adwaita => Default}/assets/slider-vert-scale-has-marks-below@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/text-select-end-active-dark.png (100%) rename gtk/theme/{Adwaita => Default}/assets/text-select-end-active-dark@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/text-select-end-active.png (100%) rename gtk/theme/{Adwaita => Default}/assets/text-select-end-active@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/text-select-end-dark.png (100%) rename gtk/theme/{Adwaita => Default}/assets/text-select-end-dark@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/text-select-end-hover-dark.png (100%) rename gtk/theme/{Adwaita => Default}/assets/text-select-end-hover-dark@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/text-select-end-hover.png (100%) rename gtk/theme/{Adwaita => Default}/assets/text-select-end-hover@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/text-select-end.png (100%) rename gtk/theme/{Adwaita => Default}/assets/text-select-end@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/text-select-start-active-dark.png (100%) rename gtk/theme/{Adwaita => Default}/assets/text-select-start-active-dark@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/text-select-start-active.png (100%) rename gtk/theme/{Adwaita => Default}/assets/text-select-start-active@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/text-select-start-dark.png (100%) rename gtk/theme/{Adwaita => Default}/assets/text-select-start-dark@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/text-select-start-hover-dark.png (100%) rename gtk/theme/{Adwaita => Default}/assets/text-select-start-hover-dark@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/text-select-start-hover.png (100%) rename gtk/theme/{Adwaita => Default}/assets/text-select-start-hover@2.png (100%) rename gtk/theme/{Adwaita => Default}/assets/text-select-start.png (100%) rename gtk/theme/{Adwaita => Default}/assets/text-select-start@2.png (100%) create mode 100644 gtk/theme/Default/gtk-dark.css create mode 100644 gtk/theme/Default/gtk-hc-dark.css create mode 100644 gtk/theme/Default/gtk-hc.css create mode 100644 gtk/theme/Default/gtk-light.css create mode 100644 gtk/theme/Default/gtk.css create mode 100644 gtk/theme/Default/meson.build create mode 100755 gtk/theme/Default/render-assets.sh delete mode 100644 gtk/theme/HighContrast/HighContrast-dark.scss delete mode 100644 gtk/theme/HighContrast/HighContrast.scss delete mode 100644 gtk/theme/HighContrast/_colors-hc.scss delete mode 100644 gtk/theme/HighContrast/assets.txt delete mode 100644 gtk/theme/HighContrast/gtk-dark.css delete mode 100644 gtk/theme/HighContrast/gtk.css delete mode 100644 gtk/theme/HighContrast/meson.build delete mode 100755 gtk/theme/HighContrast/render-assets.sh diff --git a/gtk/gen-gtk-gresources-xml.py b/gtk/gen-gtk-gresources-xml.py index 0404bef758..38a928388d 100644 --- a/gtk/gen-gtk-gresources-xml.py +++ b/gtk/gen-gtk-gresources-xml.py @@ -32,36 +32,38 @@ def get_files(subdir,extension): xml += ''' theme/Empty/gtk.css - theme/Adwaita/gtk.css - theme/Adwaita/gtk-dark.css - theme/Adwaita/gtk-dark.css - theme/Adwaita/Adwaita.css - theme/Adwaita/Adwaita-dark.css + theme/Default/gtk.css + theme/Default/gtk-light.css + theme/Default/gtk-dark.css + theme/Default/gtk-hc.css + theme/Default/gtk-hc-dark.css + theme/Default/Default-light.css + theme/Default/Default-dark.css + theme/Default/Default-hc.css + theme/Default/Default-hc-dark.css + theme/Default/gtk.css + theme/Default/gtk-dark.css + theme/Default/gtk-dark.css + theme/Default/gtk-hc.css + theme/Default/gtk-hc-dark.css + theme/Default/gtk-hc-dark.css ''' -for f in get_files('theme/Adwaita/assets', '.png'): - xml += ' theme/Adwaita/assets/{0}\n'.format(f) +for f in get_files('theme/Default/assets', '.png'): + xml += ' theme/Default/assets/{0}\n'.format(f) xml += '\n' -for f in get_files('theme/Adwaita/assets', '.svg'): - xml += ' theme/Adwaita/assets/{0}\n'.format(f) +for f in get_files('theme/Default/assets', '.svg'): + xml += ' theme/Default/assets/{0}\n'.format(f) -xml += ''' - theme/HighContrast/gtk.css - theme/HighContrast/gtk-dark.css - theme/HighContrast/gtk-dark.css - theme/HighContrast/HighContrast.css - theme/HighContrast/HighContrast-dark.css -''' - -for f in get_files('theme/HighContrast/assets', '.png'): - xml += ' theme/HighContrast/assets/{0}\n'.format(f) +for f in get_files('theme/Default/assets-hc', '.png'): + xml += ' theme/Default/assets-hc/{0}\n'.format(f) xml += '\n' -for f in get_files('theme/HighContrast/assets', '.svg'): - xml += ' theme/HighContrast/assets/{0}\n'.format(f) +for f in get_files('theme/Default/assets-hc', '.svg'): + xml += ' theme/Default/assets-hc/{0}\n'.format(f) for f in get_files('ui', '.ui'): xml += ' ui/{0}\n'.format(f) diff --git a/gtk/meson.build b/gtk/meson.build index fe0ec456d9..ed6c97617b 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -848,12 +848,10 @@ endif if sassc.found() sassc_opts = [ '-a', '-M', '-t', 'compact' ] - subdir('theme/Adwaita') - subdir('theme/HighContrast') + subdir('theme/Default') theme_deps = [ - adwaita_theme_deps, - hc_theme_deps, + default_theme_deps, ] else theme_deps = [] diff --git a/gtk/theme/Adwaita/gtk-dark.css b/gtk/theme/Adwaita/gtk-dark.css deleted file mode 100644 index d6711af387..0000000000 --- a/gtk/theme/Adwaita/gtk-dark.css +++ /dev/null @@ -1 +0,0 @@ -@import url("resource:///org/gtk/libgtk/theme/Adwaita/Adwaita-dark.css"); diff --git a/gtk/theme/Adwaita/gtk.css b/gtk/theme/Adwaita/gtk.css deleted file mode 100644 index d99e088ea0..0000000000 --- a/gtk/theme/Adwaita/gtk.css +++ /dev/null @@ -1 +0,0 @@ -@import url("resource:///org/gtk/libgtk/theme/Adwaita/Adwaita.css"); diff --git a/gtk/theme/Adwaita/meson.build b/gtk/theme/Adwaita/meson.build deleted file mode 100644 index c829c9126a..0000000000 --- a/gtk/theme/Adwaita/meson.build +++ /dev/null @@ -1,32 +0,0 @@ -adwaita_scss_files = files([ - '_colors-public.scss', - '_colors.scss', - '_common.scss', - '_drawing.scss', -]) - -adwaita_theme_variants = [ - 'dark', -] - -adwaita_theme_deps = [ - custom_target('Adwaita theme', - input: 'Adwaita.scss', - output: 'Adwaita.css', - command: [ - sassc, sassc_opts, '@INPUT@', '@OUTPUT@', - ], - depend_files: adwaita_scss_files, - ), -] - -foreach variant: adwaita_theme_variants - adwaita_theme_deps += custom_target('Adwaita theme variant: ' + variant, - input: 'Adwaita-@0@.scss'.format(variant), - output: 'Adwaita-@0@.css'.format(variant), - command: [ - sassc, sassc_opts, '@INPUT@', '@OUTPUT@', - ], - depend_files: adwaita_scss_files, - ) -endforeach diff --git a/gtk/theme/Adwaita/render-assets.sh b/gtk/theme/Adwaita/render-assets.sh deleted file mode 100755 index 24d7675afe..0000000000 --- a/gtk/theme/Adwaita/render-assets.sh +++ /dev/null @@ -1,34 +0,0 @@ -#! /bin/bash - -INKSCAPE="/usr/bin/inkscape" -OPTIPNG="/usr/bin/optipng" - -SRC_FILE="assets.svg" -ASSETS_DIR="assets" -INDEX="assets.txt" - -for i in `cat $INDEX` -do -if [ -f $ASSETS_DIR/$i.png ]; then - echo $ASSETS_DIR/$i.png exists. -else - echo - echo Rendering $ASSETS_DIR/$i.png - $INKSCAPE --export-id=$i \ - --export-id-only \ - --export-png=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null #\ - # && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png -fi -if [ -f $ASSETS_DIR/$i@2.png ]; then - echo $ASSETS_DIR/$i@2.png exists. -else - echo - echo Rendering $ASSETS_DIR/$i@2.png - $INKSCAPE --export-id=$i \ - --export-dpi=180 \ - --export-id-only \ - --export-png=$ASSETS_DIR/$i@2.png $SRC_FILE >/dev/null #\ - # && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i@2.png -fi -done -exit 0 diff --git a/gtk/theme/Default/Default-dark.scss b/gtk/theme/Default/Default-dark.scss new file mode 100644 index 0000000000..9207802561 --- /dev/null +++ b/gtk/theme/Default/Default-dark.scss @@ -0,0 +1,7 @@ +$variant: 'dark'; +$contrast: 'normal'; + +@import 'colors'; +@import 'drawing'; +@import 'common'; +@import 'colors-public'; diff --git a/gtk/theme/Adwaita/Adwaita-dark.scss b/gtk/theme/Default/Default-hc-dark.scss similarity index 83% rename from gtk/theme/Adwaita/Adwaita-dark.scss rename to gtk/theme/Default/Default-hc-dark.scss index 6e5753957b..3a7bbeaabc 100644 --- a/gtk/theme/Adwaita/Adwaita-dark.scss +++ b/gtk/theme/Default/Default-hc-dark.scss @@ -1,6 +1,7 @@ $variant: 'dark'; +$contrast: 'high'; @import 'colors'; +@import 'colors-public'; @import 'drawing'; @import 'common'; -@import 'colors-public'; diff --git a/gtk/theme/Default/Default-hc.scss b/gtk/theme/Default/Default-hc.scss new file mode 100644 index 0000000000..85293a945e --- /dev/null +++ b/gtk/theme/Default/Default-hc.scss @@ -0,0 +1,7 @@ +$variant: 'light'; +$contrast: 'high'; + +@import 'colors'; +@import 'colors-public'; +@import 'drawing'; +@import 'common'; diff --git a/gtk/theme/Adwaita/Adwaita.scss b/gtk/theme/Default/Default-light.scss similarity index 95% rename from gtk/theme/Adwaita/Adwaita.scss rename to gtk/theme/Default/Default-light.scss index ee5e202856..d11373beca 100644 --- a/gtk/theme/Adwaita/Adwaita.scss +++ b/gtk/theme/Default/Default-light.scss @@ -5,6 +5,7 @@ // - if you need to inverse a color function use the @if directive to match for dark $variant $variant: 'light'; +$contrast: 'normal'; @import 'colors'; @import 'drawing'; diff --git a/gtk/theme/Adwaita/README b/gtk/theme/Default/README similarity index 77% rename from gtk/theme/Adwaita/README rename to gtk/theme/Default/README index 0588bcf5e3..f2132f7fb7 100644 --- a/gtk/theme/Adwaita/README +++ b/gtk/theme/Default/README @@ -6,10 +6,18 @@ Summary * Note that meson always builds out-of-tree, so the modified css files will appear in your builddir. +Theme variants +-------------- + +The Default theme comes in 4 variants: light, dark, hc (highcontrast) and +hc-dark (highcontrast inverse). The generated CSS files for the variants +are called Default-$variant.css. For technical reasons, GTK adds one level +of include wrappers around these, which are called gtk-$variant.css. + How to tweak the theme ---------------------- -Adwaita is a complex theme, so to keep it maintainable it's written and +Default is a complex theme, so to keep it maintainable it's written and processed in SASS. The generated CSS is then transformed into a gresource file during gtk build and used at runtime in a non-legible or editable form. @@ -28,10 +36,10 @@ _colors-public.scss - SCSS colors exported through gtk to allow for 3rd party _drawing.scss - drawing helper mixings/functions to allow easier definition of widget drawing under specific context. This - is why Adwaita isn't 15000 LOC. + is why Default isn't 15000 LOC. _common.scss - actual definitions of style for each widget. This is where you are likely to add/remove your changes. - + You can read about SASS at http://sass-lang.com/documentation/. Once you make your changes to the _common.scss file, GTK will rebuild the CSS files. diff --git a/gtk/theme/Adwaita/_colors-public.scss b/gtk/theme/Default/_colors-public.scss similarity index 100% rename from gtk/theme/Adwaita/_colors-public.scss rename to gtk/theme/Default/_colors-public.scss diff --git a/gtk/theme/Adwaita/_colors.scss b/gtk/theme/Default/_colors.scss similarity index 77% rename from gtk/theme/Adwaita/_colors.scss rename to gtk/theme/Default/_colors.scss index 825b13125b..03e812447f 100644 --- a/gtk/theme/Adwaita/_colors.scss +++ b/gtk/theme/Default/_colors.scss @@ -72,3 +72,30 @@ $switch_borders_color: if($variant == 'light',darken($switch_bg_color,15%),darke $focus_border_color: if($variant == 'light', transparentize($selected_bg_color, 0.5), transparentize($selected_bg_color, 0.3)); $alt_focus_border_color: if($variant == 'light', transparentize(white, 0.2), transparentize(white,0.7)); $dim_label_opacity: 0.55; + +// High Contrast color overrides +@if $contrast == 'high' { + + $fg_color: if($variant == 'light', darken($fg_color, 3%), lighten($fg_color, 2%)); + $bg_color: if($variant == 'light', lighten($bg_color, 3%), darken($bg_color, 2%)); + $selected_bg_color: darken($selected_bg_color,10%); + $selected_borders_color: darken($selected_borders_color, 10%); + $borders_color: if($variant == 'light', darken($borders_color, 30%), lighten($borders_color, 30%)); + $alt_borders_color: if($variant == 'light', darken($alt_borders_color, 33%), lighten($alt_borders_color, 28%)); + $menu_color: $base_color; + $menu_selected_color: darken($bg_color,10%); + + //insensitive state derived colors + $insensitive_fg_color: mix($fg_color, $bg_color, 50%); + $insensitive_bg_color: mix($bg_color, $base_color, 60%); + $insensitive_borders_color: mix($borders_color, $bg_color, 80%); + + //focus rings + $focus_border_color: if($variant == 'light', transparentize($selected_bg_color, 0.2), transparentize(white, 0.4)); + $alt_focus_border_color: if($variant == 'light', white, transparentize(white,0.4)); + + $dim_label_opacity: 0.9; + + $switch_borders_color: if($variant == 'light',darken($switch_bg_color,15%),lighten($switch_bg_color,15%)); + +} diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Default/_common.scss similarity index 98% rename from gtk/theme/Adwaita/_common.scss rename to gtk/theme/Default/_common.scss index c5baa58518..db7d6730b9 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Default/_common.scss @@ -4,6 +4,7 @@ $ease-out-quad: cubic-bezier(0.25, 0.46, 0.45, 0.94); $asset_suffix: if($variant=='dark', '-dark', ''); +$assets: if($contrast=='normal', 'assets', 'assets-hc'); $backdrop_transition: 200ms ease-out; $button_transition: all 200ms $ease-out-quad; $focus_transition: outline-width 200ms $ease-out-quad, outline-offset 200ms $ease-out-quad; @@ -2524,11 +2525,11 @@ check { border-radius: 3px; -gtk-icon-size: 14px; - &:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/check-symbolic.symbolic.png")), - -gtk-recolor(url("assets/check@2-symbolic.symbolic.png"))); } + &:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("#{$assets}/check-symbolic.symbolic.png")), + -gtk-recolor(url("#{$assets}/check@2-symbolic.symbolic.png"))); } - &:indeterminate { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/dash-symbolic.symbolic.png")), - -gtk-recolor(url("assets/dash@2-symbolic.symbolic.png"))); } + &:indeterminate { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("#{$assets}/dash-symbolic.symbolic.png")), + -gtk-recolor(url("#{$assets}/dash@2-symbolic.symbolic.png"))); } } %radio, @@ -2536,11 +2537,11 @@ radio { border-radius: 100%; -gtk-icon-size: 14px; - &:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/bullet-symbolic.symbolic.png")), - -gtk-recolor(url("assets/bullet@2-symbolic.symbolic.png"))); } + &:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("#{$assets}/bullet-symbolic.symbolic.png")), + -gtk-recolor(url("#{$assets}/bullet@2-symbolic.symbolic.png"))); } - &:indeterminate { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("assets/dash-symbolic.symbolic.png")), - -gtk-recolor(url("assets/dash@2-symbolic.symbolic.png"))); } + &:indeterminate { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("#{$assets}/dash-symbolic.symbolic.png")), + -gtk-recolor(url("#{$assets}/dash@2-symbolic.symbolic.png"))); } } treeview.view check, @@ -2804,7 +2805,7 @@ scale { // an asymmetric slider asset is used here, so the margins are uneven, the smaller // margin is set on the point side. margin: -10px; - $_scale_asset: 'assets/slider-#{$dir_infix}-#{$marks_infix}#{$state_infix}#{$suffix}'; + $_scale_asset: '#{$assets}/slider-#{$dir_infix}-#{$marks_infix}#{$state_infix}#{$suffix}'; border-style: none; border-radius: 0; @@ -4150,19 +4151,19 @@ cursor-handle { (':hover','-hover'), (':active','-active') { //no need for insensitive and backdrop &.top#{$s}:dir(ltr), &.bottom#{$s}:dir(rtl) { - $_url: 'assets/text-select-start#{$as}#{$asset_suffix}'; + $_url: '#{$assets}/text-select-start#{$as}#{$asset_suffix}'; -gtk-icon-source: -gtk-scaled(url('#{$_url}.png'), url('#{$_url}@2.png')); } &.bottom#{$s}:dir(ltr), &.top#{$s}:dir(rtl) { - $_url: 'assets/text-select-end#{$as}#{$asset_suffix}'; + $_url: '#{$assets}/text-select-end#{$as}#{$asset_suffix}'; -gtk-icon-source: -gtk-scaled(url('#{$_url}.png'), url('#{$_url}@2.png')); } &.insertion-cursor#{$s}:dir(ltr), &.insertion-cursor#{$s}:dir(rtl) { - $_url: 'assets/slider-horz-scale-has-marks-above#{$as}#{$asset_suffix}'; + $_url: '#{$assets}/slider-horz-scale-has-marks-above#{$as}#{$asset_suffix}'; -gtk-icon-source: -gtk-scaled(url('#{$_url}.png'), url('#{$_url}@2.png')); } diff --git a/gtk/theme/Adwaita/_drawing.scss b/gtk/theme/Default/_drawing.scss similarity index 100% rename from gtk/theme/Adwaita/_drawing.scss rename to gtk/theme/Default/_drawing.scss diff --git a/gtk/theme/HighContrast/assets.svg b/gtk/theme/Default/assets-hc.svg similarity index 100% rename from gtk/theme/HighContrast/assets.svg rename to gtk/theme/Default/assets-hc.svg diff --git a/gtk/theme/HighContrast/assets/bullet-symbolic.svg b/gtk/theme/Default/assets-hc/bullet-symbolic.svg similarity index 100% rename from gtk/theme/HighContrast/assets/bullet-symbolic.svg rename to gtk/theme/Default/assets-hc/bullet-symbolic.svg diff --git a/gtk/theme/HighContrast/assets/bullet-symbolic.symbolic.png b/gtk/theme/Default/assets-hc/bullet-symbolic.symbolic.png similarity index 100% rename from gtk/theme/HighContrast/assets/bullet-symbolic.symbolic.png rename to gtk/theme/Default/assets-hc/bullet-symbolic.symbolic.png diff --git a/gtk/theme/Adwaita/assets/bullet@2-symbolic.symbolic.png b/gtk/theme/Default/assets-hc/bullet@2-symbolic.symbolic.png similarity index 100% rename from gtk/theme/Adwaita/assets/bullet@2-symbolic.symbolic.png rename to gtk/theme/Default/assets-hc/bullet@2-symbolic.symbolic.png diff --git a/gtk/theme/HighContrast/assets/check-symbolic.svg b/gtk/theme/Default/assets-hc/check-symbolic.svg similarity index 100% rename from gtk/theme/HighContrast/assets/check-symbolic.svg rename to gtk/theme/Default/assets-hc/check-symbolic.svg diff --git a/gtk/theme/HighContrast/assets/check-symbolic.symbolic.png b/gtk/theme/Default/assets-hc/check-symbolic.symbolic.png similarity index 100% rename from gtk/theme/HighContrast/assets/check-symbolic.symbolic.png rename to gtk/theme/Default/assets-hc/check-symbolic.symbolic.png diff --git a/gtk/theme/HighContrast/assets/check@2-symbolic.symbolic.png b/gtk/theme/Default/assets-hc/check@2-symbolic.symbolic.png similarity index 100% rename from gtk/theme/HighContrast/assets/check@2-symbolic.symbolic.png rename to gtk/theme/Default/assets-hc/check@2-symbolic.symbolic.png diff --git a/gtk/theme/Adwaita/assets/dash-symbolic.svg b/gtk/theme/Default/assets-hc/dash-symbolic.svg similarity index 100% rename from gtk/theme/Adwaita/assets/dash-symbolic.svg rename to gtk/theme/Default/assets-hc/dash-symbolic.svg diff --git a/gtk/theme/Adwaita/assets/dash-symbolic.symbolic.png b/gtk/theme/Default/assets-hc/dash-symbolic.symbolic.png similarity index 100% rename from gtk/theme/Adwaita/assets/dash-symbolic.symbolic.png rename to gtk/theme/Default/assets-hc/dash-symbolic.symbolic.png diff --git a/gtk/theme/Adwaita/assets/dash@2-symbolic.symbolic.png b/gtk/theme/Default/assets-hc/dash@2-symbolic.symbolic.png similarity index 100% rename from gtk/theme/Adwaita/assets/dash@2-symbolic.symbolic.png rename to gtk/theme/Default/assets-hc/dash@2-symbolic.symbolic.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-active-dark.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-active-dark.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-active-dark.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-active-dark.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-active-dark@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-active-dark@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-active-dark@2.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-active-dark@2.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-active.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-active.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-active.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-active.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-active@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-active@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-active@2.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-active@2.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-dark.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-dark.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-dark.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-dark.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-dark@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-dark@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-dark@2.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-dark@2.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-hover-dark.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-hover-dark.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-hover-dark.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-hover-dark.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-hover-dark@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-hover-dark@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-hover-dark@2.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-hover-dark@2.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-hover.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-hover.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-hover.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-hover.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-hover@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-hover@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-hover@2.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-hover@2.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive-dark.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-insensitive-dark.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive-dark.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-insensitive-dark.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-insensitive-dark@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-insensitive-dark@2.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-insensitive.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-insensitive.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-insensitive@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-insensitive@2.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above-insensitive@2.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above@2.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-above@2.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-active-dark.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-active-dark.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-active-dark.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-active-dark.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-active-dark@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-active-dark@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-active-dark@2.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-active-dark@2.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-active.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-active.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-active.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-active.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-active@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-active@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-active@2.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-active@2.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-dark.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-dark.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-dark.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-dark.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-dark@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-dark@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-dark@2.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-dark@2.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-hover-dark.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-hover-dark.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-hover-dark.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-hover-dark.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-hover-dark@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-hover-dark@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-hover-dark@2.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-hover-dark@2.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-hover.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-hover.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-hover.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-hover.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-hover@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-hover@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-hover@2.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-hover@2.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive-dark.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-insensitive-dark.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive-dark.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-insensitive-dark.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-insensitive-dark@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-insensitive-dark@2.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-insensitive.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-insensitive.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-insensitive@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-insensitive@2.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below-insensitive@2.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below@2.png b/gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below@2.png rename to gtk/theme/Default/assets-hc/slider-horz-scale-has-marks-below@2.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-active-dark.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-active-dark.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-active-dark.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-active-dark.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-active-dark@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-active-dark@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-active-dark@2.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-active-dark@2.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-active.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-active.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-active.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-active.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-active@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-active@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-active@2.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-active@2.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-dark.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-dark.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-dark.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-dark.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-dark@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-dark@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-dark@2.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-dark@2.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-hover-dark.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-hover-dark.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-hover-dark.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-hover-dark.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-hover-dark@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-hover-dark@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-hover-dark@2.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-hover-dark@2.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-hover.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-hover.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-hover.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-hover.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-hover@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-hover@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-hover@2.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-hover@2.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive-dark.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-insensitive-dark.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive-dark.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-insensitive-dark.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-insensitive-dark@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-insensitive-dark@2.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-insensitive.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-insensitive.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-insensitive@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-insensitive@2.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above-insensitive@2.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above@2.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-above@2.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-active-dark.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-active-dark.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-active-dark.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-active-dark.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-active-dark@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-active-dark@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-active-dark@2.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-active-dark@2.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-active.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-active.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-active.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-active.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-active@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-active@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-active@2.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-active@2.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-dark.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-dark.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-dark.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-dark.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-dark@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-dark@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-dark@2.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-dark@2.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-hover-dark.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-hover-dark.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-hover-dark.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-hover-dark.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-hover-dark@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-hover-dark@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-hover-dark@2.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-hover-dark@2.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-hover.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-hover.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-hover.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-hover.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-hover@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-hover@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-hover@2.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-hover@2.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive-dark.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-insensitive-dark.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive-dark.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-insensitive-dark.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-insensitive-dark@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-insensitive-dark@2.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-insensitive.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-insensitive.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-insensitive@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-insensitive@2.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below-insensitive@2.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below@2.png b/gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below@2.png rename to gtk/theme/Default/assets-hc/slider-vert-scale-has-marks-below@2.png diff --git a/gtk/theme/HighContrast/assets/text-select-end-active-dark.png b/gtk/theme/Default/assets-hc/text-select-end-active-dark.png similarity index 100% rename from gtk/theme/HighContrast/assets/text-select-end-active-dark.png rename to gtk/theme/Default/assets-hc/text-select-end-active-dark.png diff --git a/gtk/theme/HighContrast/assets/text-select-end-active-dark@2.png b/gtk/theme/Default/assets-hc/text-select-end-active-dark@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/text-select-end-active-dark@2.png rename to gtk/theme/Default/assets-hc/text-select-end-active-dark@2.png diff --git a/gtk/theme/HighContrast/assets/text-select-end-active.png b/gtk/theme/Default/assets-hc/text-select-end-active.png similarity index 100% rename from gtk/theme/HighContrast/assets/text-select-end-active.png rename to gtk/theme/Default/assets-hc/text-select-end-active.png diff --git a/gtk/theme/HighContrast/assets/text-select-end-active@2.png b/gtk/theme/Default/assets-hc/text-select-end-active@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/text-select-end-active@2.png rename to gtk/theme/Default/assets-hc/text-select-end-active@2.png diff --git a/gtk/theme/HighContrast/assets/text-select-end-dark.png b/gtk/theme/Default/assets-hc/text-select-end-dark.png similarity index 100% rename from gtk/theme/HighContrast/assets/text-select-end-dark.png rename to gtk/theme/Default/assets-hc/text-select-end-dark.png diff --git a/gtk/theme/HighContrast/assets/text-select-end-dark@2.png b/gtk/theme/Default/assets-hc/text-select-end-dark@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/text-select-end-dark@2.png rename to gtk/theme/Default/assets-hc/text-select-end-dark@2.png diff --git a/gtk/theme/HighContrast/assets/text-select-end-hover-dark.png b/gtk/theme/Default/assets-hc/text-select-end-hover-dark.png similarity index 100% rename from gtk/theme/HighContrast/assets/text-select-end-hover-dark.png rename to gtk/theme/Default/assets-hc/text-select-end-hover-dark.png diff --git a/gtk/theme/HighContrast/assets/text-select-end-hover-dark@2.png b/gtk/theme/Default/assets-hc/text-select-end-hover-dark@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/text-select-end-hover-dark@2.png rename to gtk/theme/Default/assets-hc/text-select-end-hover-dark@2.png diff --git a/gtk/theme/HighContrast/assets/text-select-end-hover.png b/gtk/theme/Default/assets-hc/text-select-end-hover.png similarity index 100% rename from gtk/theme/HighContrast/assets/text-select-end-hover.png rename to gtk/theme/Default/assets-hc/text-select-end-hover.png diff --git a/gtk/theme/HighContrast/assets/text-select-end-hover@2.png b/gtk/theme/Default/assets-hc/text-select-end-hover@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/text-select-end-hover@2.png rename to gtk/theme/Default/assets-hc/text-select-end-hover@2.png diff --git a/gtk/theme/HighContrast/assets/text-select-end.png b/gtk/theme/Default/assets-hc/text-select-end.png similarity index 100% rename from gtk/theme/HighContrast/assets/text-select-end.png rename to gtk/theme/Default/assets-hc/text-select-end.png diff --git a/gtk/theme/HighContrast/assets/text-select-end@2.png b/gtk/theme/Default/assets-hc/text-select-end@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/text-select-end@2.png rename to gtk/theme/Default/assets-hc/text-select-end@2.png diff --git a/gtk/theme/HighContrast/assets/text-select-start-active-dark.png b/gtk/theme/Default/assets-hc/text-select-start-active-dark.png similarity index 100% rename from gtk/theme/HighContrast/assets/text-select-start-active-dark.png rename to gtk/theme/Default/assets-hc/text-select-start-active-dark.png diff --git a/gtk/theme/HighContrast/assets/text-select-start-active-dark@2.png b/gtk/theme/Default/assets-hc/text-select-start-active-dark@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/text-select-start-active-dark@2.png rename to gtk/theme/Default/assets-hc/text-select-start-active-dark@2.png diff --git a/gtk/theme/HighContrast/assets/text-select-start-active.png b/gtk/theme/Default/assets-hc/text-select-start-active.png similarity index 100% rename from gtk/theme/HighContrast/assets/text-select-start-active.png rename to gtk/theme/Default/assets-hc/text-select-start-active.png diff --git a/gtk/theme/HighContrast/assets/text-select-start-active@2.png b/gtk/theme/Default/assets-hc/text-select-start-active@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/text-select-start-active@2.png rename to gtk/theme/Default/assets-hc/text-select-start-active@2.png diff --git a/gtk/theme/HighContrast/assets/text-select-start-dark.png b/gtk/theme/Default/assets-hc/text-select-start-dark.png similarity index 100% rename from gtk/theme/HighContrast/assets/text-select-start-dark.png rename to gtk/theme/Default/assets-hc/text-select-start-dark.png diff --git a/gtk/theme/HighContrast/assets/text-select-start-dark@2.png b/gtk/theme/Default/assets-hc/text-select-start-dark@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/text-select-start-dark@2.png rename to gtk/theme/Default/assets-hc/text-select-start-dark@2.png diff --git a/gtk/theme/HighContrast/assets/text-select-start-hover-dark.png b/gtk/theme/Default/assets-hc/text-select-start-hover-dark.png similarity index 100% rename from gtk/theme/HighContrast/assets/text-select-start-hover-dark.png rename to gtk/theme/Default/assets-hc/text-select-start-hover-dark.png diff --git a/gtk/theme/HighContrast/assets/text-select-start-hover-dark@2.png b/gtk/theme/Default/assets-hc/text-select-start-hover-dark@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/text-select-start-hover-dark@2.png rename to gtk/theme/Default/assets-hc/text-select-start-hover-dark@2.png diff --git a/gtk/theme/HighContrast/assets/text-select-start-hover.png b/gtk/theme/Default/assets-hc/text-select-start-hover.png similarity index 100% rename from gtk/theme/HighContrast/assets/text-select-start-hover.png rename to gtk/theme/Default/assets-hc/text-select-start-hover.png diff --git a/gtk/theme/HighContrast/assets/text-select-start-hover@2.png b/gtk/theme/Default/assets-hc/text-select-start-hover@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/text-select-start-hover@2.png rename to gtk/theme/Default/assets-hc/text-select-start-hover@2.png diff --git a/gtk/theme/HighContrast/assets/text-select-start.png b/gtk/theme/Default/assets-hc/text-select-start.png similarity index 100% rename from gtk/theme/HighContrast/assets/text-select-start.png rename to gtk/theme/Default/assets-hc/text-select-start.png diff --git a/gtk/theme/HighContrast/assets/text-select-start@2.png b/gtk/theme/Default/assets-hc/text-select-start@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/text-select-start@2.png rename to gtk/theme/Default/assets-hc/text-select-start@2.png diff --git a/gtk/theme/Adwaita/assets.svg b/gtk/theme/Default/assets.svg similarity index 100% rename from gtk/theme/Adwaita/assets.svg rename to gtk/theme/Default/assets.svg diff --git a/gtk/theme/Adwaita/assets.txt b/gtk/theme/Default/assets.txt similarity index 100% rename from gtk/theme/Adwaita/assets.txt rename to gtk/theme/Default/assets.txt diff --git a/gtk/theme/Adwaita/assets/bullet-symbolic.svg b/gtk/theme/Default/assets/bullet-symbolic.svg similarity index 100% rename from gtk/theme/Adwaita/assets/bullet-symbolic.svg rename to gtk/theme/Default/assets/bullet-symbolic.svg diff --git a/gtk/theme/Adwaita/assets/bullet-symbolic.symbolic.png b/gtk/theme/Default/assets/bullet-symbolic.symbolic.png similarity index 100% rename from gtk/theme/Adwaita/assets/bullet-symbolic.symbolic.png rename to gtk/theme/Default/assets/bullet-symbolic.symbolic.png diff --git a/gtk/theme/HighContrast/assets/bullet@2-symbolic.symbolic.png b/gtk/theme/Default/assets/bullet@2-symbolic.symbolic.png similarity index 100% rename from gtk/theme/HighContrast/assets/bullet@2-symbolic.symbolic.png rename to gtk/theme/Default/assets/bullet@2-symbolic.symbolic.png diff --git a/gtk/theme/Adwaita/assets/check-symbolic.svg b/gtk/theme/Default/assets/check-symbolic.svg similarity index 100% rename from gtk/theme/Adwaita/assets/check-symbolic.svg rename to gtk/theme/Default/assets/check-symbolic.svg diff --git a/gtk/theme/Adwaita/assets/check-symbolic.symbolic.png b/gtk/theme/Default/assets/check-symbolic.symbolic.png similarity index 100% rename from gtk/theme/Adwaita/assets/check-symbolic.symbolic.png rename to gtk/theme/Default/assets/check-symbolic.symbolic.png diff --git a/gtk/theme/Adwaita/assets/check@2-symbolic.symbolic.png b/gtk/theme/Default/assets/check@2-symbolic.symbolic.png similarity index 100% rename from gtk/theme/Adwaita/assets/check@2-symbolic.symbolic.png rename to gtk/theme/Default/assets/check@2-symbolic.symbolic.png diff --git a/gtk/theme/HighContrast/assets/dash-symbolic.svg b/gtk/theme/Default/assets/dash-symbolic.svg similarity index 100% rename from gtk/theme/HighContrast/assets/dash-symbolic.svg rename to gtk/theme/Default/assets/dash-symbolic.svg diff --git a/gtk/theme/HighContrast/assets/dash-symbolic.symbolic.png b/gtk/theme/Default/assets/dash-symbolic.symbolic.png similarity index 100% rename from gtk/theme/HighContrast/assets/dash-symbolic.symbolic.png rename to gtk/theme/Default/assets/dash-symbolic.symbolic.png diff --git a/gtk/theme/HighContrast/assets/dash@2-symbolic.symbolic.png b/gtk/theme/Default/assets/dash@2-symbolic.symbolic.png similarity index 100% rename from gtk/theme/HighContrast/assets/dash@2-symbolic.symbolic.png rename to gtk/theme/Default/assets/dash@2-symbolic.symbolic.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active-dark.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-active-dark.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active-dark.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-above-active-dark.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active-dark@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-active-dark@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active-dark@2.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-above-active-dark@2.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-active.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-above-active.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-active@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-active@2.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-above-active@2.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-dark.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-dark.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-dark.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-above-dark.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-dark@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-dark@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-dark@2.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-above-dark@2.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover-dark.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-hover-dark.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover-dark.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-above-hover-dark.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover-dark@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-hover-dark@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover-dark@2.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-above-hover-dark@2.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-hover.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-above-hover.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-hover@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above-hover@2.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-above-hover@2.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-insensitive-dark.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-insensitive-dark.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-insensitive-dark.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-above-insensitive-dark.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-above-insensitive-dark@2.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-insensitive.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-insensitive.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-insensitive.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-above-insensitive.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-insensitive@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above-insensitive@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-above-insensitive@2.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-above-insensitive@2.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-above.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-above@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-above@2.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-above@2.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active-dark.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-active-dark.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active-dark.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-below-active-dark.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active-dark@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-active-dark@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active-dark@2.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-below-active-dark@2.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-active.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-below-active.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-active@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-active@2.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-below-active@2.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-dark.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-dark.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-dark.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-below-dark.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-dark@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-dark@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-dark@2.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-below-dark@2.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover-dark.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-hover-dark.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover-dark.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-below-hover-dark.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover-dark@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-hover-dark@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover-dark@2.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-below-hover-dark@2.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-hover.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-below-hover.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-hover@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below-hover@2.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-below-hover@2.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-insensitive-dark.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-insensitive-dark.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-insensitive-dark.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-below-insensitive-dark.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-below-insensitive-dark@2.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-insensitive.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-insensitive.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-insensitive.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-below-insensitive.png diff --git a/gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-insensitive@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below-insensitive@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-horz-scale-has-marks-below-insensitive@2.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-below-insensitive@2.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-below.png diff --git a/gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below@2.png b/gtk/theme/Default/assets/slider-horz-scale-has-marks-below@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-horz-scale-has-marks-below@2.png rename to gtk/theme/Default/assets/slider-horz-scale-has-marks-below@2.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active-dark.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-active-dark.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active-dark.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-above-active-dark.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active-dark@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-active-dark@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active-dark@2.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-above-active-dark@2.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-active.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-above-active.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-active@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-active@2.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-above-active@2.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-dark.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-dark.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-dark.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-above-dark.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-dark@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-dark@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-dark@2.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-above-dark@2.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover-dark.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-hover-dark.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover-dark.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-above-hover-dark.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover-dark@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-hover-dark@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover-dark@2.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-above-hover-dark@2.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-hover.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-above-hover.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-hover@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above-hover@2.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-above-hover@2.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-insensitive-dark.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-insensitive-dark.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-insensitive-dark.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-above-insensitive-dark.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-above-insensitive-dark@2.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-insensitive.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-insensitive.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-insensitive.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-above-insensitive.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-insensitive@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above-insensitive@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-above-insensitive@2.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-above-insensitive@2.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-above.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-above@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-above@2.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-above@2.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active-dark.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-active-dark.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active-dark.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-below-active-dark.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active-dark@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-active-dark@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active-dark@2.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-below-active-dark@2.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-active.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-below-active.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-active@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-active@2.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-below-active@2.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-dark.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-dark.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-dark.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-below-dark.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-dark@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-dark@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-dark@2.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-below-dark@2.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover-dark.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-hover-dark.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover-dark.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-below-hover-dark.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover-dark@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-hover-dark@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover-dark@2.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-below-hover-dark@2.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-hover.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-below-hover.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-hover@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below-hover@2.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-below-hover@2.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-insensitive-dark.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-insensitive-dark.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-insensitive-dark.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-below-insensitive-dark.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-below-insensitive-dark@2.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-insensitive.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-insensitive.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-insensitive.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-below-insensitive.png diff --git a/gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-insensitive@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below-insensitive@2.png similarity index 100% rename from gtk/theme/HighContrast/assets/slider-vert-scale-has-marks-below-insensitive@2.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-below-insensitive@2.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-below.png diff --git a/gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below@2.png b/gtk/theme/Default/assets/slider-vert-scale-has-marks-below@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/slider-vert-scale-has-marks-below@2.png rename to gtk/theme/Default/assets/slider-vert-scale-has-marks-below@2.png diff --git a/gtk/theme/Adwaita/assets/text-select-end-active-dark.png b/gtk/theme/Default/assets/text-select-end-active-dark.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-end-active-dark.png rename to gtk/theme/Default/assets/text-select-end-active-dark.png diff --git a/gtk/theme/Adwaita/assets/text-select-end-active-dark@2.png b/gtk/theme/Default/assets/text-select-end-active-dark@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-end-active-dark@2.png rename to gtk/theme/Default/assets/text-select-end-active-dark@2.png diff --git a/gtk/theme/Adwaita/assets/text-select-end-active.png b/gtk/theme/Default/assets/text-select-end-active.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-end-active.png rename to gtk/theme/Default/assets/text-select-end-active.png diff --git a/gtk/theme/Adwaita/assets/text-select-end-active@2.png b/gtk/theme/Default/assets/text-select-end-active@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-end-active@2.png rename to gtk/theme/Default/assets/text-select-end-active@2.png diff --git a/gtk/theme/Adwaita/assets/text-select-end-dark.png b/gtk/theme/Default/assets/text-select-end-dark.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-end-dark.png rename to gtk/theme/Default/assets/text-select-end-dark.png diff --git a/gtk/theme/Adwaita/assets/text-select-end-dark@2.png b/gtk/theme/Default/assets/text-select-end-dark@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-end-dark@2.png rename to gtk/theme/Default/assets/text-select-end-dark@2.png diff --git a/gtk/theme/Adwaita/assets/text-select-end-hover-dark.png b/gtk/theme/Default/assets/text-select-end-hover-dark.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-end-hover-dark.png rename to gtk/theme/Default/assets/text-select-end-hover-dark.png diff --git a/gtk/theme/Adwaita/assets/text-select-end-hover-dark@2.png b/gtk/theme/Default/assets/text-select-end-hover-dark@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-end-hover-dark@2.png rename to gtk/theme/Default/assets/text-select-end-hover-dark@2.png diff --git a/gtk/theme/Adwaita/assets/text-select-end-hover.png b/gtk/theme/Default/assets/text-select-end-hover.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-end-hover.png rename to gtk/theme/Default/assets/text-select-end-hover.png diff --git a/gtk/theme/Adwaita/assets/text-select-end-hover@2.png b/gtk/theme/Default/assets/text-select-end-hover@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-end-hover@2.png rename to gtk/theme/Default/assets/text-select-end-hover@2.png diff --git a/gtk/theme/Adwaita/assets/text-select-end.png b/gtk/theme/Default/assets/text-select-end.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-end.png rename to gtk/theme/Default/assets/text-select-end.png diff --git a/gtk/theme/Adwaita/assets/text-select-end@2.png b/gtk/theme/Default/assets/text-select-end@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-end@2.png rename to gtk/theme/Default/assets/text-select-end@2.png diff --git a/gtk/theme/Adwaita/assets/text-select-start-active-dark.png b/gtk/theme/Default/assets/text-select-start-active-dark.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-start-active-dark.png rename to gtk/theme/Default/assets/text-select-start-active-dark.png diff --git a/gtk/theme/Adwaita/assets/text-select-start-active-dark@2.png b/gtk/theme/Default/assets/text-select-start-active-dark@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-start-active-dark@2.png rename to gtk/theme/Default/assets/text-select-start-active-dark@2.png diff --git a/gtk/theme/Adwaita/assets/text-select-start-active.png b/gtk/theme/Default/assets/text-select-start-active.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-start-active.png rename to gtk/theme/Default/assets/text-select-start-active.png diff --git a/gtk/theme/Adwaita/assets/text-select-start-active@2.png b/gtk/theme/Default/assets/text-select-start-active@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-start-active@2.png rename to gtk/theme/Default/assets/text-select-start-active@2.png diff --git a/gtk/theme/Adwaita/assets/text-select-start-dark.png b/gtk/theme/Default/assets/text-select-start-dark.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-start-dark.png rename to gtk/theme/Default/assets/text-select-start-dark.png diff --git a/gtk/theme/Adwaita/assets/text-select-start-dark@2.png b/gtk/theme/Default/assets/text-select-start-dark@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-start-dark@2.png rename to gtk/theme/Default/assets/text-select-start-dark@2.png diff --git a/gtk/theme/Adwaita/assets/text-select-start-hover-dark.png b/gtk/theme/Default/assets/text-select-start-hover-dark.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-start-hover-dark.png rename to gtk/theme/Default/assets/text-select-start-hover-dark.png diff --git a/gtk/theme/Adwaita/assets/text-select-start-hover-dark@2.png b/gtk/theme/Default/assets/text-select-start-hover-dark@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-start-hover-dark@2.png rename to gtk/theme/Default/assets/text-select-start-hover-dark@2.png diff --git a/gtk/theme/Adwaita/assets/text-select-start-hover.png b/gtk/theme/Default/assets/text-select-start-hover.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-start-hover.png rename to gtk/theme/Default/assets/text-select-start-hover.png diff --git a/gtk/theme/Adwaita/assets/text-select-start-hover@2.png b/gtk/theme/Default/assets/text-select-start-hover@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-start-hover@2.png rename to gtk/theme/Default/assets/text-select-start-hover@2.png diff --git a/gtk/theme/Adwaita/assets/text-select-start.png b/gtk/theme/Default/assets/text-select-start.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-start.png rename to gtk/theme/Default/assets/text-select-start.png diff --git a/gtk/theme/Adwaita/assets/text-select-start@2.png b/gtk/theme/Default/assets/text-select-start@2.png similarity index 100% rename from gtk/theme/Adwaita/assets/text-select-start@2.png rename to gtk/theme/Default/assets/text-select-start@2.png diff --git a/gtk/theme/Default/gtk-dark.css b/gtk/theme/Default/gtk-dark.css new file mode 100644 index 0000000000..876a9b1de8 --- /dev/null +++ b/gtk/theme/Default/gtk-dark.css @@ -0,0 +1 @@ +@import url("resource:///org/gtk/libgtk/theme/Default/Default-dark.css"); diff --git a/gtk/theme/Default/gtk-hc-dark.css b/gtk/theme/Default/gtk-hc-dark.css new file mode 100644 index 0000000000..99364a4635 --- /dev/null +++ b/gtk/theme/Default/gtk-hc-dark.css @@ -0,0 +1 @@ +@import url("resource:///org/gtk/libgtk/theme/Default/Default-hc-dark.css"); diff --git a/gtk/theme/Default/gtk-hc.css b/gtk/theme/Default/gtk-hc.css new file mode 100644 index 0000000000..ca822a2b50 --- /dev/null +++ b/gtk/theme/Default/gtk-hc.css @@ -0,0 +1 @@ +@import url("resource:///org/gtk/libgtk/theme/Default/Default-hc.css"); diff --git a/gtk/theme/Default/gtk-light.css b/gtk/theme/Default/gtk-light.css new file mode 100644 index 0000000000..cf32f0590a --- /dev/null +++ b/gtk/theme/Default/gtk-light.css @@ -0,0 +1 @@ +@import url("resource:///org/gtk/libgtk/theme/Default/Default-light.css"); diff --git a/gtk/theme/Default/gtk.css b/gtk/theme/Default/gtk.css new file mode 100644 index 0000000000..cf32f0590a --- /dev/null +++ b/gtk/theme/Default/gtk.css @@ -0,0 +1 @@ +@import url("resource:///org/gtk/libgtk/theme/Default/Default-light.css"); diff --git a/gtk/theme/Default/meson.build b/gtk/theme/Default/meson.build new file mode 100644 index 0000000000..5e52a8b3ce --- /dev/null +++ b/gtk/theme/Default/meson.build @@ -0,0 +1,26 @@ +default_scss_files = files([ + '_colors-public.scss', + '_colors.scss', + '_common.scss', + '_drawing.scss', +]) + +default_theme_variants = [ + 'light', + 'dark', + 'hc', + 'hc-dark', +] + +default_theme_deps = [] + +foreach variant: default_theme_variants + default_theme_deps += custom_target('Default theme variant: ' + variant, + input: 'Default-@0@.scss'.format(variant), + output: 'Default-@0@.css'.format(variant), + command: [ + sassc, sassc_opts, '@INPUT@', '@OUTPUT@', + ], + depend_files: default_scss_files, + ) +endforeach diff --git a/gtk/theme/Default/render-assets.sh b/gtk/theme/Default/render-assets.sh new file mode 100755 index 0000000000..f4b6998966 --- /dev/null +++ b/gtk/theme/Default/render-assets.sh @@ -0,0 +1,38 @@ +#! /bin/bash + +INKSCAPE="/usr/bin/inkscape" +OPTIPNG="/usr/bin/optipng" + +INDEX="assets.txt" + +for s in "" "-hc"; +do + SRC_FILE="assets$s.svg" + ASSETS_DIR="assets$s" + + for i in `cat $INDEX` + do + if [ -f $ASSETS_DIR/$i.png ]; then + echo $ASSETS_DIR/$i.png exists. + else + echo + echo Rendering $ASSETS_DIR/$i.png + $INKSCAPE --export-id=$i \ + --export-id-only \ + --export-png=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null #\ + # && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png + fi + if [ -f $ASSETS_DIR/$i@2.png ]; then + echo $ASSETS_DIR/$i@2.png exists. + else + echo + echo Rendering $ASSETS_DIR/$i@2.png + $INKSCAPE --export-id=$i \ + --export-dpi=180 \ + --export-id-only \ + --export-png=$ASSETS_DIR/$i@2.png $SRC_FILE >/dev/null #\ + # && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i@2.png + fi + done +done +exit 0 diff --git a/gtk/theme/HighContrast/HighContrast-dark.scss b/gtk/theme/HighContrast/HighContrast-dark.scss deleted file mode 100644 index 51c57c0fbf..0000000000 --- a/gtk/theme/HighContrast/HighContrast-dark.scss +++ /dev/null @@ -1,13 +0,0 @@ -// General guidelines: -// - very unlikely you want to edit something else than _common.scss -// - keep the number of defined colors to a minimum, use the color blending functions if -// you need a subtle shade -// - if you need to inverse a color function use the @if directive to match for dark $variant - -$variant: 'dark'; - -@import '../Adwaita/colors'; -@import 'colors-hc'; -@import '../Adwaita/colors-public'; // export public colors -@import '../Adwaita/drawing'; -@import '../Adwaita/common'; diff --git a/gtk/theme/HighContrast/HighContrast.scss b/gtk/theme/HighContrast/HighContrast.scss deleted file mode 100644 index 236834aed8..0000000000 --- a/gtk/theme/HighContrast/HighContrast.scss +++ /dev/null @@ -1,13 +0,0 @@ -// General guidelines: -// - very unlikely you want to edit something else than _common.scss -// - keep the number of defined colors to a minimum, use the color blending functions if -// you need a subtle shade -// - if you need to inverse a color function use the @if directive to match for dark $variant - -$variant: 'light'; - -@import '../Adwaita/colors'; -@import 'colors-hc'; -@import '../Adwaita/colors-public'; // export public colors -@import '../Adwaita/drawing'; -@import '../Adwaita/common'; diff --git a/gtk/theme/HighContrast/_colors-hc.scss b/gtk/theme/HighContrast/_colors-hc.scss deleted file mode 100644 index f1535a64cf..0000000000 --- a/gtk/theme/HighContrast/_colors-hc.scss +++ /dev/null @@ -1,26 +0,0 @@ -// High Contrast color overrides -// When color definition differs for dark and light variant -// it gets @if ed depending on $variant - - -$fg_color: if($variant == 'light', darken($fg_color, 3%), lighten($fg_color, 2%)); -$bg_color: if($variant == 'light', lighten($bg_color, 3%), darken($bg_color, 2%)); -$selected_bg_color: darken($selected_bg_color,10%); -$selected_borders_color: darken($selected_borders_color, 10%); -$borders_color: if($variant == 'light', darken($borders_color, 30%), lighten($borders_color, 30%)); -$alt_borders_color: if($variant == 'light', darken($alt_borders_color, 33%), lighten($alt_borders_color, 28%)); -$menu_color: $base_color; -$menu_selected_color: darken($bg_color,10%); - -//insensitive state derived colors -$insensitive_fg_color: mix($fg_color, $bg_color, 50%); -$insensitive_bg_color: mix($bg_color, $base_color, 60%); -$insensitive_borders_color: mix($borders_color, $bg_color, 80%); - -//focus rings -$focus_border_color: if($variant == 'light', transparentize($selected_bg_color, 0.2), transparentize(white, 0.4)); -$alt_focus_border_color: if($variant == 'light', white, transparentize(white,0.4)); - -$dim_label_opacity: 0.9; - -$switch_borders_color: if($variant == 'light',darken($switch_bg_color,15%),lighten($switch_bg_color,15%)); diff --git a/gtk/theme/HighContrast/assets.txt b/gtk/theme/HighContrast/assets.txt deleted file mode 100644 index a380d1cce5..0000000000 --- a/gtk/theme/HighContrast/assets.txt +++ /dev/null @@ -1,44 +0,0 @@ -text-select-end -text-select-end-hover -text-select-end-active -text-select-start -text-select-start-hover -text-select-start-active -text-select-end-dark -text-select-end-hover-dark -text-select-end-active-dark -text-select-start-dark -text-select-start-hover-dark -text-select-start-active-dark -slider-horz-scale-has-marks-below -slider-horz-scale-has-marks-below-hover -slider-horz-scale-has-marks-below-active -slider-horz-scale-has-marks-below-insensitive -slider-vert-scale-has-marks-below -slider-vert-scale-has-marks-below-hover -slider-vert-scale-has-marks-below-active -slider-vert-scale-has-marks-below-insensitive -slider-horz-scale-has-marks-above -slider-horz-scale-has-marks-above-hover -slider-horz-scale-has-marks-above-active -slider-horz-scale-has-marks-above-insensitive -slider-vert-scale-has-marks-above -slider-vert-scale-has-marks-above-hover -slider-vert-scale-has-marks-above-active -slider-vert-scale-has-marks-above-insensitive -slider-horz-scale-has-marks-below-dark -slider-horz-scale-has-marks-below-hover-dark -slider-horz-scale-has-marks-below-active-dark -slider-horz-scale-has-marks-below-insensitive-dark -slider-vert-scale-has-marks-below-dark -slider-vert-scale-has-marks-below-hover-dark -slider-vert-scale-has-marks-below-active-dark -slider-vert-scale-has-marks-below-insensitive-dark -slider-horz-scale-has-marks-above-dark -slider-horz-scale-has-marks-above-hover-dark -slider-horz-scale-has-marks-above-active-dark -slider-horz-scale-has-marks-above-insensitive-dark -slider-vert-scale-has-marks-above-dark -slider-vert-scale-has-marks-above-hover-dark -slider-vert-scale-has-marks-above-active-dark -slider-vert-scale-has-marks-above-insensitive-dark diff --git a/gtk/theme/HighContrast/gtk-dark.css b/gtk/theme/HighContrast/gtk-dark.css deleted file mode 100644 index 5f32a5edc5..0000000000 --- a/gtk/theme/HighContrast/gtk-dark.css +++ /dev/null @@ -1 +0,0 @@ -@import url("resource:///org/gtk/libgtk/theme/HighContrast/HighContrast-dark.css"); diff --git a/gtk/theme/HighContrast/gtk.css b/gtk/theme/HighContrast/gtk.css deleted file mode 100644 index 8dcda0018d..0000000000 --- a/gtk/theme/HighContrast/gtk.css +++ /dev/null @@ -1 +0,0 @@ -@import url("resource:///org/gtk/libgtk/theme/HighContrast/HighContrast.css"); diff --git a/gtk/theme/HighContrast/meson.build b/gtk/theme/HighContrast/meson.build deleted file mode 100644 index 0bc6931392..0000000000 --- a/gtk/theme/HighContrast/meson.build +++ /dev/null @@ -1,29 +0,0 @@ -hc_scss_files = files([ - '_colors-hc.scss', -]) - -hc_theme_variants = [ - 'dark', -] - -hc_theme_deps = [ - custom_target('HighContrast theme', - input: 'HighContrast.scss', - output: 'HighContrast.css', - command: [ - sassc, sassc_opts, '@INPUT@', '@OUTPUT@', - ], - depend_files: [ hc_scss_files, adwaita_scss_files ], - ) -] - -foreach variant: hc_theme_variants - hc_theme_deps += custom_target('HighContrast theme variant: ' + variant, - input: 'HighContrast-@0@.scss'.format(variant), - output: 'HighContrast-@0@.css'.format(variant), - command: [ - sassc, sassc_opts, '@INPUT@', '@OUTPUT@', - ], - depend_files: [ hc_scss_files, adwaita_scss_files ], - ) -endforeach diff --git a/gtk/theme/HighContrast/render-assets.sh b/gtk/theme/HighContrast/render-assets.sh deleted file mode 100755 index 24d7675afe..0000000000 --- a/gtk/theme/HighContrast/render-assets.sh +++ /dev/null @@ -1,34 +0,0 @@ -#! /bin/bash - -INKSCAPE="/usr/bin/inkscape" -OPTIPNG="/usr/bin/optipng" - -SRC_FILE="assets.svg" -ASSETS_DIR="assets" -INDEX="assets.txt" - -for i in `cat $INDEX` -do -if [ -f $ASSETS_DIR/$i.png ]; then - echo $ASSETS_DIR/$i.png exists. -else - echo - echo Rendering $ASSETS_DIR/$i.png - $INKSCAPE --export-id=$i \ - --export-id-only \ - --export-png=$ASSETS_DIR/$i.png $SRC_FILE >/dev/null #\ - # && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i.png -fi -if [ -f $ASSETS_DIR/$i@2.png ]; then - echo $ASSETS_DIR/$i@2.png exists. -else - echo - echo Rendering $ASSETS_DIR/$i@2.png - $INKSCAPE --export-id=$i \ - --export-dpi=180 \ - --export-id-only \ - --export-png=$ASSETS_DIR/$i@2.png $SRC_FILE >/dev/null #\ - # && $OPTIPNG -o7 --quiet $ASSETS_DIR/$i@2.png -fi -done -exit 0 From 3654bcfbe8d8bc3bc7476032f510529045ad85ae Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 15 Jan 2021 01:07:08 -0500 Subject: [PATCH 2/6] Make the theme variants available as themes This makes it easier to implement the theme switching in widget-factory, since we don't have a variant setting. --- gtk/gen-gtk-gresources-xml.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gtk/gen-gtk-gresources-xml.py b/gtk/gen-gtk-gresources-xml.py index 38a928388d..14c90f1ee1 100644 --- a/gtk/gen-gtk-gresources-xml.py +++ b/gtk/gen-gtk-gresources-xml.py @@ -32,7 +32,12 @@ def get_files(subdir,extension): xml += ''' theme/Empty/gtk.css + theme/Default/gtk.css + theme/Default/gtk-dark.css + theme/Default/gtk-hc.css + theme/Default/gtk-hc-dark.css + theme/Default/gtk-light.css theme/Default/gtk-dark.css theme/Default/gtk-hc.css From 8938b09bc99ea1b0e588449ec4ce1d4094842f52 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 15 Jan 2021 00:57:15 -0500 Subject: [PATCH 3/6] Change the default theme to "Default" We are not shipping Adwaita anymore. --- gtk/gtksettingsprivate.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk/gtksettingsprivate.h b/gtk/gtksettingsprivate.h index ec41b8fa6b..21af69d3dc 100644 --- a/gtk/gtksettingsprivate.h +++ b/gtk/gtksettingsprivate.h @@ -23,7 +23,7 @@ G_BEGIN_DECLS -#define DEFAULT_THEME_NAME "Adwaita" +#define DEFAULT_THEME_NAME "Default" #define DEFAULT_ICON_THEME "Adwaita" const cairo_font_options_t * From e964e176f927047365ca564e73de41b0fff713f3 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 15 Jan 2021 01:07:47 -0500 Subject: [PATCH 4/6] widget-factory: Use the new themes Update the Style menu to switch between the variants of the Default theme. --- demos/widget-factory/widget-factory.c | 31 ++++++++------------------ demos/widget-factory/widget-factory.ui | 16 ++++++------- 2 files changed, 17 insertions(+), 30 deletions(-) diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c index 8e8da85f4a..220ba204fa 100644 --- a/demos/widget-factory/widget-factory.c +++ b/demos/widget-factory/widget-factory.c @@ -50,32 +50,19 @@ change_theme_state (GSimpleAction *action, GtkSettings *settings = gtk_settings_get_default (); const char *s; const char *theme; - gboolean prefer_dark = FALSE; g_simple_action_set_state (action, state); s = g_variant_get_string (state, NULL); - if (strcmp (s, "adwaita") == 0) - { - theme = "Adwaita"; - prefer_dark = FALSE; - } - else if (strcmp (s, "adwaita-dark") == 0) - { - theme = "Adwaita"; - prefer_dark = TRUE; - } - else if (strcmp (s, "highcontrast") == 0) - { - theme = "HighContrast"; - prefer_dark = FALSE; - } - else if (strcmp (s, "highcontrast-inverse") == 0) - { - theme = "HighContrastInverse"; - prefer_dark = FALSE; - } + if (strcmp (s, "default") == 0) + theme = "Default"; + else if (strcmp (s, "dark") == 0) + theme = "Default-dark"; + else if (strcmp (s, "hc") == 0) + theme = "Default-hc"; + else if (strcmp (s, "hc-dark") == 0) + theme = "Default-hc-dark"; else if (strcmp (s, "current") == 0) { gtk_settings_reset_property (settings, "gtk-theme-name"); @@ -87,7 +74,7 @@ change_theme_state (GSimpleAction *action, g_object_set (G_OBJECT (settings), "gtk-theme-name", theme, - "gtk-application-prefer-dark-theme", prefer_dark, + "gtk-application-prefer-dark-theme", FALSE, NULL); } diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui index 2153591e30..269b3f459f 100644 --- a/demos/widget-factory/widget-factory.ui +++ b/demos/widget-factory/widget-factory.ui @@ -15,24 +15,24 @@ current - Adwaita + Default win.theme - adwaita + default - Adwaita dark + Dark win.theme - adwaita-dark + dark - High contrast + Highcontrast win.theme - highcontrast + hc - High contrast inverse + Highcontrast inverse win.theme - highcontrast-inverse + hc-dark From 0bf3e4c25b0d49407f2a1638a5666e47145f0f13 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 15 Jan 2021 00:52:40 -0500 Subject: [PATCH 5/6] Drop Adwaita and HighContrast themes These themes will reappear in libadwaita in due course. --- gtk/gen-gtk-gresources-xml.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/gtk/gen-gtk-gresources-xml.py b/gtk/gen-gtk-gresources-xml.py index 14c90f1ee1..ad602d53bb 100644 --- a/gtk/gen-gtk-gresources-xml.py +++ b/gtk/gen-gtk-gresources-xml.py @@ -46,12 +46,6 @@ xml += ''' theme/Default/Default-dark.css theme/Default/Default-hc.css theme/Default/Default-hc-dark.css - theme/Default/gtk.css - theme/Default/gtk-dark.css - theme/Default/gtk-dark.css - theme/Default/gtk-hc.css - theme/Default/gtk-hc-dark.css - theme/Default/gtk-hc-dark.css ''' for f in get_files('theme/Default/assets', '.png'): From fd329e0ec582d7562f444bf792909906d41a7e5a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 1 Apr 2021 22:02:38 -0400 Subject: [PATCH 6/6] Make theme fallback working with the new names Since we are likely going to see theme names like Adwaita and HighContrast, make fallback work as follows: Adwaita -> Default Adwaita:dark -> Default:dark HighContrast -> Default:hc HighContrast:dark -> Default:hc-dark HighContrastInverse -> Default:hc-dark Other themes will fall back to Default, as before. --- gtk/gtkcssprovider.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c index 43882cf385..56b243f1c1 100644 --- a/gtk/gtkcssprovider.c +++ b/gtk/gtkcssprovider.c @@ -1385,16 +1385,20 @@ gtk_css_provider_load_named (GtkCssProvider *provider, else { /* Things failed! Fall back! Fall back! */ - - if (variant) + if (strcmp (name, "HighContrast") == 0) { - /* If there was a variant, try without */ - gtk_css_provider_load_named (provider, name, NULL); + if (g_strcmp0 (variant, "dark") == 0) + gtk_css_provider_load_named (provider, DEFAULT_THEME_NAME, "hc-dark"); + else + gtk_css_provider_load_named (provider, DEFAULT_THEME_NAME, "hc"); } + else if (strcmp (name, "HighConstrastInverse") == 0) + gtk_css_provider_load_named (provider, DEFAULT_THEME_NAME, "hc-dark"); + else if (strcmp (name, DEFAULT_THEME_NAME) != 0) + gtk_css_provider_load_named (provider, DEFAULT_THEME_NAME, variant); else { - /* Worst case, fall back to the default */ - g_return_if_fail (!g_str_equal (name, DEFAULT_THEME_NAME)); /* infloop protection */ + g_return_if_fail (variant != NULL); gtk_css_provider_load_named (provider, DEFAULT_THEME_NAME, NULL); } }