diff --git a/Helium-dark/gtk-3.0/install-dark-theme.sh b/Helium-dark/gtk-3.0/install-dark-theme.sh deleted file mode 100644 index 227f3ca..0000000 --- a/Helium-dark/gtk-3.0/install-dark-theme.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -set -eu - -theme_dir="${MESON_INSTALL_DESTDIR_PREFIX}/$1" -project_name="$2" - -cd "$3" - -install -m755 -d "${theme_dir}" -for ver in gtk-3.0; do - install -m755 -d "${theme_dir}/${ver}" - ln -sf "../../${project_name}/${ver}/gtk-dark.css" "${theme_dir}/${ver}/gtk.css" - cp -r "${project_name}/${ver}/gtk-dark.css" "${theme_dir}/${ver}/gtk-dark.css" -done diff --git a/Helium-dark/gtk-3.0/meson.build b/Helium-dark/gtk-3.0/meson.build deleted file mode 100644 index 55e2e5c..0000000 --- a/Helium-dark/gtk-3.0/meson.build +++ /dev/null @@ -1,2 +0,0 @@ -meson.add_install_script('install-dark-theme.sh', theme_dir, meson.project_name(), meson.project_build_root()) -gtk3_dark_dir = join_paths(theme_dir, 'gtk-3.0') \ No newline at end of file diff --git a/Helium-dark/gtk-4.0/assets/bullet-symbolic.svg b/Helium-dark/gtk-4.0/assets/bullet-symbolic.svg deleted file mode 100644 index f359a70..0000000 --- a/Helium-dark/gtk-4.0/assets/bullet-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Helium-dark/gtk-4.0/assets/bullet-symbolic.symbolic.png b/Helium-dark/gtk-4.0/assets/bullet-symbolic.symbolic.png deleted file mode 100644 index 8e6925a..0000000 Binary files a/Helium-dark/gtk-4.0/assets/bullet-symbolic.symbolic.png and /dev/null differ diff --git a/Helium-dark/gtk-4.0/assets/bullet@2-symbolic.symbolic.png b/Helium-dark/gtk-4.0/assets/bullet@2-symbolic.symbolic.png deleted file mode 100644 index e9df425..0000000 Binary files a/Helium-dark/gtk-4.0/assets/bullet@2-symbolic.symbolic.png and /dev/null differ diff --git a/Helium-dark/gtk-4.0/assets/check-symbolic.svg b/Helium-dark/gtk-4.0/assets/check-symbolic.svg deleted file mode 100644 index 27c620d..0000000 --- a/Helium-dark/gtk-4.0/assets/check-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Helium-dark/gtk-4.0/assets/check-symbolic.symbolic.png b/Helium-dark/gtk-4.0/assets/check-symbolic.symbolic.png deleted file mode 100644 index 9144bcd..0000000 Binary files a/Helium-dark/gtk-4.0/assets/check-symbolic.symbolic.png and /dev/null differ diff --git a/Helium-dark/gtk-4.0/assets/check@2-symbolic.symbolic.png b/Helium-dark/gtk-4.0/assets/check@2-symbolic.symbolic.png deleted file mode 100644 index c0baa3c..0000000 Binary files a/Helium-dark/gtk-4.0/assets/check@2-symbolic.symbolic.png and /dev/null differ diff --git a/Helium-dark/gtk-4.0/assets/dash-symbolic.svg b/Helium-dark/gtk-4.0/assets/dash-symbolic.svg deleted file mode 100644 index de3638d..0000000 --- a/Helium-dark/gtk-4.0/assets/dash-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Helium-dark/gtk-4.0/assets/dash-symbolic.symbolic.png b/Helium-dark/gtk-4.0/assets/dash-symbolic.symbolic.png deleted file mode 100644 index 3afcfd6..0000000 Binary files a/Helium-dark/gtk-4.0/assets/dash-symbolic.symbolic.png and /dev/null differ diff --git a/Helium-dark/gtk-4.0/assets/dash@2-symbolic.symbolic.png b/Helium-dark/gtk-4.0/assets/dash@2-symbolic.symbolic.png deleted file mode 100644 index 9cb5994..0000000 Binary files a/Helium-dark/gtk-4.0/assets/dash@2-symbolic.symbolic.png and /dev/null differ diff --git a/Helium-dark/gtk-4.0/assets/devel-symbolic.svg b/Helium-dark/gtk-4.0/assets/devel-symbolic.svg deleted file mode 100644 index 14843f0..0000000 --- a/Helium-dark/gtk-4.0/assets/devel-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/Helium-dark/gtk-4.0/install-dark-theme.sh b/Helium-dark/gtk-4.0/install-dark-theme.sh deleted file mode 100755 index 3260da6..0000000 --- a/Helium-dark/gtk-4.0/install-dark-theme.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -set -eu - -theme_dir="${MESON_INSTALL_DESTDIR_PREFIX}/$1" -project_name="$2" - -cd "$3" - -install -m755 -d "${theme_dir}" -for ver in gtk-4.0; do - install -m755 -d "${theme_dir}/${ver}" - ln -sf "../../${project_name}/${ver}/gtk-dark.css" "${theme_dir}/${ver}/gtk.css" - ln -sf "../../${project_name}/${ver}/assets" "${theme_dir}/${ver}/assets" - # For the new dark theme switcher in GNOME 42+ - cp -r "${project_name}/${ver}/gtk-dark.css" "${theme_dir}/${ver}/gtk-dark.css" -done diff --git a/Helium-dark/gtk-4.0/meson.build b/Helium-dark/gtk-4.0/meson.build deleted file mode 100644 index faa8cd7..0000000 --- a/Helium-dark/gtk-4.0/meson.build +++ /dev/null @@ -1,2 +0,0 @@ -# CSS and assets are just symlinks to the light themes as they are not modified -meson.add_install_script('install-dark-theme.sh', theme_dir, meson.project_name(), meson.project_build_root()) diff --git a/Helium-dark/meson.build b/Helium-dark/meson.build deleted file mode 100644 index 4e746c8..0000000 --- a/Helium-dark/meson.build +++ /dev/null @@ -1,17 +0,0 @@ -theme_dir = join_paths(get_option('datadir'), 'themes', meson.project_name()+'-dark') - -conf_data = configuration_data() -conf_data.set('ThemeName', meson.project_name()) -conf_data.set('VariantThemeName', meson.project_name()+'-dark') -configure_file(input : '../index.theme.in', - output : 'index.theme', - configuration : conf_data, - install_dir: theme_dir) - -if get_option('gtk3') - subdir('gtk-3.0') -endif - -if get_option('gtk4') - subdir('gtk-4.0') -endif diff --git a/Helium/gtk-3.0/widgets/_headerbar.scss b/Helium/gtk-3.0/widgets/_headerbar.scss index 9604f5f..b2905ed 100644 --- a/Helium/gtk-3.0/widgets/_headerbar.scss +++ b/Helium/gtk-3.0/widgets/_headerbar.scss @@ -394,7 +394,7 @@ decoration { // server-side decorations as used by mutter .ssd & { background: $headerbar_bg_color; } - .ssd &:backdrop { background: $headerbar_backdrop_color; } + .ssd &:backdrop { background: $headerbar_bg_color; color: transparentize(white, 0.66); } .csd.popup & { border-radius: $menu_radius; diff --git a/Helium/gtk-4.0/widgets/_window.scss b/Helium/gtk-4.0/widgets/_window.scss index 90f8269..fcdb029 100644 --- a/Helium/gtk-4.0/widgets/_window.scss +++ b/Helium/gtk-4.0/widgets/_window.scss @@ -2,6 +2,7 @@ window { border-width: 0px; &.csd { + background: bg-color(1); box-shadow: shadow(5), 0 0 0 1px rgba(black, 0.1); margin: 0px; @@ -11,6 +12,7 @@ window { outline-offset: -1px; &:backdrop { + background: bg-color(0); // The first transparent is to avoid jumping box-shadow: 0 6px 30px 5px transparent, shadow(3), diff --git a/meson.build b/meson.build index 7a41097..069222f 100644 --- a/meson.build +++ b/meson.build @@ -5,8 +5,4 @@ project('Helium', sass = find_program('sass') -subdir('Helium') - -if get_option('dark') - subdir('Helium-dark') -endif +subdir('Helium') \ No newline at end of file