[gtk/theme-reorg: 1326/1330] Reorganize our themes
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/theme-reorg: 1326/1330] Reorganize our themes
- Date: Tue, 30 Mar 2021 20:49:09 +0000 (UTC)
commit 6751cd02c7b679be461e5ed1f9fff93ceedd54cb
Author: Matthias Clasen <mclasen redhat com>
Date: Fri Jan 15 00:25:30 2021 -0500
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 ++++
.../Adwaita.scss => Default/Default-light.scss} | 1 +
gtk/theme/{Adwaita => Default}/README | 14 +++++--
gtk/theme/{Adwaita => Default}/_colors-public.scss | 0
gtk/theme/{Adwaita => Default}/_colors.scss | 27 +++++++++++++
gtk/theme/{Adwaita => Default}/_common.scss | 25 ++++++------
gtk/theme/{Adwaita => Default}/_drawing.scss | 0
.../assets.svg => Default/assets-hc.svg} | 0
.../assets-hc}/bullet-symbolic.svg | 0
.../assets-hc}/bullet-symbolic.symbolic.png | Bin
.../assets-hc}/bullet 2-symbolic symbolic png | Bin
.../assets-hc}/check-symbolic.svg | 0
.../assets-hc}/check-symbolic.symbolic.png | Bin
.../assets-hc}/check 2-symbolic symbolic png | Bin
.../assets => Default/assets-hc}/dash-symbolic.svg | 0
.../assets-hc}/dash-symbolic.symbolic.png | Bin
.../assets-hc}/dash 2-symbolic symbolic png | Bin
...ider-horz-scale-has-marks-above-active-dark.png | Bin
...er-horz-scale-has-marks-above-active-dark 2 png | Bin
.../slider-horz-scale-has-marks-above-active.png | Bin
.../slider-horz-scale-has-marks-above-active 2 png | Bin
.../slider-horz-scale-has-marks-above-dark.png | Bin
.../slider-horz-scale-has-marks-above-dark 2 png | Bin
...lider-horz-scale-has-marks-above-hover-dark.png | Bin
...der-horz-scale-has-marks-above-hover-dark 2 png | Bin
.../slider-horz-scale-has-marks-above-hover.png | Bin
.../slider-horz-scale-has-marks-above-hover 2 png | Bin
...horz-scale-has-marks-above-insensitive-dark.png | Bin
...rz-scale-has-marks-above-insensitive-dark 2 png | Bin
...ider-horz-scale-has-marks-above-insensitive.png | Bin
...er-horz-scale-has-marks-above-insensitive 2 png | Bin
.../slider-horz-scale-has-marks-above.png | Bin
.../slider-horz-scale-has-marks-above 2 png | Bin
...ider-horz-scale-has-marks-below-active-dark.png | Bin
...er-horz-scale-has-marks-below-active-dark 2 png | Bin
.../slider-horz-scale-has-marks-below-active.png | Bin
.../slider-horz-scale-has-marks-below-active 2 png | Bin
.../slider-horz-scale-has-marks-below-dark.png | Bin
.../slider-horz-scale-has-marks-below-dark 2 png | Bin
...lider-horz-scale-has-marks-below-hover-dark.png | Bin
...der-horz-scale-has-marks-below-hover-dark 2 png | Bin
.../slider-horz-scale-has-marks-below-hover.png | Bin
.../slider-horz-scale-has-marks-below-hover 2 png | Bin
...horz-scale-has-marks-below-insensitive-dark.png | Bin
...rz-scale-has-marks-below-insensitive-dark 2 png | Bin
...ider-horz-scale-has-marks-below-insensitive.png | Bin
...er-horz-scale-has-marks-below-insensitive 2 png | Bin
.../slider-horz-scale-has-marks-below.png | Bin
.../slider-horz-scale-has-marks-below 2 png | Bin
...ider-vert-scale-has-marks-above-active-dark.png | Bin
...er-vert-scale-has-marks-above-active-dark 2 png | Bin
.../slider-vert-scale-has-marks-above-active.png | Bin
.../slider-vert-scale-has-marks-above-active 2 png | Bin
.../slider-vert-scale-has-marks-above-dark.png | Bin
.../slider-vert-scale-has-marks-above-dark 2 png | Bin
...lider-vert-scale-has-marks-above-hover-dark.png | Bin
...der-vert-scale-has-marks-above-hover-dark 2 png | Bin
.../slider-vert-scale-has-marks-above-hover.png | Bin
.../slider-vert-scale-has-marks-above-hover 2 png | Bin
...vert-scale-has-marks-above-insensitive-dark.png | Bin
...rt-scale-has-marks-above-insensitive-dark 2 png | Bin
...ider-vert-scale-has-marks-above-insensitive.png | Bin
...er-vert-scale-has-marks-above-insensitive 2 png | Bin
.../slider-vert-scale-has-marks-above.png | Bin
.../slider-vert-scale-has-marks-above 2 png | Bin
...ider-vert-scale-has-marks-below-active-dark.png | Bin
...er-vert-scale-has-marks-below-active-dark 2 png | Bin
.../slider-vert-scale-has-marks-below-active.png | Bin
.../slider-vert-scale-has-marks-below-active 2 png | Bin
.../slider-vert-scale-has-marks-below-dark.png | Bin
.../slider-vert-scale-has-marks-below-dark 2 png | Bin
...lider-vert-scale-has-marks-below-hover-dark.png | Bin
...der-vert-scale-has-marks-below-hover-dark 2 png | Bin
.../slider-vert-scale-has-marks-below-hover.png | Bin
.../slider-vert-scale-has-marks-below-hover 2 png | Bin
...vert-scale-has-marks-below-insensitive-dark.png | Bin
...rt-scale-has-marks-below-insensitive-dark 2 png | Bin
...ider-vert-scale-has-marks-below-insensitive.png | Bin
...er-vert-scale-has-marks-below-insensitive 2 png | Bin
.../slider-vert-scale-has-marks-below.png | Bin
.../slider-vert-scale-has-marks-below 2 png | Bin
.../assets-hc}/text-select-end-active-dark.png | Bin
.../assets-hc}/text-select-end-active-dark 2 png | Bin
.../assets-hc}/text-select-end-active.png | Bin
.../assets-hc}/text-select-end-active 2 png | Bin
.../assets-hc}/text-select-end-dark.png | Bin
.../assets-hc}/text-select-end-dark 2 png | Bin
.../assets-hc}/text-select-end-hover-dark.png | Bin
.../assets-hc}/text-select-end-hover-dark 2 png | Bin
.../assets-hc}/text-select-end-hover.png | Bin
.../assets-hc}/text-select-end-hover 2 png | Bin
.../assets-hc}/text-select-end.png | Bin
.../assets-hc}/text-select-end 2 png | Bin
.../assets-hc}/text-select-start-active-dark.png | Bin
.../assets-hc}/text-select-start-active-dark 2 png | Bin
.../assets-hc}/text-select-start-active.png | Bin
.../assets-hc}/text-select-start-active 2 png | Bin
.../assets-hc}/text-select-start-dark.png | Bin
.../assets-hc}/text-select-start-dark 2 png | Bin
.../assets-hc}/text-select-start-hover-dark.png | Bin
.../assets-hc}/text-select-start-hover-dark 2 png | Bin
.../assets-hc}/text-select-start-hover.png | Bin
.../assets-hc}/text-select-start-hover 2 png | Bin
.../assets-hc}/text-select-start.png | Bin
.../assets-hc}/text-select-start 2 png | Bin
gtk/theme/{Adwaita => Default}/assets.svg | 0
gtk/theme/{Adwaita => Default}/assets.txt | 0
.../assets/bullet-symbolic.svg | 0
.../assets/bullet-symbolic.symbolic.png | Bin
.../assets/bullet 2-symbolic symbolic png | Bin
.../{Adwaita => Default}/assets/check-symbolic.svg | 0
.../assets/check-symbolic.symbolic.png | Bin
.../assets/check 2-symbolic symbolic png | Bin
.../assets/dash-symbolic.svg | 0
.../assets/dash-symbolic.symbolic.png | Bin
.../assets/dash 2-symbolic symbolic png | Bin
...ider-horz-scale-has-marks-above-active-dark.png | Bin
...er-horz-scale-has-marks-above-active-dark 2 png | Bin
.../slider-horz-scale-has-marks-above-active.png | Bin
.../slider-horz-scale-has-marks-above-active 2 png | Bin
.../slider-horz-scale-has-marks-above-dark.png | Bin
.../slider-horz-scale-has-marks-above-dark 2 png | Bin
...lider-horz-scale-has-marks-above-hover-dark.png | Bin
...der-horz-scale-has-marks-above-hover-dark 2 png | Bin
.../slider-horz-scale-has-marks-above-hover.png | Bin
.../slider-horz-scale-has-marks-above-hover 2 png | Bin
...horz-scale-has-marks-above-insensitive-dark.png | Bin
...rz-scale-has-marks-above-insensitive-dark 2 png | Bin
...ider-horz-scale-has-marks-above-insensitive.png | Bin
...er-horz-scale-has-marks-above-insensitive 2 png | Bin
.../assets/slider-horz-scale-has-marks-above.png | Bin
.../assets/slider-horz-scale-has-marks-above 2 png | Bin
...ider-horz-scale-has-marks-below-active-dark.png | Bin
...er-horz-scale-has-marks-below-active-dark 2 png | Bin
.../slider-horz-scale-has-marks-below-active.png | Bin
.../slider-horz-scale-has-marks-below-active 2 png | Bin
.../slider-horz-scale-has-marks-below-dark.png | Bin
.../slider-horz-scale-has-marks-below-dark 2 png | Bin
...lider-horz-scale-has-marks-below-hover-dark.png | Bin
...der-horz-scale-has-marks-below-hover-dark 2 png | Bin
.../slider-horz-scale-has-marks-below-hover.png | Bin
.../slider-horz-scale-has-marks-below-hover 2 png | Bin
...horz-scale-has-marks-below-insensitive-dark.png | Bin
...rz-scale-has-marks-below-insensitive-dark 2 png | Bin
...ider-horz-scale-has-marks-below-insensitive.png | Bin
...er-horz-scale-has-marks-below-insensitive 2 png | Bin
.../assets/slider-horz-scale-has-marks-below.png | Bin
.../assets/slider-horz-scale-has-marks-below 2 png | Bin
...ider-vert-scale-has-marks-above-active-dark.png | Bin
...er-vert-scale-has-marks-above-active-dark 2 png | Bin
.../slider-vert-scale-has-marks-above-active.png | Bin
.../slider-vert-scale-has-marks-above-active 2 png | Bin
.../slider-vert-scale-has-marks-above-dark.png | Bin
.../slider-vert-scale-has-marks-above-dark 2 png | Bin
...lider-vert-scale-has-marks-above-hover-dark.png | Bin
...der-vert-scale-has-marks-above-hover-dark 2 png | Bin
.../slider-vert-scale-has-marks-above-hover.png | Bin
.../slider-vert-scale-has-marks-above-hover 2 png | Bin
...vert-scale-has-marks-above-insensitive-dark.png | Bin
...rt-scale-has-marks-above-insensitive-dark 2 png | Bin
...ider-vert-scale-has-marks-above-insensitive.png | Bin
...er-vert-scale-has-marks-above-insensitive 2 png | Bin
.../assets/slider-vert-scale-has-marks-above.png | Bin
.../assets/slider-vert-scale-has-marks-above 2 png | Bin
...ider-vert-scale-has-marks-below-active-dark.png | Bin
...er-vert-scale-has-marks-below-active-dark 2 png | Bin
.../slider-vert-scale-has-marks-below-active.png | Bin
.../slider-vert-scale-has-marks-below-active 2 png | Bin
.../slider-vert-scale-has-marks-below-dark.png | Bin
.../slider-vert-scale-has-marks-below-dark 2 png | Bin
...lider-vert-scale-has-marks-below-hover-dark.png | Bin
...der-vert-scale-has-marks-below-hover-dark 2 png | Bin
.../slider-vert-scale-has-marks-below-hover.png | Bin
.../slider-vert-scale-has-marks-below-hover 2 png | Bin
...vert-scale-has-marks-below-insensitive-dark.png | Bin
...rt-scale-has-marks-below-insensitive-dark 2 png | Bin
...ider-vert-scale-has-marks-below-insensitive.png | Bin
...er-vert-scale-has-marks-below-insensitive 2 png | Bin
.../assets/slider-vert-scale-has-marks-below.png | Bin
.../assets/slider-vert-scale-has-marks-below 2 png | Bin
.../assets/text-select-end-active-dark.png | Bin
.../assets/text-select-end-active-dark 2 png | Bin
.../assets/text-select-end-active.png | Bin
.../assets/text-select-end-active 2 png | Bin
.../assets/text-select-end-dark.png | Bin
.../assets/text-select-end-dark 2 png | Bin
.../assets/text-select-end-hover-dark.png | Bin
.../assets/text-select-end-hover-dark 2 png | Bin
.../assets/text-select-end-hover.png | Bin
.../assets/text-select-end-hover 2 png | Bin
.../assets/text-select-end.png | Bin
.../assets/text-select-end 2 png | Bin
.../assets/text-select-start-active-dark.png | Bin
.../assets/text-select-start-active-dark 2 png | Bin
.../assets/text-select-start-active.png | Bin
.../assets/text-select-start-active 2 png | Bin
.../assets/text-select-start-dark.png | Bin
.../assets/text-select-start-dark 2 png | Bin
.../assets/text-select-start-hover-dark.png | Bin
.../assets/text-select-start-hover-dark 2 png | Bin
.../assets/text-select-start-hover.png | Bin
.../assets/text-select-start-hover 2 png | Bin
.../assets/text-select-start.png | Bin
.../assets/text-select-start 2 png | Bin
gtk/theme/Default/gtk-dark.css | 1 +
gtk/theme/Default/gtk-hc-dark.css | 1 +
gtk/theme/Default/gtk-hc.css | 1 +
gtk/theme/Default/gtk-light.css | 1 +
gtk/theme/Default/gtk.css | 1 +
gtk/theme/Default/meson.build | 26 ++++++++++++
gtk/theme/Default/render-assets.sh | 38 ++++++++++++++++++
gtk/theme/HighContrast/HighContrast-dark.scss | 13 ------
gtk/theme/HighContrast/HighContrast.scss | 13 ------
gtk/theme/HighContrast/_colors-hc.scss | 26 ------------
gtk/theme/HighContrast/assets.txt | 44 ---------------------
gtk/theme/HighContrast/gtk-dark.css | 1 -
gtk/theme/HighContrast/gtk.css | 1 -
gtk/theme/HighContrast/meson.build | 29 --------------
gtk/theme/HighContrast/render-assets.sh | 34 ----------------
227 files changed, 162 insertions(+), 270 deletions(-)
---
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 += '''
<file>theme/Empty/gtk.css</file>
- <file>theme/Adwaita/gtk.css</file>
- <file>theme/Adwaita/gtk-dark.css</file>
- <file alias='theme/Adwaita-dark/gtk.css'>theme/Adwaita/gtk-dark.css</file>
- <file>theme/Adwaita/Adwaita.css</file>
- <file>theme/Adwaita/Adwaita-dark.css</file>
+ <file>theme/Default/gtk.css</file>
+ <file>theme/Default/gtk-light.css</file>
+ <file>theme/Default/gtk-dark.css</file>
+ <file>theme/Default/gtk-hc.css</file>
+ <file>theme/Default/gtk-hc-dark.css</file>
+ <file>theme/Default/Default-light.css</file>
+ <file>theme/Default/Default-dark.css</file>
+ <file>theme/Default/Default-hc.css</file>
+ <file>theme/Default/Default-hc-dark.css</file>
+ <file alias='theme/Adwaita/gtk.css'>theme/Default/gtk.css</file>
+ <file alias='theme/Adwaita/gtk-dark.css'>theme/Default/gtk-dark.css</file>
+ <file alias='theme/Adwaita-dark/gtk.css'>theme/Default/gtk-dark.css</file>
+ <file alias='theme/HighContrast/gtk.css'>theme/Default/gtk-hc.css</file>
+ <file alias='theme/HighContrast/gtk-dark.css'>theme/Default/gtk-hc-dark.css</file>
+ <file alias='theme/HighContrastInverse/gtk.css'>theme/Default/gtk-hc-dark.css</file>
'''
-for f in get_files('theme/Adwaita/assets', '.png'):
- xml += ' <file>theme/Adwaita/assets/{0}</file>\n'.format(f)
+for f in get_files('theme/Default/assets', '.png'):
+ xml += ' <file>theme/Default/assets/{0}</file>\n'.format(f)
xml += '\n'
-for f in get_files('theme/Adwaita/assets', '.svg'):
- xml += ' <file>theme/Adwaita/assets/{0}</file>\n'.format(f)
+for f in get_files('theme/Default/assets', '.svg'):
+ xml += ' <file>theme/Default/assets/{0}</file>\n'.format(f)
-xml += '''
- <file>theme/HighContrast/gtk.css</file>
- <file>theme/HighContrast/gtk-dark.css</file>
- <file alias='theme/HighContrastInverse/gtk.css'>theme/HighContrast/gtk-dark.css</file>
- <file>theme/HighContrast/HighContrast.css</file>
- <file>theme/HighContrast/HighContrast-dark.css</file>
-'''
-
-for f in get_files('theme/HighContrast/assets', '.png'):
- xml += ' <file>theme/HighContrast/assets/{0}</file>\n'.format(f)
+for f in get_files('theme/Default/assets-hc', '.png'):
+ xml += ' <file>theme/Default/assets-hc/{0}</file>\n'.format(f)
xml += '\n'
-for f in get_files('theme/HighContrast/assets', '.svg'):
- xml += ' <file>theme/HighContrast/assets/{0}</file>\n'.format(f)
+for f in get_files('theme/Default/assets-hc', '.svg'):
+ xml += ' <file>theme/Default/assets-hc/{0}</file>\n'.format(f)
for f in get_files('ui', '.ui'):
xml += ' <file preprocess=\'xml-stripblanks\'>ui/{0}</file>\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/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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
