diff --git a/README.md b/README.md index 8fb1595..095306b 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ # Human theme -This theme works with: **GTK 2.24+** *(with murrine)*, **GTK 3.20+** *(including 3.22 and 3.24)*, and **GTK 4.0+**. +This theme works with: **GTK 2.24** *(with murrine)*, **GTK 3.24**, and **GTK 4.12**. It is mainly intended for Mate and Xfce desktop environments. ## Screenshots -GTK 2\ +GTK 2.24 (Pango 1.51)\ [![Preview with GTK 2 - Main window](images/thumbs/gtk2.png?raw=true)](images/gtk2.png?raw=true) [![Preview with GTK 2 - Orange variation - Main window](images/thumbs/gtk2-orange.png?raw=true)](images/gtk2-orange.png?raw=true) [![Preview with GTK 2 - Blue variation - Main window](images/thumbs/gtk2-blue.png?raw=true)](images/gtk2-blue.png?raw=true) @@ -16,7 +16,7 @@ GTK 2\ [![Preview with GTK 2 - Blue variation - Menu](images/thumbs/gtk2-blue-menu.png?raw=true)](images/gtk2-blue-menu.png?raw=true) [![Preview with GTK 2 - Green variation - Menu](images/thumbs/gtk2-green-menu.png?raw=true)](images/gtk2-green-menu.png?raw=true) -GTK 2 RTL\ +GTK 2.24 RTL (Pango 1.51)\ [![Preview with GTK 2 - RTL - Main window](images/thumbs/gtk2-rtl.png?raw=true)](images/gtk2-rtl.png?raw=true) [![Preview with GTK 2 - RTL - Orange variation - Main window](images/thumbs/gtk2-rtl-orange.png?raw=true)](images/gtk2-rtl-orange.png?raw=true) [![Preview with GTK 2 - RTL - Blue variation - Main window](images/thumbs/gtk2-rtl-blue.png?raw=true)](images/gtk2-rtl-blue.png?raw=true) @@ -26,7 +26,7 @@ GTK 2 RTL\ [![Preview with GTK 2 - RTL - Blue variation - Menu](images/thumbs/gtk2-rtl-blue-menu.png?raw=true)](images/gtk2-rtl-blue-menu.png?raw=true) [![Preview with GTK 2 - RTL - Green variation - Menu](images/thumbs/gtk2-rtl-green-menu.png?raw=true)](images/gtk2-rtl-green-menu.png?raw=true) -GTK 3\ +GTK 3.24 (Pango 1.51)\ [![Preview with GTK 3 - Main window](images/thumbs/gtk3.png?raw=true)](images/gtk3.png?raw=true) [![Preview with GTK 3 - Orange variation - Main window](images/thumbs/gtk3-orange.png?raw=true)](images/gtk3-orange.png?raw=true) [![Preview with GTK 3 - Blue variation - Main window](images/thumbs/gtk3-blue.png?raw=true)](images/gtk3-blue.png?raw=true) @@ -36,7 +36,7 @@ GTK 3\ [![Preview with GTK 3 - Blue variation - Menu](images/thumbs/gtk3-blue-menu.png?raw=true)](images/gtk3-blue-menu.png?raw=true) [![Preview with GTK 3 - Green variation - Menu](images/thumbs/gtk3-green-menu.png?raw=true)](images/gtk3-green-menu.png?raw=true) -GTK 3 RTL\ +GTK 3.24 RTL (Pango 1.51)\ [![Preview with GTK 3 - RTL - Main window](images/thumbs/gtk3-rtl.png?raw=true)](images/gtk3-rtl.png?raw=true) [![Preview with GTK 3 - RTL - Orange variation - Main window](images/thumbs/gtk3-rtl-orange.png?raw=true)](images/gtk3-rtl-orange.png?raw=true) [![Preview with GTK 3 - RTL - Blue variation - Main window](images/thumbs/gtk3-rtl-blue.png?raw=true)](images/gtk3-rtl-blue.png?raw=true) @@ -46,7 +46,7 @@ GTK 3 RTL\ [![Preview with GTK 3 - RTL - Blue variation - Menu](images/thumbs/gtk3-rtl-blue-menu.png?raw=true)](images/gtk3-rtl-blue-menu.png?raw=true) [![Preview with GTK 3 - RTL - Green variation - Menu](images/thumbs/gtk3-rtl-green-menu.png?raw=true)](images/gtk3-rtl-green-menu.png?raw=true) -GTK 4\ +GTK 4.12 (Pango 1.51)\ [![Preview with GTK 4 - Main window](images/thumbs/gtk4.png?raw=true)](images/gtk4.png?raw=true) [![Preview with GTK 4 - Orange variation - Main window](images/thumbs/gtk4-orange.png?raw=true)](images/gtk4-orange.png?raw=true) [![Preview with GTK 4 - Blue variation - Main window](images/thumbs/gtk4-blue.png?raw=true)](images/gtk4-blue.png?raw=true) @@ -56,7 +56,7 @@ GTK 4\ [![Preview with GTK 4 - Blue variation - Menu](images/thumbs/gtk4-blue-menu.png?raw=true)](images/gtk4-blue-menu.png?raw=true) [![Preview with GTK 4 - Green variation - Menu](images/thumbs/gtk4-green-menu.png?raw=true)](images/gtk4-green-menu.png?raw=true) -GTK 4 RTL\ +GTK 4.12 RTL (Pango 1.51)\ [![Preview with GTK 4 - RTL - Main window](images/thumbs/gtk4-rtl.png?raw=true)](images/gtk4-rtl.png?raw=true) [![Preview with GTK 4 - RTL - Orange variation - Main window](images/thumbs/gtk4-rtl-orange.png?raw=true)](images/gtk4-rtl-orange.png?raw=true) [![Preview with GTK 4 - RTL - Blue variation - Main window](images/thumbs/gtk4-rtl-blue.png?raw=true)](images/gtk4-rtl-blue.png?raw=true) @@ -66,7 +66,7 @@ GTK 4 RTL\ [![Preview with GTK 4 - RTL - Blue variation - Menu](images/thumbs/gtk4-rtl-blue-menu.png?raw=true)](images/gtk4-rtl-blue-menu.png?raw=true) [![Preview with GTK 4 - RTL - Green variation - Menu](images/thumbs/gtk4-rtl-green-menu.png?raw=true)](images/gtk4-rtl-green-menu.png?raw=true) -Program used for the screenshots is available [here](https://github.com/luigifab/awf-extended). For screenshots: Pango 1.51 with GTK 2.24.33 & 3.24.37-classic & 4.12.2. Yes! Almost same rendering like before!! +Program used for the screenshots is available [here](https://github.com/luigifab/awf-extended). ## Installation @@ -79,8 +79,6 @@ To meet the truth (this is not required): For Debian Testing, I provide a [repository](https://build.opensuse.org/package/show/home:luigifab/gtk3-classic) for gtk3-classic. -**With Pango 1.51+, criticals fails of the life of Pango from 1.43 to 1.50 are fixed (for _v35_ of _FREETYPE_PROPERTIES_). There are some differences, but for now it's acceptable.** - If you can't/won't, no worries, but the truth will be far. #### Installation for Debian and Ubuntu @@ -198,7 +196,7 @@ Fonts used: * *DejaVu Sans Mono Book* or *Monospace Regular*, 10 Icons used: -* *gnome* +* *gnome* or *mate* Cursors used: * *DMZ white* @@ -217,12 +215,7 @@ sudo rm 10-hinting-slight.conf # /usr/share/fontconfig/conf.avail/10-hinting-sli sudo ln -s /usr/share/fontconfig/conf.avail/10-hinting-full.conf ``` -## Known issues - -* For classic menu bar and menu items of [Firefox 46+](https://www.mozilla.org/firefox) and [Thunderbird 46+](https://www.mozilla.org/thunderbird), see [bug 1622545](https://bugzilla.mozilla.org/show_bug.cgi?id=1622545). -* The [status bar grip](https://developer.gnome.org/gtk2/stable/GtkStatusbar.html) was removed with GTK 3 ([note1](https://developer.gnome.org/gtk3/stable/ch26s02.html#id-1.6.3.4.17), [note2](https://developer.gnome.org/gtk3/stable/GtkWindow.html#gtk-window-set-has-resize-grip)). -* The [treeview](https://developer.gnome.org/gtk3/stable/GtkTreeView.html) zebra/even-odd row styling was removed with GTK 3.19 ([note](https://gitlab.gnome.org/GNOME/gtk/issues/581#note_746153)) | **fixed** with [gtk3-classic](https://github.com/lah7/gtk3-classic)! -* The [notebook tabs](https://developer.gnome.org/gtk3/stable/GtkNotebook.html) mouse scroll was removed with GTK 3.4 | **fixed** with [gtk3-classic](https://github.com/lah7/gtk3-classic)! +For classic menu bar and menu items of [Firefox 46+](https://www.mozilla.org/firefox) and [Thunderbird 46+](https://www.mozilla.org/thunderbird), see [bug 1622545](https://bugzilla.mozilla.org/show_bug.cgi?id=1622545). ## Dev @@ -253,9 +246,10 @@ Run `svg.sh` to update SVG images. See also [technical informations](https://git ## Copyright -- Current version: 2.1.0 (10/10/2023) -- Compatibility: GTK 2.24 / 3.20 / 3.22 / 3.24 / 4.0 / 4.2 / 4.4 / 4.6 / 4.8 / 4.10 / 4.12 +- Current version: 2.2.0 (02/02/2024) +- Compatibility: GTK 2.24 / 3.24 / 4.12 - Links: [luigifab.fr](https://www.luigifab.fr/gtk/human-theme) - [github.com](https://github.com/luigifab/human-theme) - [mate-look.org](https://www.mate-look.org/p/1376363/) - [xfce-look.org](https://www.xfce-look.org/p/1376363/)\ +[Arch Linux human-theme-gtk.zst](https://aur.archlinux.org/packages/human-theme-gtk)\ [Debian human-theme-gtk.deb](https://packages.debian.org/human-theme-gtk) *([ITP](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=973445), [RFS](https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=974209))*\ @@ -266,6 +260,10 @@ Run `svg.sh` to update SVG images. See also [technical informations](https://git This theme is provided under the terms of the **GNU GPLv3+** license.\ If you like, take some of your time to improve some translations, go to https://bit.ly/2HyCCEc. +## Packages in official distros repositories + +[![Packages status](https://repology.org/badge/vertical-allrepos/human-theme-gtk.svg?header=human-theme-gtk)](https://repology.org/project/human-theme-gtk/versions) + ## Credits GTK 2 theme *(CC-BY-SA-3.0+)* diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD new file mode 100644 index 0000000..cd7bb63 --- /dev/null +++ b/archlinux/PKGBUILD @@ -0,0 +1,35 @@ +pkgname=human-theme-gtk +pkgver=2.2.0 +pkgrel=1 +pkgdesc="Human theme for GTK" +arch=('any') +url='https://github.com/luigifab/human-theme' +license=('GPL3' 'LGPL2' 'CCBYSA') +depends=() +optdepends=('gtk-murrine-engine: for gtk2') +source=("https://github.com/luigifab/human-theme/archive/v${pkgver}/human-theme-${pkgver}.tar.gz") +md5sums=("...") + +prepare() { + mv "human-theme-$pkgver" "$pkgname-$pkgver" +} + +package() { + cd "$pkgname-$pkgver" + + # the entire source code is GPL-3.0-or-later, except metacity-1/* which is LGPL-2.1-or-later, and gtk-2.0/* which is CC-BY-SA-3.0+ + mkdir -p "$pkgdir/usr/share/themes/" + cp -a src/human-theme/ "$pkgdir/usr/share/themes/" + cp -a src/human-theme-blue/ "$pkgdir/usr/share/themes/" + cp -a src/human-theme-green/ "$pkgdir/usr/share/themes/" + cp -a src/human-theme-orange/ "$pkgdir/usr/share/themes/" + + mkdir -p "$pkgdir/etc/profile.d/" + install -pm 644 debian/profile.sh "$pkgdir/etc/profile.d/$pkgname.sh" + + mkdir -p "$pkgdir/usr/share/doc/$pkgname/" + install -pm 644 README.md "$pkgdir/usr/share/doc/$pkgname/" + + mkdir -p "$pkgdir/usr/share/licenses/$pkgname/" + install -pm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/" +} \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 695fd00..41b995a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -human-theme-gtk (2.1.0-1) experimental; urgency=low +human-theme-gtk (2.2.0-1) experimental; urgency=low * Initial Debian package release (Closes: #973445) - -- Fabrice Creuzot Tue, 10 Oct 2023 20:00:00 +0000 + -- Fabrice Creuzot Fri, 02 Feb 2024 20:00:00 +0000 diff --git a/debian/control b/debian/control index 6fa81af..ee62877 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Fabrice Creuzot Build-Depends: debhelper-compat (= 13) Rules-Requires-Root: no -Standards-Version: 4.6.1.0 +Standards-Version: 4.6.2 Homepage: https://github.com/luigifab/human-theme Vcs-Browser: https://github.com/luigifab/human-theme Vcs-Git: https://github.com/luigifab/human-theme.git @@ -15,8 +15,9 @@ Depends: ${misc:Depends} Recommends: gtk2-engines-murrine, gnome-icon-theme, dmz-cursor-theme Suggests: gtk3-nocsd, qt5-gtk2-platformtheme, qt5-gtk-platformtheme Description: human theme for GTK - This theme works with: GTK 2.24+ (with gtk2-engines-murrine), - GTK 3.20+ (including 3.22 and 3.24), and GTK 4.0+. It is mainly - intended for Mate and Xfce Desktop Environments. + This theme works with GTK 2.24 (with gtk2-engines-murrine), + 3.24, and 4.12. Better rendering with Pango 1.42- or 1.51+. + . + It is mainly intended for Mate and Xfce Desktop Environments. . After installation you must restart your session. diff --git a/debian/copyright b/debian/copyright index 17c93f5..ec3fbe5 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,7 +7,7 @@ Copyright: 2011-2014 Jean-Philippe Fleury 2013-2014 Andrew Shadura 2020 Mike Kazantsev (mk-fg) - 2020-2023 Fabrice Creuzot (luigifab) + 2020-2024 Fabrice Creuzot (luigifab) License: GPL-3+ Files: */metacity-1/metacity-theme-1.xml diff --git a/debian/deb.sh b/debian/deb.sh index 0d3866d..06a35a9 100644 --- a/debian/deb.sh +++ b/debian/deb.sh @@ -3,11 +3,11 @@ cd "$(dirname "$0")" -version="2.1.0" +version="2.2.0" -rm -rf builder/ mkdir builder +rm -rf builder/* # copy to a tmp directory if [ true ]; then @@ -31,10 +31,10 @@ fi # create packages for Debian and Ubuntu -for serie in experimental mantic lunar jammy focal bionic xenial trusty; do +for serie in experimental noble mantic jammy focal bionic xenial trusty; do if [ $serie = "experimental" ]; then - # for Ubuntu + # copy for Ubuntu cp -a builder/human-theme-$version/ builder/human-theme-$version+src/ # Debian only cd builder/human-theme-$version/ diff --git a/debian/postinst b/debian/postinst deleted file mode 100644 index b3734d6..0000000 --- a/debian/postinst +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -set -e - -currentver=`dpkg-query --showformat='${Version}' --show libpango-* | sed -r 's/[0-9]://'` -required50=1.50 -required44=1.44 - -# https://unix.stackexchange.com/a/285928 -if [ "$(printf '%s\n' "$required50" "$currentver" | sort -V | head -n1)" = "$required50" ]; then - # Pango >= 1.50 (same as Pango < 1.44) - echo "Update human-theme-gtk for Pango >= 1.50" - sed -i 's/= 1.44 and < 1.50" - sed -i 's/= 1.50) - echo "Update human-theme-gtk for Pango < 1.44" - sed -i 's/= 1.50 (same as Pango < 1.44) - echo "Update %{name} for Pango >= 1.50" - sed -i 's/= 1.44 and < 1.50" - sed -i 's/= 1.50) - echo "Update %{name} for Pango < 1.44" - sed -i 's/ - 2.2.0-1 +- New upstream release + * Tue Oct 10 2023 Fabrice Creuzot - 2.1.0-1 - New upstream release diff --git a/fedora/rpm.sh b/fedora/rpm.sh index 4e051d2..8b6ad4c 100644 --- a/fedora/rpm.sh +++ b/fedora/rpm.sh @@ -3,11 +3,11 @@ # Fedora: configure: error: C compiler cannot create executables? remove and reinstall glibc-devel gcc cd "$(dirname "$0")" -version="2.1.0" +version="2.2.0" -rm -rf builder/ mkdir -p builder ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS} +find builder/* ! -name "*$version*.rpm" ! -name "*$version*.gz" -exec rm -rf {} + 2>/dev/null # copy to a tmp directory if [ true ]; then @@ -20,7 +20,7 @@ else rm -rf /tmp/$temp/*/builder/ mv /tmp/$temp builder/ - cp /usr/share/licenses/linux-firmware/GPL-3 builder/$temp/LICENSE + cp /usr/share/licenses/*-firmware/GPL-3 builder/$temp/LICENSE # * = linux cd builder/ tar czf $temp.tar.gz $temp @@ -32,10 +32,10 @@ fi # create package (rpm sign https://access.redhat.com/articles/3359321) rpmbuild -ba human-theme-gtk.spec -rpm --addsign ~/rpmbuild/RPMS/*/*.rpm -rpm --addsign ~/rpmbuild/SRPMS/*.rpm -mv ~/rpmbuild/RPMS/*/*.rpm builder/ -mv ~/rpmbuild/SRPMS/*.rpm builder/ +rpm --addsign ~/rpmbuild/RPMS/*/human-theme-gtk*.rpm +rpm --addsign ~/rpmbuild/SRPMS/human-theme-gtk*.rpm +mv ~/rpmbuild/RPMS/*/human-theme-gtk*.rpm builder/ +mv ~/rpmbuild/SRPMS/human-theme-gtk*.rpm builder/ echo "===========================" rpm --checksig builder/*.rpm echo "===========================" diff --git a/images/gtk2-blue-menu.png b/images/gtk2-blue-menu.png index 5055513..bde2970 100644 Binary files a/images/gtk2-blue-menu.png and b/images/gtk2-blue-menu.png differ diff --git a/images/gtk2-blue.png b/images/gtk2-blue.png index d50a98f..3dd95ef 100644 Binary files a/images/gtk2-blue.png and b/images/gtk2-blue.png differ diff --git a/images/gtk2-green-menu.png b/images/gtk2-green-menu.png index 604bd3c..3d67ef0 100644 Binary files a/images/gtk2-green-menu.png and b/images/gtk2-green-menu.png differ diff --git a/images/gtk2-green.png b/images/gtk2-green.png index b229eae..2803972 100644 Binary files a/images/gtk2-green.png and b/images/gtk2-green.png differ diff --git a/images/gtk2-menu.png b/images/gtk2-menu.png index e1bf3c0..f6717cd 100644 Binary files a/images/gtk2-menu.png and b/images/gtk2-menu.png differ diff --git a/images/gtk2-orange-menu.png b/images/gtk2-orange-menu.png index 74a5334..9a5576f 100644 Binary files a/images/gtk2-orange-menu.png and b/images/gtk2-orange-menu.png differ diff --git a/images/gtk2-orange.png b/images/gtk2-orange.png index 84560e5..b24005e 100644 Binary files a/images/gtk2-orange.png and b/images/gtk2-orange.png differ diff --git a/images/gtk2-rtl-blue-menu.png b/images/gtk2-rtl-blue-menu.png index 58c295d..53b9ec4 100644 Binary files a/images/gtk2-rtl-blue-menu.png and b/images/gtk2-rtl-blue-menu.png differ diff --git a/images/gtk2-rtl-blue.png b/images/gtk2-rtl-blue.png index 206c47d..29a56b4 100644 Binary files a/images/gtk2-rtl-blue.png and b/images/gtk2-rtl-blue.png differ diff --git a/images/gtk2-rtl-green-menu.png b/images/gtk2-rtl-green-menu.png index 2a51936..14d804a 100644 Binary files a/images/gtk2-rtl-green-menu.png and b/images/gtk2-rtl-green-menu.png differ diff --git a/images/gtk2-rtl-green.png b/images/gtk2-rtl-green.png index f5641a4..3e9a3bf 100644 Binary files a/images/gtk2-rtl-green.png and b/images/gtk2-rtl-green.png differ diff --git a/images/gtk2-rtl-menu.png b/images/gtk2-rtl-menu.png index b604220..23937e8 100644 Binary files a/images/gtk2-rtl-menu.png and b/images/gtk2-rtl-menu.png differ diff --git a/images/gtk2-rtl-orange-menu.png b/images/gtk2-rtl-orange-menu.png index 24345de..91e37c3 100644 Binary files a/images/gtk2-rtl-orange-menu.png and b/images/gtk2-rtl-orange-menu.png differ diff --git a/images/gtk2-rtl-orange.png b/images/gtk2-rtl-orange.png index 0503c63..5e94999 100644 Binary files a/images/gtk2-rtl-orange.png and b/images/gtk2-rtl-orange.png differ diff --git a/images/gtk2-rtl.png b/images/gtk2-rtl.png index 6b6287a..64714c7 100644 Binary files a/images/gtk2-rtl.png and b/images/gtk2-rtl.png differ diff --git a/images/gtk2.png b/images/gtk2.png index f0a7dea..03e4e64 100644 Binary files a/images/gtk2.png and b/images/gtk2.png differ diff --git a/images/gtk3-blue-menu.png b/images/gtk3-blue-menu.png index e5164a1..8c211f4 100644 Binary files a/images/gtk3-blue-menu.png and b/images/gtk3-blue-menu.png differ diff --git a/images/gtk3-blue.png b/images/gtk3-blue.png index 599f898..53e61e7 100644 Binary files a/images/gtk3-blue.png and b/images/gtk3-blue.png differ diff --git a/images/gtk3-green-menu.png b/images/gtk3-green-menu.png index 773caa6..5933fa7 100644 Binary files a/images/gtk3-green-menu.png and b/images/gtk3-green-menu.png differ diff --git a/images/gtk3-green.png b/images/gtk3-green.png index ac984fe..68bd98f 100644 Binary files a/images/gtk3-green.png and b/images/gtk3-green.png differ diff --git a/images/gtk3-menu.png b/images/gtk3-menu.png index d64307f..dc56824 100644 Binary files a/images/gtk3-menu.png and b/images/gtk3-menu.png differ diff --git a/images/gtk3-orange-menu.png b/images/gtk3-orange-menu.png index 1fe824d..416f724 100644 Binary files a/images/gtk3-orange-menu.png and b/images/gtk3-orange-menu.png differ diff --git a/images/gtk3-orange.png b/images/gtk3-orange.png index 0a3f1b8..0dc1141 100644 Binary files a/images/gtk3-orange.png and b/images/gtk3-orange.png differ diff --git a/images/gtk3-rtl-blue-menu.png b/images/gtk3-rtl-blue-menu.png index 6204d99..583a5fb 100644 Binary files a/images/gtk3-rtl-blue-menu.png and b/images/gtk3-rtl-blue-menu.png differ diff --git a/images/gtk3-rtl-blue.png b/images/gtk3-rtl-blue.png index 43e7455..244e5f6 100644 Binary files a/images/gtk3-rtl-blue.png and b/images/gtk3-rtl-blue.png differ diff --git a/images/gtk3-rtl-green-menu.png b/images/gtk3-rtl-green-menu.png index 5aa1ec6..2986df3 100644 Binary files a/images/gtk3-rtl-green-menu.png and b/images/gtk3-rtl-green-menu.png differ diff --git a/images/gtk3-rtl-green.png b/images/gtk3-rtl-green.png index 82af847..8245a17 100644 Binary files a/images/gtk3-rtl-green.png and b/images/gtk3-rtl-green.png differ diff --git a/images/gtk3-rtl-menu.png b/images/gtk3-rtl-menu.png index 8f52d56..e9cb36d 100644 Binary files a/images/gtk3-rtl-menu.png and b/images/gtk3-rtl-menu.png differ diff --git a/images/gtk3-rtl-orange-menu.png b/images/gtk3-rtl-orange-menu.png index 5ced334..f3dce76 100644 Binary files a/images/gtk3-rtl-orange-menu.png and b/images/gtk3-rtl-orange-menu.png differ diff --git a/images/gtk3-rtl-orange.png b/images/gtk3-rtl-orange.png index 57a667a..8cdec98 100644 Binary files a/images/gtk3-rtl-orange.png and b/images/gtk3-rtl-orange.png differ diff --git a/images/gtk3-rtl.png b/images/gtk3-rtl.png index e8e8e4c..d810bea 100644 Binary files a/images/gtk3-rtl.png and b/images/gtk3-rtl.png differ diff --git a/images/gtk3.png b/images/gtk3.png index 05a292a..5f5dbde 100644 Binary files a/images/gtk3.png and b/images/gtk3.png differ diff --git a/images/gtk4-blue-menu.png b/images/gtk4-blue-menu.png index 419cc9e..6bdad39 100644 Binary files a/images/gtk4-blue-menu.png and b/images/gtk4-blue-menu.png differ diff --git a/images/gtk4-blue.png b/images/gtk4-blue.png index 562a6d0..e61ef8e 100644 Binary files a/images/gtk4-blue.png and b/images/gtk4-blue.png differ diff --git a/images/gtk4-green-menu.png b/images/gtk4-green-menu.png index 28bd594..697f5e5 100644 Binary files a/images/gtk4-green-menu.png and b/images/gtk4-green-menu.png differ diff --git a/images/gtk4-green.png b/images/gtk4-green.png index 6688b13..a62b1e3 100644 Binary files a/images/gtk4-green.png and b/images/gtk4-green.png differ diff --git a/images/gtk4-menu.png b/images/gtk4-menu.png index 49cb4b0..f2d3b66 100644 Binary files a/images/gtk4-menu.png and b/images/gtk4-menu.png differ diff --git a/images/gtk4-orange-menu.png b/images/gtk4-orange-menu.png index 133de29..f47f9ee 100644 Binary files a/images/gtk4-orange-menu.png and b/images/gtk4-orange-menu.png differ diff --git a/images/gtk4-orange.png b/images/gtk4-orange.png index a46e2c6..5fc00c4 100644 Binary files a/images/gtk4-orange.png and b/images/gtk4-orange.png differ diff --git a/images/gtk4-rtl-blue-menu.png b/images/gtk4-rtl-blue-menu.png index c1be51e..a93b18e 100644 Binary files a/images/gtk4-rtl-blue-menu.png and b/images/gtk4-rtl-blue-menu.png differ diff --git a/images/gtk4-rtl-blue.png b/images/gtk4-rtl-blue.png index 887b91e..ae626c8 100644 Binary files a/images/gtk4-rtl-blue.png and b/images/gtk4-rtl-blue.png differ diff --git a/images/gtk4-rtl-green-menu.png b/images/gtk4-rtl-green-menu.png index cc959a7..44d8e88 100644 Binary files a/images/gtk4-rtl-green-menu.png and b/images/gtk4-rtl-green-menu.png differ diff --git a/images/gtk4-rtl-green.png b/images/gtk4-rtl-green.png index 884fa0b..c96601f 100644 Binary files a/images/gtk4-rtl-green.png and b/images/gtk4-rtl-green.png differ diff --git a/images/gtk4-rtl-menu.png b/images/gtk4-rtl-menu.png index e431016..d98715e 100644 Binary files a/images/gtk4-rtl-menu.png and b/images/gtk4-rtl-menu.png differ diff --git a/images/gtk4-rtl-orange-menu.png b/images/gtk4-rtl-orange-menu.png index f166ef3..787a615 100644 Binary files a/images/gtk4-rtl-orange-menu.png and b/images/gtk4-rtl-orange-menu.png differ diff --git a/images/gtk4-rtl-orange.png b/images/gtk4-rtl-orange.png index 1181761..510a3c6 100644 Binary files a/images/gtk4-rtl-orange.png and b/images/gtk4-rtl-orange.png differ diff --git a/images/gtk4-rtl.png b/images/gtk4-rtl.png index f57ed8e..3c1a143 100644 Binary files a/images/gtk4-rtl.png and b/images/gtk4-rtl.png differ diff --git a/images/gtk4.png b/images/gtk4.png index 8e3d8da..12bcbfb 100644 Binary files a/images/gtk4.png and b/images/gtk4.png differ diff --git a/images/thumbs/gtk2-blue-menu.png b/images/thumbs/gtk2-blue-menu.png index 3e5f3ce..5ae710a 100644 Binary files a/images/thumbs/gtk2-blue-menu.png and b/images/thumbs/gtk2-blue-menu.png differ diff --git a/images/thumbs/gtk2-blue.png b/images/thumbs/gtk2-blue.png index 5dcf2c5..dcb7e6b 100644 Binary files a/images/thumbs/gtk2-blue.png and b/images/thumbs/gtk2-blue.png differ diff --git a/images/thumbs/gtk2-green-menu.png b/images/thumbs/gtk2-green-menu.png index 9134f89..cb6b6bc 100644 Binary files a/images/thumbs/gtk2-green-menu.png and b/images/thumbs/gtk2-green-menu.png differ diff --git a/images/thumbs/gtk2-green.png b/images/thumbs/gtk2-green.png index 1f44cac..08c2f81 100644 Binary files a/images/thumbs/gtk2-green.png and b/images/thumbs/gtk2-green.png differ diff --git a/images/thumbs/gtk2-menu.png b/images/thumbs/gtk2-menu.png index e41e99a..b144534 100644 Binary files a/images/thumbs/gtk2-menu.png and b/images/thumbs/gtk2-menu.png differ diff --git a/images/thumbs/gtk2-orange-menu.png b/images/thumbs/gtk2-orange-menu.png index 67452b4..78b241f 100644 Binary files a/images/thumbs/gtk2-orange-menu.png and b/images/thumbs/gtk2-orange-menu.png differ diff --git a/images/thumbs/gtk2-orange.png b/images/thumbs/gtk2-orange.png index 540d3bd..fc3440b 100644 Binary files a/images/thumbs/gtk2-orange.png and b/images/thumbs/gtk2-orange.png differ diff --git a/images/thumbs/gtk2-rtl-blue-menu.png b/images/thumbs/gtk2-rtl-blue-menu.png index c286b0b..8c2c363 100644 Binary files a/images/thumbs/gtk2-rtl-blue-menu.png and b/images/thumbs/gtk2-rtl-blue-menu.png differ diff --git a/images/thumbs/gtk2-rtl-blue.png b/images/thumbs/gtk2-rtl-blue.png index 798b1f9..19f30b6 100644 Binary files a/images/thumbs/gtk2-rtl-blue.png and b/images/thumbs/gtk2-rtl-blue.png differ diff --git a/images/thumbs/gtk2-rtl-green-menu.png b/images/thumbs/gtk2-rtl-green-menu.png index a915ed5..b5922c9 100644 Binary files a/images/thumbs/gtk2-rtl-green-menu.png and b/images/thumbs/gtk2-rtl-green-menu.png differ diff --git a/images/thumbs/gtk2-rtl-green.png b/images/thumbs/gtk2-rtl-green.png index 24e2a3d..e964b6b 100644 Binary files a/images/thumbs/gtk2-rtl-green.png and b/images/thumbs/gtk2-rtl-green.png differ diff --git a/images/thumbs/gtk2-rtl-menu.png b/images/thumbs/gtk2-rtl-menu.png index 9584712..da8e810 100644 Binary files a/images/thumbs/gtk2-rtl-menu.png and b/images/thumbs/gtk2-rtl-menu.png differ diff --git a/images/thumbs/gtk2-rtl-orange-menu.png b/images/thumbs/gtk2-rtl-orange-menu.png index 43786de..aa85313 100644 Binary files a/images/thumbs/gtk2-rtl-orange-menu.png and b/images/thumbs/gtk2-rtl-orange-menu.png differ diff --git a/images/thumbs/gtk2-rtl-orange.png b/images/thumbs/gtk2-rtl-orange.png index 28ef89c..fa77da4 100644 Binary files a/images/thumbs/gtk2-rtl-orange.png and b/images/thumbs/gtk2-rtl-orange.png differ diff --git a/images/thumbs/gtk2-rtl.png b/images/thumbs/gtk2-rtl.png index 82920c4..25af22b 100644 Binary files a/images/thumbs/gtk2-rtl.png and b/images/thumbs/gtk2-rtl.png differ diff --git a/images/thumbs/gtk2.png b/images/thumbs/gtk2.png index 50d7349..758767b 100644 Binary files a/images/thumbs/gtk2.png and b/images/thumbs/gtk2.png differ diff --git a/images/thumbs/gtk3-blue-menu.png b/images/thumbs/gtk3-blue-menu.png index 1cd8dcc..304768e 100644 Binary files a/images/thumbs/gtk3-blue-menu.png and b/images/thumbs/gtk3-blue-menu.png differ diff --git a/images/thumbs/gtk3-blue.png b/images/thumbs/gtk3-blue.png index e5f6667..fdcbc96 100644 Binary files a/images/thumbs/gtk3-blue.png and b/images/thumbs/gtk3-blue.png differ diff --git a/images/thumbs/gtk3-green-menu.png b/images/thumbs/gtk3-green-menu.png index 8f22a81..f24c054 100644 Binary files a/images/thumbs/gtk3-green-menu.png and b/images/thumbs/gtk3-green-menu.png differ diff --git a/images/thumbs/gtk3-green.png b/images/thumbs/gtk3-green.png index 1ba1430..9c79dce 100644 Binary files a/images/thumbs/gtk3-green.png and b/images/thumbs/gtk3-green.png differ diff --git a/images/thumbs/gtk3-menu.png b/images/thumbs/gtk3-menu.png index 1bcb767..f1174e1 100644 Binary files a/images/thumbs/gtk3-menu.png and b/images/thumbs/gtk3-menu.png differ diff --git a/images/thumbs/gtk3-orange-menu.png b/images/thumbs/gtk3-orange-menu.png index b34b870..70043a0 100644 Binary files a/images/thumbs/gtk3-orange-menu.png and b/images/thumbs/gtk3-orange-menu.png differ diff --git a/images/thumbs/gtk3-orange.png b/images/thumbs/gtk3-orange.png index 83fe03d..c7c6d28 100644 Binary files a/images/thumbs/gtk3-orange.png and b/images/thumbs/gtk3-orange.png differ diff --git a/images/thumbs/gtk3-rtl-blue-menu.png b/images/thumbs/gtk3-rtl-blue-menu.png index f549ff8..d7dc2a4 100644 Binary files a/images/thumbs/gtk3-rtl-blue-menu.png and b/images/thumbs/gtk3-rtl-blue-menu.png differ diff --git a/images/thumbs/gtk3-rtl-blue.png b/images/thumbs/gtk3-rtl-blue.png index c63217f..7536933 100644 Binary files a/images/thumbs/gtk3-rtl-blue.png and b/images/thumbs/gtk3-rtl-blue.png differ diff --git a/images/thumbs/gtk3-rtl-green-menu.png b/images/thumbs/gtk3-rtl-green-menu.png index 9108764..613c687 100644 Binary files a/images/thumbs/gtk3-rtl-green-menu.png and b/images/thumbs/gtk3-rtl-green-menu.png differ diff --git a/images/thumbs/gtk3-rtl-green.png b/images/thumbs/gtk3-rtl-green.png index d66b235..4bd5bcd 100644 Binary files a/images/thumbs/gtk3-rtl-green.png and b/images/thumbs/gtk3-rtl-green.png differ diff --git a/images/thumbs/gtk3-rtl-menu.png b/images/thumbs/gtk3-rtl-menu.png index b674972..512f697 100644 Binary files a/images/thumbs/gtk3-rtl-menu.png and b/images/thumbs/gtk3-rtl-menu.png differ diff --git a/images/thumbs/gtk3-rtl-orange-menu.png b/images/thumbs/gtk3-rtl-orange-menu.png index 36452ee..41e2a91 100644 Binary files a/images/thumbs/gtk3-rtl-orange-menu.png and b/images/thumbs/gtk3-rtl-orange-menu.png differ diff --git a/images/thumbs/gtk3-rtl-orange.png b/images/thumbs/gtk3-rtl-orange.png index 1fbbb9a..2ccf0f1 100644 Binary files a/images/thumbs/gtk3-rtl-orange.png and b/images/thumbs/gtk3-rtl-orange.png differ diff --git a/images/thumbs/gtk3-rtl.png b/images/thumbs/gtk3-rtl.png index ae17143..ffc4871 100644 Binary files a/images/thumbs/gtk3-rtl.png and b/images/thumbs/gtk3-rtl.png differ diff --git a/images/thumbs/gtk3.png b/images/thumbs/gtk3.png index d0df1e4..d630393 100644 Binary files a/images/thumbs/gtk3.png and b/images/thumbs/gtk3.png differ diff --git a/images/thumbs/gtk4-blue-menu.png b/images/thumbs/gtk4-blue-menu.png index 4979d76..9a401b8 100644 Binary files a/images/thumbs/gtk4-blue-menu.png and b/images/thumbs/gtk4-blue-menu.png differ diff --git a/images/thumbs/gtk4-blue.png b/images/thumbs/gtk4-blue.png index 67525a9..4e6ec7c 100644 Binary files a/images/thumbs/gtk4-blue.png and b/images/thumbs/gtk4-blue.png differ diff --git a/images/thumbs/gtk4-green-menu.png b/images/thumbs/gtk4-green-menu.png index 07dbbce..51a6e6b 100644 Binary files a/images/thumbs/gtk4-green-menu.png and b/images/thumbs/gtk4-green-menu.png differ diff --git a/images/thumbs/gtk4-green.png b/images/thumbs/gtk4-green.png index 69f1425..3b5d1f2 100644 Binary files a/images/thumbs/gtk4-green.png and b/images/thumbs/gtk4-green.png differ diff --git a/images/thumbs/gtk4-menu.png b/images/thumbs/gtk4-menu.png index ba81734..831abe3 100644 Binary files a/images/thumbs/gtk4-menu.png and b/images/thumbs/gtk4-menu.png differ diff --git a/images/thumbs/gtk4-orange-menu.png b/images/thumbs/gtk4-orange-menu.png index 970f679..17e9132 100644 Binary files a/images/thumbs/gtk4-orange-menu.png and b/images/thumbs/gtk4-orange-menu.png differ diff --git a/images/thumbs/gtk4-orange.png b/images/thumbs/gtk4-orange.png index 657929c..6566e3e 100644 Binary files a/images/thumbs/gtk4-orange.png and b/images/thumbs/gtk4-orange.png differ diff --git a/images/thumbs/gtk4-rtl-blue-menu.png b/images/thumbs/gtk4-rtl-blue-menu.png index 7b7c54a..ce18f6f 100644 Binary files a/images/thumbs/gtk4-rtl-blue-menu.png and b/images/thumbs/gtk4-rtl-blue-menu.png differ diff --git a/images/thumbs/gtk4-rtl-blue.png b/images/thumbs/gtk4-rtl-blue.png index f3ae411..9a75165 100644 Binary files a/images/thumbs/gtk4-rtl-blue.png and b/images/thumbs/gtk4-rtl-blue.png differ diff --git a/images/thumbs/gtk4-rtl-green-menu.png b/images/thumbs/gtk4-rtl-green-menu.png index 9ff1e42..43f3144 100644 Binary files a/images/thumbs/gtk4-rtl-green-menu.png and b/images/thumbs/gtk4-rtl-green-menu.png differ diff --git a/images/thumbs/gtk4-rtl-green.png b/images/thumbs/gtk4-rtl-green.png index 1224447..fa3d223 100644 Binary files a/images/thumbs/gtk4-rtl-green.png and b/images/thumbs/gtk4-rtl-green.png differ diff --git a/images/thumbs/gtk4-rtl-menu.png b/images/thumbs/gtk4-rtl-menu.png index 58036b0..84bd76c 100644 Binary files a/images/thumbs/gtk4-rtl-menu.png and b/images/thumbs/gtk4-rtl-menu.png differ diff --git a/images/thumbs/gtk4-rtl-orange-menu.png b/images/thumbs/gtk4-rtl-orange-menu.png index f08548e..c95666d 100644 Binary files a/images/thumbs/gtk4-rtl-orange-menu.png and b/images/thumbs/gtk4-rtl-orange-menu.png differ diff --git a/images/thumbs/gtk4-rtl-orange.png b/images/thumbs/gtk4-rtl-orange.png index 4a29f24..0bcef13 100644 Binary files a/images/thumbs/gtk4-rtl-orange.png and b/images/thumbs/gtk4-rtl-orange.png differ diff --git a/images/thumbs/gtk4-rtl.png b/images/thumbs/gtk4-rtl.png index 9e9460f..6c5a449 100644 Binary files a/images/thumbs/gtk4-rtl.png and b/images/thumbs/gtk4-rtl.png differ diff --git a/images/thumbs/gtk4.png b/images/thumbs/gtk4.png index e0762c0..7fcac8b 100644 Binary files a/images/thumbs/gtk4.png and b/images/thumbs/gtk4.png differ diff --git a/opensuse/human-theme-gtk.spec b/opensuse/human-theme-gtk.spec index d52c6b1..3374670 100644 --- a/opensuse/human-theme-gtk.spec +++ b/opensuse/human-theme-gtk.spec @@ -1,5 +1,5 @@ Name: human-theme-gtk -Version: 2.1.0 +Version: 2.2.0 Release: 0 Summary: Human theme for GTK Summary(fr): Thème Human pour GTK @@ -18,29 +18,30 @@ Suggests: qt6-platformtheme-gtk3 # https://software.openSUSE.org/search?baseproject=openSUSE%3AFactory&q=qt+theme+gtk %description %{expand: -This theme works with: GTK 2.24+ (with gtk2-engine-murrine), -GTK 3.20+ (including 3.22 and 3.24), and GTK 4.0+. It is mainly -intended for Mate and Xfce Desktop Environments. +This theme works with GTK 2.24 (with gtk2-engine-murrine), +3.24, and 4.12. Better rendering with Pango 1.42- or 1.51+. + +It is mainly intended for Mate and Xfce Desktop Environments. After installation you must restart your session.} %description -l fr %{expand: -Ce thème fonctionne avec : GTK 2.24+ (avec gtk2-engine-murrine), -GTK 3.20+ (y compris 3.22 et 3.24), et GTK 4.0+. Il est principalement -destiné pour les environnements de bureau Mate et Xfce. +Ce thème fonctionne avec : GTK 2.24 (avec gtk2-engine-murrine), +3.24, et 4.12. Meilleur rendu avec Pango 1.42- ou 1.51+. + +Il est principalement destiné pour les environnements de bureau Mate et Xfce. Après l'installation vous devez redémarrer votre session.} %prep %setup -q -n human-theme-%{version} - -%build +sed -i 's/IconTheme=gnome/IconTheme=mate/g' src/*/index.theme %install mkdir -p %{buildroot}%{_sysconfdir}/profile.d/ +install -pm 644 debian/profile.sh %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh mkdir -p %{buildroot}%{_datadir}/themes/ -install -p -m 644 debian/profile.sh %{buildroot}%{_sysconfdir}/profile.d/%{name}.sh cp -a src/human-theme/ %{buildroot}%{_datadir}/themes/ cp -a src/human-theme-blue/ %{buildroot}%{_datadir}/themes/ cp -a src/human-theme-green/ %{buildroot}%{_datadir}/themes/ @@ -56,36 +57,11 @@ cp -a src/human-theme-orange/ %{buildroot}%{_datadir}/themes/ %{_datadir}/themes/human-theme-green/ %{_datadir}/themes/human-theme-orange/ -%triggerin -- pango -currentver=`rpm -qa --queryformat '%{VERSION}' pango` -required50=1.50 -required44=1.44 -# https://unix.stackexchange.com/a/285928 -if [ "$(printf '%s\n' "$required50" "$currentver" | sort -V | head -n1)" = "$required50" ]; then - # Pango >= 1.50 (same as Pango < 1.44) - echo "Update %{name} for Pango >= 1.50" - sed -i 's/= 1.44 and < 1.50" - sed -i 's/= 1.50) - echo "Update %{name} for Pango < 1.44" - sed -i 's/ - 2.2.0-1 +- New upstream release + * Tue Oct 10 2023 Fabrice Creuzot - 2.1.0-1 - New upstream release diff --git a/opensuse/rpm.sh b/opensuse/rpm.sh index d2f5e07..7fba503 100644 --- a/opensuse/rpm.sh +++ b/opensuse/rpm.sh @@ -3,11 +3,11 @@ cd "$(dirname "$0")" -version="2.1.0" +version="2.2.0" -rm -rf builder/ mkdir -p builder ~/rpmbuild/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS} +find builder/* ! -name "*$version*.rpm" ! -name "*$version*.gz" -exec rm -rf {} + 2>/dev/null # copy to a tmp directory if [ true ]; then @@ -20,7 +20,7 @@ else rm -rf /tmp/$temp/*/builder/ mv /tmp/$temp builder/ - cp /usr/share/licenses/kernel-firmware/GPL-3 builder/$temp/LICENSE + cp /usr/share/licenses/*-firmware/GPL-3 builder/$temp/LICENSE # * = kernel cd builder/ tar czf $temp.tar.gz $temp @@ -32,10 +32,10 @@ fi # create package (rpm sign https://access.redhat.com/articles/3359321) rpmbuild -ba human-theme-gtk.spec -rpm --addsign ~/rpmbuild/RPMS/*/*.rpm -rpm --addsign ~/rpmbuild/SRPMS/*.rpm -mv ~/rpmbuild/RPMS/*/*.rpm builder/ -mv ~/rpmbuild/SRPMS/*.rpm builder/ +rpm --addsign ~/rpmbuild/RPMS/*/human-theme-gtk*.rpm +rpm --addsign ~/rpmbuild/SRPMS/human-theme-gtk*.rpm +mv ~/rpmbuild/RPMS/*/human-theme-gtk*.rpm builder/ +mv ~/rpmbuild/SRPMS/human-theme-gtk*.rpm builder/ echo "===========================" rpm --checksig builder/*.rpm echo "===========================" diff --git a/src/human-theme-blue/gtk-3.0/gtk.css b/src/human-theme-blue/gtk-3.0/gtk.css index eac235b..213bc80 100644 --- a/src/human-theme-blue/gtk-3.0/gtk.css +++ b/src/human-theme-blue/gtk-3.0/gtk.css @@ -1,7 +1,6 @@ /** - * Copyright 2020-2023 | Fabrice Creuzot (luigifab) + * Copyright 2020-2024 | Fabrice Creuzot (luigifab) * https://github.com/luigifab/human-theme - * https://www.luigifab.fr/gtk/human-theme * * Forked from * Copyright 2020 | Mike Kazantsev (mk-fg) @@ -23,27 +22,35 @@ * GNU General Public License (GPL) for more details. */ -@define-color theme_base #FFF; @define-color theme_bg #EDECEB; @define-color theme_fg #000; +@define-color theme_base #FFF; @define-color theme_text #1A1A1A; @define-color theme_selected_bg #86ABD9; @define-color theme_selected_fg #FFF; +@define-color insensitive_fg shade(@theme_bg, 0.65); + @define-color theme_tooltip_bg #F5F5B5; @define-color theme_tooltip_fg #000; @define-color theme_tooltip_border shade(@theme_tooltip_bg, 0.63); @define-color outline @theme_selected_bg; - @define-color link #00E; @define-color visited_link #551A8B; -@define-color error #C00; +@define-color insensitive_selected alpha(@theme_selected_fg, 0.8); @define-color insensitive_text_shadow alpha(@theme_base, 0.5); -@define-color insensitive_fg shade(@theme_bg, 0.65); @define-color checkradio shade(@theme_bg, 0.839); +/* https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/named-colors.html */ +@define-color theme_bg_color @theme_bg; +@define-color theme_fg_color @theme_fg; +@define-color theme_base_color @theme_base; +@define-color theme_text_color @theme_text; +@define-color theme_selected_bg_color @theme_selected_bg; +@define-color theme_selected_fg_color @theme_selected_fg; +@define-color insensitive_fg_color @insensitive_fg; + @import url("gtk-shade.css"); @import url("base.css"); @import url("mate.css"); @import url("xfce.css"); @import url("apps.css"); -@import url("override.css"); diff --git a/src/human-theme-blue/gtk-3.0/override.css b/src/human-theme-blue/gtk-3.0/override.css deleted file mode 120000 index 98c94db..0000000 --- a/src/human-theme-blue/gtk-3.0/override.css +++ /dev/null @@ -1 +0,0 @@ -../../human-theme/gtk-3.0/override.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.0/override.css b/src/human-theme-blue/gtk-4.0/override.css deleted file mode 120000 index d3412f2..0000000 --- a/src/human-theme-blue/gtk-4.0/override.css +++ /dev/null @@ -1 +0,0 @@ -../../human-theme/gtk-4.0/override.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.10/apps.css b/src/human-theme-blue/gtk-4.10/apps.css deleted file mode 120000 index 6fb3ecd..0000000 --- a/src/human-theme-blue/gtk-4.10/apps.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/apps.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.10/base.css b/src/human-theme-blue/gtk-4.10/base.css deleted file mode 120000 index cd9790f..0000000 --- a/src/human-theme-blue/gtk-4.10/base.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/base.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.10/gtk-shade.css b/src/human-theme-blue/gtk-4.10/gtk-shade.css deleted file mode 120000 index 01f2211..0000000 --- a/src/human-theme-blue/gtk-4.10/gtk-shade.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk-shade.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.10/gtk.css b/src/human-theme-blue/gtk-4.10/gtk.css deleted file mode 120000 index ad6b61e..0000000 --- a/src/human-theme-blue/gtk-4.10/gtk.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.10/img b/src/human-theme-blue/gtk-4.10/img deleted file mode 120000 index 18c9885..0000000 --- a/src/human-theme-blue/gtk-4.10/img +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/img/ \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.10/mate.css b/src/human-theme-blue/gtk-4.10/mate.css deleted file mode 120000 index cb14d59..0000000 --- a/src/human-theme-blue/gtk-4.10/mate.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/mate.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.10/override.css b/src/human-theme-blue/gtk-4.10/override.css deleted file mode 120000 index cc2aab8..0000000 --- a/src/human-theme-blue/gtk-4.10/override.css +++ /dev/null @@ -1 +0,0 @@ -../../human-theme/gtk-4.10/override.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.10/xfce.css b/src/human-theme-blue/gtk-4.10/xfce.css deleted file mode 120000 index dbfa61d..0000000 --- a/src/human-theme-blue/gtk-4.10/xfce.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/xfce.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.12/apps.css b/src/human-theme-blue/gtk-4.12/apps.css deleted file mode 120000 index 6fb3ecd..0000000 --- a/src/human-theme-blue/gtk-4.12/apps.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/apps.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.12/base.css b/src/human-theme-blue/gtk-4.12/base.css deleted file mode 120000 index cd9790f..0000000 --- a/src/human-theme-blue/gtk-4.12/base.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/base.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.12/gtk-shade.css b/src/human-theme-blue/gtk-4.12/gtk-shade.css deleted file mode 120000 index 01f2211..0000000 --- a/src/human-theme-blue/gtk-4.12/gtk-shade.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk-shade.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.12/gtk.css b/src/human-theme-blue/gtk-4.12/gtk.css deleted file mode 120000 index ad6b61e..0000000 --- a/src/human-theme-blue/gtk-4.12/gtk.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.12/img b/src/human-theme-blue/gtk-4.12/img deleted file mode 120000 index 18c9885..0000000 --- a/src/human-theme-blue/gtk-4.12/img +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/img/ \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.12/mate.css b/src/human-theme-blue/gtk-4.12/mate.css deleted file mode 120000 index cb14d59..0000000 --- a/src/human-theme-blue/gtk-4.12/mate.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/mate.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.12/override.css b/src/human-theme-blue/gtk-4.12/override.css deleted file mode 120000 index 0a3a58d..0000000 --- a/src/human-theme-blue/gtk-4.12/override.css +++ /dev/null @@ -1 +0,0 @@ -../../human-theme/gtk-4.12/override.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.12/xfce.css b/src/human-theme-blue/gtk-4.12/xfce.css deleted file mode 120000 index dbfa61d..0000000 --- a/src/human-theme-blue/gtk-4.12/xfce.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/xfce.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.2/apps.css b/src/human-theme-blue/gtk-4.2/apps.css deleted file mode 120000 index 6fb3ecd..0000000 --- a/src/human-theme-blue/gtk-4.2/apps.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/apps.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.2/base.css b/src/human-theme-blue/gtk-4.2/base.css deleted file mode 120000 index cd9790f..0000000 --- a/src/human-theme-blue/gtk-4.2/base.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/base.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.2/gtk-shade.css b/src/human-theme-blue/gtk-4.2/gtk-shade.css deleted file mode 120000 index 01f2211..0000000 --- a/src/human-theme-blue/gtk-4.2/gtk-shade.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk-shade.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.2/gtk.css b/src/human-theme-blue/gtk-4.2/gtk.css deleted file mode 120000 index ad6b61e..0000000 --- a/src/human-theme-blue/gtk-4.2/gtk.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.2/img b/src/human-theme-blue/gtk-4.2/img deleted file mode 120000 index 18c9885..0000000 --- a/src/human-theme-blue/gtk-4.2/img +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/img/ \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.2/mate.css b/src/human-theme-blue/gtk-4.2/mate.css deleted file mode 120000 index cb14d59..0000000 --- a/src/human-theme-blue/gtk-4.2/mate.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/mate.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.2/override.css b/src/human-theme-blue/gtk-4.2/override.css deleted file mode 120000 index 3aa1dbc..0000000 --- a/src/human-theme-blue/gtk-4.2/override.css +++ /dev/null @@ -1 +0,0 @@ -../../human-theme/gtk-4.2/override.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.2/xfce.css b/src/human-theme-blue/gtk-4.2/xfce.css deleted file mode 120000 index dbfa61d..0000000 --- a/src/human-theme-blue/gtk-4.2/xfce.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/xfce.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.4/apps.css b/src/human-theme-blue/gtk-4.4/apps.css deleted file mode 120000 index 6fb3ecd..0000000 --- a/src/human-theme-blue/gtk-4.4/apps.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/apps.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.4/base.css b/src/human-theme-blue/gtk-4.4/base.css deleted file mode 120000 index cd9790f..0000000 --- a/src/human-theme-blue/gtk-4.4/base.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/base.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.4/gtk-shade.css b/src/human-theme-blue/gtk-4.4/gtk-shade.css deleted file mode 120000 index 01f2211..0000000 --- a/src/human-theme-blue/gtk-4.4/gtk-shade.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk-shade.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.4/gtk.css b/src/human-theme-blue/gtk-4.4/gtk.css deleted file mode 120000 index ad6b61e..0000000 --- a/src/human-theme-blue/gtk-4.4/gtk.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.4/img b/src/human-theme-blue/gtk-4.4/img deleted file mode 120000 index 18c9885..0000000 --- a/src/human-theme-blue/gtk-4.4/img +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/img/ \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.4/mate.css b/src/human-theme-blue/gtk-4.4/mate.css deleted file mode 120000 index cb14d59..0000000 --- a/src/human-theme-blue/gtk-4.4/mate.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/mate.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.4/override.css b/src/human-theme-blue/gtk-4.4/override.css deleted file mode 120000 index 1f571bb..0000000 --- a/src/human-theme-blue/gtk-4.4/override.css +++ /dev/null @@ -1 +0,0 @@ -../../human-theme/gtk-4.4/override.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.4/xfce.css b/src/human-theme-blue/gtk-4.4/xfce.css deleted file mode 120000 index dbfa61d..0000000 --- a/src/human-theme-blue/gtk-4.4/xfce.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/xfce.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.6/apps.css b/src/human-theme-blue/gtk-4.6/apps.css deleted file mode 120000 index 6fb3ecd..0000000 --- a/src/human-theme-blue/gtk-4.6/apps.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/apps.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.6/base.css b/src/human-theme-blue/gtk-4.6/base.css deleted file mode 120000 index cd9790f..0000000 --- a/src/human-theme-blue/gtk-4.6/base.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/base.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.6/gtk-shade.css b/src/human-theme-blue/gtk-4.6/gtk-shade.css deleted file mode 120000 index 01f2211..0000000 --- a/src/human-theme-blue/gtk-4.6/gtk-shade.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk-shade.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.6/gtk.css b/src/human-theme-blue/gtk-4.6/gtk.css deleted file mode 120000 index ad6b61e..0000000 --- a/src/human-theme-blue/gtk-4.6/gtk.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.6/img b/src/human-theme-blue/gtk-4.6/img deleted file mode 120000 index 18c9885..0000000 --- a/src/human-theme-blue/gtk-4.6/img +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/img/ \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.6/mate.css b/src/human-theme-blue/gtk-4.6/mate.css deleted file mode 120000 index cb14d59..0000000 --- a/src/human-theme-blue/gtk-4.6/mate.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/mate.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.6/override.css b/src/human-theme-blue/gtk-4.6/override.css deleted file mode 120000 index fe8e5af..0000000 --- a/src/human-theme-blue/gtk-4.6/override.css +++ /dev/null @@ -1 +0,0 @@ -../../human-theme/gtk-4.6/override.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.6/xfce.css b/src/human-theme-blue/gtk-4.6/xfce.css deleted file mode 120000 index dbfa61d..0000000 --- a/src/human-theme-blue/gtk-4.6/xfce.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/xfce.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.8/apps.css b/src/human-theme-blue/gtk-4.8/apps.css deleted file mode 120000 index 6fb3ecd..0000000 --- a/src/human-theme-blue/gtk-4.8/apps.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/apps.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.8/base.css b/src/human-theme-blue/gtk-4.8/base.css deleted file mode 120000 index cd9790f..0000000 --- a/src/human-theme-blue/gtk-4.8/base.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/base.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.8/gtk-shade.css b/src/human-theme-blue/gtk-4.8/gtk-shade.css deleted file mode 120000 index 01f2211..0000000 --- a/src/human-theme-blue/gtk-4.8/gtk-shade.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk-shade.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.8/gtk.css b/src/human-theme-blue/gtk-4.8/gtk.css deleted file mode 120000 index ad6b61e..0000000 --- a/src/human-theme-blue/gtk-4.8/gtk.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.8/img b/src/human-theme-blue/gtk-4.8/img deleted file mode 120000 index 18c9885..0000000 --- a/src/human-theme-blue/gtk-4.8/img +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/img/ \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.8/mate.css b/src/human-theme-blue/gtk-4.8/mate.css deleted file mode 120000 index cb14d59..0000000 --- a/src/human-theme-blue/gtk-4.8/mate.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/mate.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.8/override.css b/src/human-theme-blue/gtk-4.8/override.css deleted file mode 120000 index 13dd3e1..0000000 --- a/src/human-theme-blue/gtk-4.8/override.css +++ /dev/null @@ -1 +0,0 @@ -../../human-theme/gtk-4.8/override.css \ No newline at end of file diff --git a/src/human-theme-blue/gtk-4.8/xfce.css b/src/human-theme-blue/gtk-4.8/xfce.css deleted file mode 120000 index dbfa61d..0000000 --- a/src/human-theme-blue/gtk-4.8/xfce.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/xfce.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-3.0/gtk.css b/src/human-theme-green/gtk-3.0/gtk.css index 1fc6d73..af5e6f9 100644 --- a/src/human-theme-green/gtk-3.0/gtk.css +++ b/src/human-theme-green/gtk-3.0/gtk.css @@ -1,7 +1,6 @@ /** - * Copyright 2020-2023 | Fabrice Creuzot (luigifab) + * Copyright 2020-2024 | Fabrice Creuzot (luigifab) * https://github.com/luigifab/human-theme - * https://www.luigifab.fr/gtk/human-theme * * Forked from * Copyright 2020 | Mike Kazantsev (mk-fg) @@ -23,27 +22,35 @@ * GNU General Public License (GPL) for more details. */ -@define-color theme_base #FFF; @define-color theme_bg #EDECEB; @define-color theme_fg #000; +@define-color theme_base #FFF; @define-color theme_text #1A1A1A; @define-color theme_selected_bg #B9C0A9; @define-color theme_selected_fg #42453E; +@define-color insensitive_fg shade(@theme_bg, 0.65); + @define-color theme_tooltip_bg #EAF5B5; @define-color theme_tooltip_fg #000; @define-color theme_tooltip_border shade(@theme_tooltip_bg, 0.63); @define-color outline @theme_selected_bg; - @define-color link #00E; @define-color visited_link #551A8B; -@define-color error #C00; +@define-color insensitive_selected alpha(@theme_selected_fg, 0.8); @define-color insensitive_text_shadow alpha(@theme_base, 0.5); -@define-color insensitive_fg shade(@theme_bg, 0.65); @define-color checkradio shade(@theme_bg, 0.839); +/* https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/named-colors.html */ +@define-color theme_bg_color @theme_bg; +@define-color theme_fg_color @theme_fg; +@define-color theme_base_color @theme_base; +@define-color theme_text_color @theme_text; +@define-color theme_selected_bg_color @theme_selected_bg; +@define-color theme_selected_fg_color @theme_selected_fg; +@define-color insensitive_fg_color @insensitive_fg; + @import url("gtk-shade.css"); @import url("base.css"); @import url("mate.css"); @import url("xfce.css"); @import url("apps.css"); -@import url("override.css"); diff --git a/src/human-theme-green/gtk-3.0/override.css b/src/human-theme-green/gtk-3.0/override.css deleted file mode 120000 index 98c94db..0000000 --- a/src/human-theme-green/gtk-3.0/override.css +++ /dev/null @@ -1 +0,0 @@ -../../human-theme/gtk-3.0/override.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.0/override.css b/src/human-theme-green/gtk-4.0/override.css deleted file mode 120000 index d3412f2..0000000 --- a/src/human-theme-green/gtk-4.0/override.css +++ /dev/null @@ -1 +0,0 @@ -../../human-theme/gtk-4.0/override.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.10/apps.css b/src/human-theme-green/gtk-4.10/apps.css deleted file mode 120000 index 6fb3ecd..0000000 --- a/src/human-theme-green/gtk-4.10/apps.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/apps.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.10/base.css b/src/human-theme-green/gtk-4.10/base.css deleted file mode 120000 index cd9790f..0000000 --- a/src/human-theme-green/gtk-4.10/base.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/base.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.10/gtk-shade.css b/src/human-theme-green/gtk-4.10/gtk-shade.css deleted file mode 120000 index 01f2211..0000000 --- a/src/human-theme-green/gtk-4.10/gtk-shade.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk-shade.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.10/gtk.css b/src/human-theme-green/gtk-4.10/gtk.css deleted file mode 120000 index ad6b61e..0000000 --- a/src/human-theme-green/gtk-4.10/gtk.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.10/img b/src/human-theme-green/gtk-4.10/img deleted file mode 120000 index 18c9885..0000000 --- a/src/human-theme-green/gtk-4.10/img +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/img/ \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.10/mate.css b/src/human-theme-green/gtk-4.10/mate.css deleted file mode 120000 index cb14d59..0000000 --- a/src/human-theme-green/gtk-4.10/mate.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/mate.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.10/override.css b/src/human-theme-green/gtk-4.10/override.css deleted file mode 120000 index cc2aab8..0000000 --- a/src/human-theme-green/gtk-4.10/override.css +++ /dev/null @@ -1 +0,0 @@ -../../human-theme/gtk-4.10/override.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.10/xfce.css b/src/human-theme-green/gtk-4.10/xfce.css deleted file mode 120000 index dbfa61d..0000000 --- a/src/human-theme-green/gtk-4.10/xfce.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/xfce.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.12/apps.css b/src/human-theme-green/gtk-4.12/apps.css deleted file mode 120000 index 6fb3ecd..0000000 --- a/src/human-theme-green/gtk-4.12/apps.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/apps.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.12/base.css b/src/human-theme-green/gtk-4.12/base.css deleted file mode 120000 index cd9790f..0000000 --- a/src/human-theme-green/gtk-4.12/base.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/base.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.12/gtk-shade.css b/src/human-theme-green/gtk-4.12/gtk-shade.css deleted file mode 120000 index 01f2211..0000000 --- a/src/human-theme-green/gtk-4.12/gtk-shade.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk-shade.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.12/gtk.css b/src/human-theme-green/gtk-4.12/gtk.css deleted file mode 120000 index ad6b61e..0000000 --- a/src/human-theme-green/gtk-4.12/gtk.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.12/img b/src/human-theme-green/gtk-4.12/img deleted file mode 120000 index 18c9885..0000000 --- a/src/human-theme-green/gtk-4.12/img +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/img/ \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.12/mate.css b/src/human-theme-green/gtk-4.12/mate.css deleted file mode 120000 index cb14d59..0000000 --- a/src/human-theme-green/gtk-4.12/mate.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/mate.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.12/override.css b/src/human-theme-green/gtk-4.12/override.css deleted file mode 120000 index 0a3a58d..0000000 --- a/src/human-theme-green/gtk-4.12/override.css +++ /dev/null @@ -1 +0,0 @@ -../../human-theme/gtk-4.12/override.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.12/xfce.css b/src/human-theme-green/gtk-4.12/xfce.css deleted file mode 120000 index dbfa61d..0000000 --- a/src/human-theme-green/gtk-4.12/xfce.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/xfce.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.2/apps.css b/src/human-theme-green/gtk-4.2/apps.css deleted file mode 120000 index 6fb3ecd..0000000 --- a/src/human-theme-green/gtk-4.2/apps.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/apps.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.2/base.css b/src/human-theme-green/gtk-4.2/base.css deleted file mode 120000 index cd9790f..0000000 --- a/src/human-theme-green/gtk-4.2/base.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/base.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.2/gtk-shade.css b/src/human-theme-green/gtk-4.2/gtk-shade.css deleted file mode 120000 index 01f2211..0000000 --- a/src/human-theme-green/gtk-4.2/gtk-shade.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk-shade.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.2/gtk.css b/src/human-theme-green/gtk-4.2/gtk.css deleted file mode 120000 index ad6b61e..0000000 --- a/src/human-theme-green/gtk-4.2/gtk.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.2/img b/src/human-theme-green/gtk-4.2/img deleted file mode 120000 index 18c9885..0000000 --- a/src/human-theme-green/gtk-4.2/img +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/img/ \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.2/mate.css b/src/human-theme-green/gtk-4.2/mate.css deleted file mode 120000 index cb14d59..0000000 --- a/src/human-theme-green/gtk-4.2/mate.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/mate.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.2/override.css b/src/human-theme-green/gtk-4.2/override.css deleted file mode 120000 index 3aa1dbc..0000000 --- a/src/human-theme-green/gtk-4.2/override.css +++ /dev/null @@ -1 +0,0 @@ -../../human-theme/gtk-4.2/override.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.2/xfce.css b/src/human-theme-green/gtk-4.2/xfce.css deleted file mode 120000 index dbfa61d..0000000 --- a/src/human-theme-green/gtk-4.2/xfce.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/xfce.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.4/apps.css b/src/human-theme-green/gtk-4.4/apps.css deleted file mode 120000 index 6fb3ecd..0000000 --- a/src/human-theme-green/gtk-4.4/apps.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/apps.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.4/base.css b/src/human-theme-green/gtk-4.4/base.css deleted file mode 120000 index cd9790f..0000000 --- a/src/human-theme-green/gtk-4.4/base.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/base.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.4/gtk-shade.css b/src/human-theme-green/gtk-4.4/gtk-shade.css deleted file mode 120000 index 01f2211..0000000 --- a/src/human-theme-green/gtk-4.4/gtk-shade.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk-shade.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.4/gtk.css b/src/human-theme-green/gtk-4.4/gtk.css deleted file mode 120000 index ad6b61e..0000000 --- a/src/human-theme-green/gtk-4.4/gtk.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.4/img b/src/human-theme-green/gtk-4.4/img deleted file mode 120000 index 18c9885..0000000 --- a/src/human-theme-green/gtk-4.4/img +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/img/ \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.4/mate.css b/src/human-theme-green/gtk-4.4/mate.css deleted file mode 120000 index cb14d59..0000000 --- a/src/human-theme-green/gtk-4.4/mate.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/mate.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.4/override.css b/src/human-theme-green/gtk-4.4/override.css deleted file mode 120000 index 1f571bb..0000000 --- a/src/human-theme-green/gtk-4.4/override.css +++ /dev/null @@ -1 +0,0 @@ -../../human-theme/gtk-4.4/override.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.4/xfce.css b/src/human-theme-green/gtk-4.4/xfce.css deleted file mode 120000 index dbfa61d..0000000 --- a/src/human-theme-green/gtk-4.4/xfce.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/xfce.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.6/apps.css b/src/human-theme-green/gtk-4.6/apps.css deleted file mode 120000 index 6fb3ecd..0000000 --- a/src/human-theme-green/gtk-4.6/apps.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/apps.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.6/base.css b/src/human-theme-green/gtk-4.6/base.css deleted file mode 120000 index cd9790f..0000000 --- a/src/human-theme-green/gtk-4.6/base.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/base.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.6/gtk-shade.css b/src/human-theme-green/gtk-4.6/gtk-shade.css deleted file mode 120000 index 01f2211..0000000 --- a/src/human-theme-green/gtk-4.6/gtk-shade.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk-shade.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.6/gtk.css b/src/human-theme-green/gtk-4.6/gtk.css deleted file mode 120000 index ad6b61e..0000000 --- a/src/human-theme-green/gtk-4.6/gtk.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.6/img b/src/human-theme-green/gtk-4.6/img deleted file mode 120000 index 18c9885..0000000 --- a/src/human-theme-green/gtk-4.6/img +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/img/ \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.6/mate.css b/src/human-theme-green/gtk-4.6/mate.css deleted file mode 120000 index cb14d59..0000000 --- a/src/human-theme-green/gtk-4.6/mate.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/mate.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.6/override.css b/src/human-theme-green/gtk-4.6/override.css deleted file mode 120000 index fe8e5af..0000000 --- a/src/human-theme-green/gtk-4.6/override.css +++ /dev/null @@ -1 +0,0 @@ -../../human-theme/gtk-4.6/override.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.6/xfce.css b/src/human-theme-green/gtk-4.6/xfce.css deleted file mode 120000 index dbfa61d..0000000 --- a/src/human-theme-green/gtk-4.6/xfce.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/xfce.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.8/apps.css b/src/human-theme-green/gtk-4.8/apps.css deleted file mode 120000 index 6fb3ecd..0000000 --- a/src/human-theme-green/gtk-4.8/apps.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/apps.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.8/base.css b/src/human-theme-green/gtk-4.8/base.css deleted file mode 120000 index cd9790f..0000000 --- a/src/human-theme-green/gtk-4.8/base.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/base.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.8/gtk-shade.css b/src/human-theme-green/gtk-4.8/gtk-shade.css deleted file mode 120000 index 01f2211..0000000 --- a/src/human-theme-green/gtk-4.8/gtk-shade.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk-shade.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.8/gtk.css b/src/human-theme-green/gtk-4.8/gtk.css deleted file mode 120000 index ad6b61e..0000000 --- a/src/human-theme-green/gtk-4.8/gtk.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.8/img b/src/human-theme-green/gtk-4.8/img deleted file mode 120000 index 18c9885..0000000 --- a/src/human-theme-green/gtk-4.8/img +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/img/ \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.8/mate.css b/src/human-theme-green/gtk-4.8/mate.css deleted file mode 120000 index cb14d59..0000000 --- a/src/human-theme-green/gtk-4.8/mate.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/mate.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.8/override.css b/src/human-theme-green/gtk-4.8/override.css deleted file mode 120000 index 13dd3e1..0000000 --- a/src/human-theme-green/gtk-4.8/override.css +++ /dev/null @@ -1 +0,0 @@ -../../human-theme/gtk-4.8/override.css \ No newline at end of file diff --git a/src/human-theme-green/gtk-4.8/xfce.css b/src/human-theme-green/gtk-4.8/xfce.css deleted file mode 120000 index dbfa61d..0000000 --- a/src/human-theme-green/gtk-4.8/xfce.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/xfce.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-3.0/gtk.css b/src/human-theme-orange/gtk-3.0/gtk.css index d362adf..b8747e6 100644 --- a/src/human-theme-orange/gtk-3.0/gtk.css +++ b/src/human-theme-orange/gtk-3.0/gtk.css @@ -1,7 +1,6 @@ /** - * Copyright 2020-2023 | Fabrice Creuzot (luigifab) + * Copyright 2020-2024 | Fabrice Creuzot (luigifab) * https://github.com/luigifab/human-theme - * https://www.luigifab.fr/gtk/human-theme * * Forked from * Copyright 2020 | Mike Kazantsev (mk-fg) @@ -23,27 +22,35 @@ * GNU General Public License (GPL) for more details. */ -@define-color theme_base #FFF; @define-color theme_bg #EFEBE7; @define-color theme_fg #101010; +@define-color theme_base #FFF; @define-color theme_text #1A1A1A; @define-color theme_selected_bg #FFBE6B; @define-color theme_selected_fg #1A1A1A; +@define-color insensitive_fg shade(@theme_bg, 0.65); + @define-color theme_tooltip_bg #F5F5B5; @define-color theme_tooltip_fg #000; @define-color theme_tooltip_border shade(@theme_tooltip_bg, 0.63); @define-color outline @theme_selected_bg; - @define-color link #00E; @define-color visited_link #551A8B; -@define-color error #C00; +@define-color insensitive_selected alpha(@theme_selected_fg, 0.8); @define-color insensitive_text_shadow alpha(@theme_base, 0.5); -@define-color insensitive_fg shade(@theme_bg, 0.65); @define-color checkradio shade(@theme_bg, 0.839); +/* https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/named-colors.html */ +@define-color theme_bg_color @theme_bg; +@define-color theme_fg_color @theme_fg; +@define-color theme_base_color @theme_base; +@define-color theme_text_color @theme_text; +@define-color theme_selected_bg_color @theme_selected_bg; +@define-color theme_selected_fg_color @theme_selected_fg; +@define-color insensitive_fg_color @insensitive_fg; + @import url("gtk-shade.css"); @import url("base.css"); @import url("mate.css"); @import url("xfce.css"); @import url("apps.css"); -@import url("override.css"); diff --git a/src/human-theme-orange/gtk-3.0/override.css b/src/human-theme-orange/gtk-3.0/override.css deleted file mode 120000 index 98c94db..0000000 --- a/src/human-theme-orange/gtk-3.0/override.css +++ /dev/null @@ -1 +0,0 @@ -../../human-theme/gtk-3.0/override.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.0/override.css b/src/human-theme-orange/gtk-4.0/override.css deleted file mode 120000 index d3412f2..0000000 --- a/src/human-theme-orange/gtk-4.0/override.css +++ /dev/null @@ -1 +0,0 @@ -../../human-theme/gtk-4.0/override.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.10/apps.css b/src/human-theme-orange/gtk-4.10/apps.css deleted file mode 120000 index 6fb3ecd..0000000 --- a/src/human-theme-orange/gtk-4.10/apps.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/apps.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.10/base.css b/src/human-theme-orange/gtk-4.10/base.css deleted file mode 120000 index cd9790f..0000000 --- a/src/human-theme-orange/gtk-4.10/base.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/base.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.10/gtk-shade.css b/src/human-theme-orange/gtk-4.10/gtk-shade.css deleted file mode 120000 index 01f2211..0000000 --- a/src/human-theme-orange/gtk-4.10/gtk-shade.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk-shade.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.10/gtk.css b/src/human-theme-orange/gtk-4.10/gtk.css deleted file mode 120000 index ad6b61e..0000000 --- a/src/human-theme-orange/gtk-4.10/gtk.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.10/img b/src/human-theme-orange/gtk-4.10/img deleted file mode 120000 index 18c9885..0000000 --- a/src/human-theme-orange/gtk-4.10/img +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/img/ \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.10/mate.css b/src/human-theme-orange/gtk-4.10/mate.css deleted file mode 120000 index cb14d59..0000000 --- a/src/human-theme-orange/gtk-4.10/mate.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/mate.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.10/override.css b/src/human-theme-orange/gtk-4.10/override.css deleted file mode 120000 index cc2aab8..0000000 --- a/src/human-theme-orange/gtk-4.10/override.css +++ /dev/null @@ -1 +0,0 @@ -../../human-theme/gtk-4.10/override.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.10/xfce.css b/src/human-theme-orange/gtk-4.10/xfce.css deleted file mode 120000 index dbfa61d..0000000 --- a/src/human-theme-orange/gtk-4.10/xfce.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/xfce.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.12/apps.css b/src/human-theme-orange/gtk-4.12/apps.css deleted file mode 120000 index 6fb3ecd..0000000 --- a/src/human-theme-orange/gtk-4.12/apps.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/apps.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.12/base.css b/src/human-theme-orange/gtk-4.12/base.css deleted file mode 120000 index cd9790f..0000000 --- a/src/human-theme-orange/gtk-4.12/base.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/base.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.12/gtk-shade.css b/src/human-theme-orange/gtk-4.12/gtk-shade.css deleted file mode 120000 index 01f2211..0000000 --- a/src/human-theme-orange/gtk-4.12/gtk-shade.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk-shade.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.12/gtk.css b/src/human-theme-orange/gtk-4.12/gtk.css deleted file mode 120000 index ad6b61e..0000000 --- a/src/human-theme-orange/gtk-4.12/gtk.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.12/img b/src/human-theme-orange/gtk-4.12/img deleted file mode 120000 index 18c9885..0000000 --- a/src/human-theme-orange/gtk-4.12/img +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/img/ \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.12/mate.css b/src/human-theme-orange/gtk-4.12/mate.css deleted file mode 120000 index cb14d59..0000000 --- a/src/human-theme-orange/gtk-4.12/mate.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/mate.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.12/override.css b/src/human-theme-orange/gtk-4.12/override.css deleted file mode 120000 index 0a3a58d..0000000 --- a/src/human-theme-orange/gtk-4.12/override.css +++ /dev/null @@ -1 +0,0 @@ -../../human-theme/gtk-4.12/override.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.12/xfce.css b/src/human-theme-orange/gtk-4.12/xfce.css deleted file mode 120000 index dbfa61d..0000000 --- a/src/human-theme-orange/gtk-4.12/xfce.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/xfce.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.2/apps.css b/src/human-theme-orange/gtk-4.2/apps.css deleted file mode 120000 index 6fb3ecd..0000000 --- a/src/human-theme-orange/gtk-4.2/apps.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/apps.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.2/base.css b/src/human-theme-orange/gtk-4.2/base.css deleted file mode 120000 index cd9790f..0000000 --- a/src/human-theme-orange/gtk-4.2/base.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/base.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.2/gtk-shade.css b/src/human-theme-orange/gtk-4.2/gtk-shade.css deleted file mode 120000 index 01f2211..0000000 --- a/src/human-theme-orange/gtk-4.2/gtk-shade.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk-shade.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.2/gtk.css b/src/human-theme-orange/gtk-4.2/gtk.css deleted file mode 120000 index ad6b61e..0000000 --- a/src/human-theme-orange/gtk-4.2/gtk.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.2/img b/src/human-theme-orange/gtk-4.2/img deleted file mode 120000 index 18c9885..0000000 --- a/src/human-theme-orange/gtk-4.2/img +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/img/ \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.2/mate.css b/src/human-theme-orange/gtk-4.2/mate.css deleted file mode 120000 index cb14d59..0000000 --- a/src/human-theme-orange/gtk-4.2/mate.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/mate.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.2/override.css b/src/human-theme-orange/gtk-4.2/override.css deleted file mode 120000 index 3aa1dbc..0000000 --- a/src/human-theme-orange/gtk-4.2/override.css +++ /dev/null @@ -1 +0,0 @@ -../../human-theme/gtk-4.2/override.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.2/xfce.css b/src/human-theme-orange/gtk-4.2/xfce.css deleted file mode 120000 index dbfa61d..0000000 --- a/src/human-theme-orange/gtk-4.2/xfce.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/xfce.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.4/apps.css b/src/human-theme-orange/gtk-4.4/apps.css deleted file mode 120000 index 6fb3ecd..0000000 --- a/src/human-theme-orange/gtk-4.4/apps.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/apps.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.4/base.css b/src/human-theme-orange/gtk-4.4/base.css deleted file mode 120000 index cd9790f..0000000 --- a/src/human-theme-orange/gtk-4.4/base.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/base.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.4/gtk-shade.css b/src/human-theme-orange/gtk-4.4/gtk-shade.css deleted file mode 120000 index 01f2211..0000000 --- a/src/human-theme-orange/gtk-4.4/gtk-shade.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk-shade.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.4/gtk.css b/src/human-theme-orange/gtk-4.4/gtk.css deleted file mode 120000 index ad6b61e..0000000 --- a/src/human-theme-orange/gtk-4.4/gtk.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.4/img b/src/human-theme-orange/gtk-4.4/img deleted file mode 120000 index 18c9885..0000000 --- a/src/human-theme-orange/gtk-4.4/img +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/img/ \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.4/mate.css b/src/human-theme-orange/gtk-4.4/mate.css deleted file mode 120000 index cb14d59..0000000 --- a/src/human-theme-orange/gtk-4.4/mate.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/mate.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.4/override.css b/src/human-theme-orange/gtk-4.4/override.css deleted file mode 120000 index 1f571bb..0000000 --- a/src/human-theme-orange/gtk-4.4/override.css +++ /dev/null @@ -1 +0,0 @@ -../../human-theme/gtk-4.4/override.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.4/xfce.css b/src/human-theme-orange/gtk-4.4/xfce.css deleted file mode 120000 index dbfa61d..0000000 --- a/src/human-theme-orange/gtk-4.4/xfce.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/xfce.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.6/apps.css b/src/human-theme-orange/gtk-4.6/apps.css deleted file mode 120000 index 6fb3ecd..0000000 --- a/src/human-theme-orange/gtk-4.6/apps.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/apps.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.6/base.css b/src/human-theme-orange/gtk-4.6/base.css deleted file mode 120000 index cd9790f..0000000 --- a/src/human-theme-orange/gtk-4.6/base.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/base.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.6/gtk-shade.css b/src/human-theme-orange/gtk-4.6/gtk-shade.css deleted file mode 120000 index 01f2211..0000000 --- a/src/human-theme-orange/gtk-4.6/gtk-shade.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk-shade.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.6/gtk.css b/src/human-theme-orange/gtk-4.6/gtk.css deleted file mode 120000 index ad6b61e..0000000 --- a/src/human-theme-orange/gtk-4.6/gtk.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.6/img b/src/human-theme-orange/gtk-4.6/img deleted file mode 120000 index 18c9885..0000000 --- a/src/human-theme-orange/gtk-4.6/img +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/img/ \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.6/mate.css b/src/human-theme-orange/gtk-4.6/mate.css deleted file mode 120000 index cb14d59..0000000 --- a/src/human-theme-orange/gtk-4.6/mate.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/mate.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.6/override.css b/src/human-theme-orange/gtk-4.6/override.css deleted file mode 120000 index fe8e5af..0000000 --- a/src/human-theme-orange/gtk-4.6/override.css +++ /dev/null @@ -1 +0,0 @@ -../../human-theme/gtk-4.6/override.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.6/xfce.css b/src/human-theme-orange/gtk-4.6/xfce.css deleted file mode 120000 index dbfa61d..0000000 --- a/src/human-theme-orange/gtk-4.6/xfce.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/xfce.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.8/apps.css b/src/human-theme-orange/gtk-4.8/apps.css deleted file mode 120000 index 6fb3ecd..0000000 --- a/src/human-theme-orange/gtk-4.8/apps.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/apps.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.8/base.css b/src/human-theme-orange/gtk-4.8/base.css deleted file mode 120000 index cd9790f..0000000 --- a/src/human-theme-orange/gtk-4.8/base.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/base.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.8/gtk-shade.css b/src/human-theme-orange/gtk-4.8/gtk-shade.css deleted file mode 120000 index 01f2211..0000000 --- a/src/human-theme-orange/gtk-4.8/gtk-shade.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk-shade.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.8/gtk.css b/src/human-theme-orange/gtk-4.8/gtk.css deleted file mode 120000 index ad6b61e..0000000 --- a/src/human-theme-orange/gtk-4.8/gtk.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.8/img b/src/human-theme-orange/gtk-4.8/img deleted file mode 120000 index 18c9885..0000000 --- a/src/human-theme-orange/gtk-4.8/img +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/img/ \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.8/mate.css b/src/human-theme-orange/gtk-4.8/mate.css deleted file mode 120000 index cb14d59..0000000 --- a/src/human-theme-orange/gtk-4.8/mate.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/mate.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.8/override.css b/src/human-theme-orange/gtk-4.8/override.css deleted file mode 120000 index 13dd3e1..0000000 --- a/src/human-theme-orange/gtk-4.8/override.css +++ /dev/null @@ -1 +0,0 @@ -../../human-theme/gtk-4.8/override.css \ No newline at end of file diff --git a/src/human-theme-orange/gtk-4.8/xfce.css b/src/human-theme-orange/gtk-4.8/xfce.css deleted file mode 120000 index dbfa61d..0000000 --- a/src/human-theme-orange/gtk-4.8/xfce.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/xfce.css \ No newline at end of file diff --git a/src/human-theme/gtk-3.0/apps.css b/src/human-theme/gtk-3.0/apps.css index 4ebb703..cc7b9db 100644 --- a/src/human-theme/gtk-3.0/apps.css +++ b/src/human-theme/gtk-3.0/apps.css @@ -1,7 +1,6 @@ /** - * Copyright 2020-2023 | Fabrice Creuzot (luigifab) + * Copyright 2020-2024 | Fabrice Creuzot (luigifab) * https://github.com/luigifab/human-theme - * https://www.luigifab.fr/gtk/human-theme * * Forked from * Copyright 2020 | Mike Kazantsev (mk-fg) @@ -23,20 +22,13 @@ * GNU General Public License (GPL) for more details. */ -/* --- ubuntu welcome and software center --- */ - -@define-color theme_bg_color @theme_bg; -@define-color theme_fg_color @theme_fg; -@define-color theme_selected_bg_color @theme_selected_bg; -@define-color theme_selected_fg_color @theme_selected_fg; - /* --- audacity --- */ window > box > widget > widget { background-color: @theme_bg; } -/* --- geany pluma --- */ +/* --- geany and pluma --- */ #GeanyMainWindow #notebook_info { margin-bottom: 5px; @@ -51,15 +43,57 @@ window.pluma-window notebook stack > box scrolledwindow { border: 0; } -notebook widget scrollbar.vertical { +#GeanyMainWindow notebook widget scrollbar.vertical:dir(ltr) { margin-left: 0; } -notebook widget scrollbar.horizontal { +#GeanyMainWindow notebook widget scrollbar.vertical:dir(rtl) { + margin-right: 0; +} + +#GeanyMainWindow notebook widget scrollbar.horizontal { + margin-top: 0; +} + +/* --- libre office --- */ + +window.libreoffice-window > grid.horizontal > grid.horizontal > scrolledwindow > viewport.frame { + border: 0; +} + +window.libreoffice-window > grid.horizontal > grid.horizontal > scrolledwindow + button.flat.small-button { + min-width: 24px; + min-height: 24px; + border-bottom: 1px solid @menubar_border_bot; + border-radius: 0; +} + +window.libreoffice-window > grid.horizontal > grid.horizontal { + background: linear-gradient(to bottom, @menubar_grad_top, @menubar_grad_bot); +} + +/* --- caja --- */ + +window.caja-navigation-window notebook.caja-notebook scrolledwindow.frame scrollbar.vertical:dir(ltr) { + margin-left: 0; + background: @theme_bg; +} + +window.caja-navigation-window notebook.caja-notebook scrolledwindow.frame scrollbar.vertical:dir(rtl) { + margin-right: 0; + background: @theme_bg; +} + +window.caja-navigation-window notebook.caja-notebook scrolledwindow.frame.view scrollbar.vertical { + /* margin-top: 0; */ +} + +window.caja-navigation-window notebook.caja-notebook scrolledwindow.frame scrollbar.horizontal { margin-top: 0; + background: @theme_bg; } -/* fix for some maximized windows https://github.com/mate-desktop/mate-desktop/issues/291 */ +/* --- fix for some maximized windows https://github.com/mate-desktop/mate-desktop/issues/291 --- */ #GeanyMainWindow.maximized:dir(ltr) #notebook_info stack, window.background.maximized.engrampa-window:dir(ltr) > grid.horizontal > paned.horizontal > scrolledwindow.frame, diff --git a/src/human-theme/gtk-3.0/base.css b/src/human-theme/gtk-3.0/base.css index 1ac182d..9d0d2ef 100644 --- a/src/human-theme/gtk-3.0/base.css +++ b/src/human-theme/gtk-3.0/base.css @@ -1,7 +1,6 @@ /** - * Copyright 2020-2023 | Fabrice Creuzot (luigifab) + * Copyright 2020-2024 | Fabrice Creuzot (luigifab) * https://github.com/luigifab/human-theme - * https://www.luigifab.fr/gtk/human-theme * * Forked from * Copyright 2020 | Mike Kazantsev (mk-fg) @@ -425,7 +424,7 @@ statusbar { } box + statusbar { - margin: -7px -10px -4px; /* WARNING! -7px -10px -5px since Pango 1.44 else -7px -10px -4px */ + margin: -7px -10px -4px; /* WARNING! -7px -10px -5px for Pango 1.44..1.49 else -7px -10px -4px */ } statusbar.classic { @@ -467,6 +466,14 @@ statusbar.classic frame > box { margin: -4px -2px -3px; /* with gtk3-classic (appearance__smaller-statusbar.patch) */ } +statusbar progressbar.horizontal { + font-size: 85%; +} + +statusbar progressbar.horizontal text { + padding-top: 4px; +} + paned + box > statusbar { /* geany, engrampa */ margin: -8px -10px -4px; } @@ -673,7 +680,7 @@ button.color colorswatch { entry { margin: 1px; - padding: 3px; /* WARNING! 3px 3px 2px since Pango 1.44 else 3px */ + padding: 3px; /* WARNING! 3px 3px 2px for Pango 1.44..1.49 else 3px */ color: @theme_text; border: 1px solid @entry_border; border-radius: 2.4px; @@ -709,7 +716,7 @@ entry:disabled { /* --- combo box --- */ combobox entry { - padding: 4px 3px; /* WARNING! 4px 3px 2px since Pango 1.44 else 4px 3px */ + padding: 4px 3px; /* WARNING! 4px 3px 2px for Pango 1.44..1.49 else 4px 3px */ } combobox button { @@ -1142,6 +1149,7 @@ menubar menuitem { text-shadow: none; /* libreoffice 6.4.1 */ color: @theme_fg; /* libreoffice 6.4.1 */ border: 1px solid transparent; + border-radius: 2px 2px 0 0; } menubar menuitem:dir(rtl) { @@ -1152,7 +1160,6 @@ menubar menuitem:hover { color: @menuitem_hover; border: 1px solid @menuitem_hover_border; border-bottom: 0; - border-radius: 2px 2px 0 0; background: radial-gradient(ellipse 110% 50%, @menuitem_hover_glaze_glow_center, @@ -1215,7 +1222,7 @@ menu menuitem label:dir(rtl) { /* --- menu item elements --- */ menuitem.tearoff, -menuitem.tearoff:dir(rtl) { /* awf2 */ +menuitem.tearoff:dir(rtl) { /* awf-extended */ padding: 3px 0; color: @menu_tearoff_border; } @@ -1674,8 +1681,8 @@ expander scrollbar.horizontal { background: @theme_bg; } -dialog:dir(rtl) scrolledwindow.frame scrollbar.vertical, -expander:dir(rtl) scrollbar.vertical { +dialog scrolledwindow.frame scrollbar.vertical:dir(rtl), +expander scrollbar.vertical:dir(rtl) { margin: -1px -3px -30px -1px; padding: 0 3px 29px 0; border-left: 0; @@ -1700,7 +1707,7 @@ treeview ~ scrollbar.horizontal ~ scrollbar.vertical { background: @theme_bg; } -treeview:dir(rtl) ~ scrollbar.horizontal ~ scrollbar.vertical { +treeview ~ scrollbar.horizontal ~ scrollbar.vertical:dir(rtl) { margin: -30px -3px -30px -1px; padding: 29px 3px 29px 0; border-left: 0; @@ -1767,6 +1774,10 @@ notebook stack notebook { margin: -1px; } +notebook stack notebook header { + background: @nb_bg; +} + notebook header { padding: 1px; background: @theme_bg; @@ -1792,6 +1803,11 @@ notebook header tab button { padding: 0; } +notebook header tabs arrow { + min-width: 18px; + min-height: 18px; +} + notebook header.top tab { margin: 0 -1px -2px -1px; border-bottom-color: @nb_border; @@ -1931,11 +1947,9 @@ notebook:focus header tab:checked label { background: @nb_tab_focus_bg; } -/* --- notebook stack --- */ +/* --- notebook stack - with gtk3-classic (notebook__stack_class.patch) --- */ -notebook header.top ~ stack:dir(ltr), notebook stack.top { - /* with gtk3-classic (notebook__stack_class.patch) */ border-radius: 0 0 2.4px 2.4px; box-shadow: inset -1px -1px alpha(@nb_border, 0.125), @@ -1943,16 +1957,13 @@ notebook stack.top { } notebook stack.bottom { - /* with gtk3-classic (notebook__stack_class.patch) */ border-radius: 2.4px 2.4px 0 0; box-shadow: inset -1px 0 alpha(@nb_border, 0.125), inset 1px 1px alpha(@entry_bg, 0.42); } -notebook header.left ~ stack:dir(ltr), notebook stack.left { - /* with gtk3-classic (notebook__stack_class.patch) */ border-radius: 0 2.4px 2.4px 0; box-shadow: inset -1px -1px alpha(@nb_border, 0.125), @@ -1960,97 +1971,54 @@ notebook stack.left { } notebook stack.right { - /* with gtk3-classic (notebook__stack_class.patch) */ border-radius: 2.4px 0 0 2.4px; box-shadow: inset 0 -1px alpha(@nb_border, 0.125), inset 1px 1px alpha(@entry_bg, 0.42); } -/* --- notebook top arrow --- */ +/* --- notebook arrow --- */ -notebook header.top tabs arrow.up:first-child, -notebook header.top tabs arrow.down:first-child { +notebook header.top tabs arrow.down { margin: 1px 2px 0 0; - padding: 2px 2px 2px 1px; -gtk-icon-transform: scale(0.8); } -notebook header.top tabs arrow.down:last-child, -notebook header.top tabs arrow.up:last-child { +notebook header.top tabs arrow.up { margin: 1px 0 0 2px; - padding: 2px 1px 2px 2px; -gtk-icon-transform: scale(0.8); } -/* --- notebook bottom arrow --- */ - -notebook header.bottom tabs arrow.up:first-child, -notebook header.bottom tabs arrow.down:first-child { +notebook header.bottom tabs arrow.down { margin: 0 2px 1px 0; - padding: 2px 2px 2px 1px; -gtk-icon-transform: scale(0.8); } -notebook header.bottom tabs arrow.down:last-child, -notebook header.bottom tabs arrow.up:last-child { +notebook header.bottom tabs arrow.up { margin: 0 0 1px 2px; - padding: 2px 1px 2px 2px; -gtk-icon-transform: scale(0.8); } -/* --- notebook left arrow --- */ - -notebook header.left tabs arrow.up:first-child { +notebook header.left tabs arrow.down { margin: 0 0 2px 1px; - padding: 1px 2px 2px; - -gtk-icon-transform: scale(0.8); -} - -notebook header.left tabs arrow.down:first-child { - margin: 0 0 2px 1px; - padding: 1px 2px 2px; -gtk-icon-transform: rotate(180deg) scale(0.8); } -notebook header.left tabs arrow.up:last-child { +notebook header.left tabs arrow.up { margin: 2px 0 0 1px; - padding: 2px 2px 1px; -gtk-icon-transform: rotate(180deg) scale(0.8); } -notebook header.left tabs arrow.down:last-child { - margin: 2px 0 0 1px; - padding: 2px 2px 1px; - -gtk-icon-transform: scale(0.8); -} - -/* --- notebook right arrow --- */ - -notebook header.right tabs arrow.up:first-child { - margin: 0 1px 2px 0; - padding: 1px 2px 2px; - -gtk-icon-transform: scale(0.8); -} - -notebook header.right tabs arrow.down:first-child { +notebook header.right tabs arrow.down { margin: 0 1px 2px 0; - padding: 1px 2px 2px; -gtk-icon-transform: rotate(180deg) scale(0.8); } -notebook header.right tabs arrow.up:last-child { +notebook header.right tabs arrow.up { margin: 2px 1px 0 0; - padding: 2px 2px 1px; -gtk-icon-transform: rotate(180deg) scale(0.8); } -notebook header.right tabs arrow.down:last-child { - margin: 2px 1px 0 0; - padding: 2px 2px 1px; - -gtk-icon-transform: scale(0.8); -} - /* --- progress bar --- */ progressbar:disabled { @@ -2071,6 +2039,37 @@ progressbar trough { inset 1px 1px @slider_trough_border; } +treeview.view.trough, +treeview.view.trough.odd, +treeview.view.trough.even, +treeview.view.trough.sorted, +treeview.view.trough.sorted.odd, +treeview.view.trough.sorted.even { + padding: 0; + color: @theme_text; /* = progressbar.classic text.trough */ + border: 1px solid @slider_border_treeview; + background: @theme_bg; +} + +treeview.view.trough:disabled, +treeview.view.trough.odd:disabled, +treeview.view.trough.even:disabled { + color: @insensitive_fg; /* = progressbar.classic:disabled text.trough */ + background: @theme_bg; +} + +treeview.view.progressbar { + color: @theme_selected_fg; /* = progressbar.classic text.progress */ + text-shadow: none; + box-shadow: + inset -1px -1px @slider_border, + inset 1px 1px @slider_border; +} + +treeview.view.progressbar:disabled { + color: @insensitive_selected; /* = progressbar.classic:disabled text.progress */ +} + progressbar trough progress { border-radius: 2.75px; box-shadow: @@ -2123,11 +2122,6 @@ progressbar.vertical trough progress.bottom { @slider_pattern 30px); } -treeview.view.progressbar { - color: @theme_selected_fg; - text-shadow: none; -} - treeview.view.progressbar, progressbar.horizontal trough progress { min-height: 20px; @@ -2171,32 +2165,65 @@ progressbar.horizontal trough.empty progress { background: none; } +statusbar progressbar.horizontal trough, +statusbar progressbar.horizontal trough progress, +statusbar progressbar.horizontal.classic trough, +statusbar progressbar.horizontal.classic trough progress { + min-height: 16px; +} + +/* progressbar > text... but for now position of text with GTK_PROGRESS_TEXT_INSIDE=1 does not work, so same recipe */ + progressbar.vertical text { margin-left: -39px; padding-left: 3px; } +progressbar.horizontal text { + margin-bottom: -24px; + padding-top: 3px; +} + +progressbar.vertical.classic trough, +progressbar.vertical.classic trough progress, progressbar.vertical text + trough, progressbar.vertical text + trough progress { - min-width: 39px; + min-width: 40px; } -progressbar.horizontal text { - margin-bottom: -24px; - padding-top: 3px; +progressbar.vertical.classic trough.full, +progressbar.vertical.classic trough.full progress { + min-width: 48px; +} + +progressbar.vertical.classic trough.full text { + margin-left: -47px; + padding-left: 2px; } +progressbar.horizontal.classic trough, +progressbar.horizontal.classic trough progress, progressbar.horizontal text + trough, progressbar.horizontal text + trough progress { min-height: 24px; } -progressbar text.trough { - color: @theme_selected_fg; /* with gtk3-classic (appearance__progress_text.patch) */ +/* --- progress bar text colors - with gtk3-classic (appearance__progress_text.patch) when GTK_PROGRESS_TEXT_INSIDE=1 --- */ + +progressbar.classic text.trough { + color: @theme_text; } -progressbar text.progressbar { - /* with gtk3-classic (appearance__progress_text.patch) */ +progressbar.classic text.progress { + color: @theme_selected_fg; +} + +progressbar.classic:disabled text.trough { + color: @insensitive_fg; +} + +progressbar.classic:disabled text.progress { + color: @insensitive_selected; } /* --- scale --- */ @@ -2285,13 +2312,13 @@ scale.vertical trough highlight.bottom { margin-bottom: -11px; } -scale.vertical:dir(rtl) trough highlight.top, -scale.vertical.top:dir(rtl) trough highlight.bottom /* awf2 */ { +scale.vertical trough highlight.top:dir(rtl), +scale.vertical.top trough highlight.bottom:dir(rtl) /* awf-extended */ { margin-top: -11px; margin-bottom: 1px; } -scale.vertical:dir(rtl) trough highlight.bottom { +scale.vertical trough highlight.bottom:dir(rtl) { margin-top: 1px; margin-bottom: -11px; } @@ -2622,7 +2649,7 @@ infobar.error { background: linear-gradient(to bottom, @errorbar_bg_top, @errorbar_bg_bot); } -/* --- treeview alternating colours CSS - with gtk3-classic (treeview__alternating_row_colours.patch) --- */ +/* --- treeview alternating colours - with gtk3-classic (treeview__alternating_row_colours.patch) --- */ treeview.view.odd { background-color: @theme_base; @@ -2632,33 +2659,35 @@ treeview.view.even { background-color: #EEE; } -treeview.view.sorted.odd { +treeview.view.odd.sorted { background-color: #EEE; } -treeview.view.sorted.even { +treeview.view.even.sorted { background-color: #DDD; } -treeview.view.odd:selected, -treeview.view.odd.sorted:selected, -treeview.view.even:selected, -treeview.view.even.sorted:selected { - color: @theme_selected_fg; - background-color: @theme_selected_bg; -} - treeview.view.odd:not(.last):not(.trough):not(.progressbar), treeview.view.even:not(.last):not(.trough):not(.progressbar) { - padding-right: 1px; background-image: url("img/treeview-separator.svg"); background-repeat: repeat-y; background-position: right bottom; } -treeview.view check, -treeview.view radio { - background: transparent; +treeview.view.odd:not(.trough):not(.progressbar):selected, +treeview.view.odd.sorted:not(.trough):not(.progressbar):selected, +treeview.view.even:not(.trough):not(.progressbar):selected, +treeview.view.even.sorted:not(.trough):not(.progressbar):selected { + color: @theme_selected_fg; + background-color: @theme_selected_bg; +} + +treeview.view:disabled, +treeview.view.odd:not(.trough):not(.progressbar):selected:disabled, +treeview.view.odd.sorted:not(.trough):not(.progressbar):selected:disabled, +treeview.view.even:not(.trough):not(.progressbar):selected:disabled, +treeview.view.even.sorted:not(.trough):not(.progressbar):selected:disabled { + color: @insensitive_fg; } /* --- treeview --- */ @@ -2712,20 +2741,9 @@ treeview header button:last-child > box { /* --- treeview row elements --- */ -treeview.view:not(.progressbar):disabled:selected { - color: @insensitive_fg; -} - -treeview.view.trough, -treeview.view.trough:selected { - padding: 0; - color: @theme_text; - border: 1px solid @slider_border_treeview; - background: @theme_bg; -} - -treeview.view.trough:disabled { - color: @insensitive_fg; +treeview.view check, +treeview.view radio { + background: transparent; } treeview.view.image:disabled { diff --git a/src/human-theme/gtk-3.0/gtk-shade.css b/src/human-theme/gtk-3.0/gtk-shade.css index e78c5ed..7bd60df 100644 --- a/src/human-theme/gtk-3.0/gtk-shade.css +++ b/src/human-theme/gtk-3.0/gtk-shade.css @@ -1,7 +1,6 @@ /** - * Copyright 2020-2023 | Fabrice Creuzot (luigifab) + * Copyright 2020-2024 | Fabrice Creuzot (luigifab) * https://github.com/luigifab/human-theme - * https://www.luigifab.fr/gtk/human-theme * * Forked from * Copyright 2020 | Mike Kazantsev (mk-fg) diff --git a/src/human-theme/gtk-3.0/gtk.css b/src/human-theme/gtk-3.0/gtk.css index 38c5d67..30e59fa 100644 --- a/src/human-theme/gtk-3.0/gtk.css +++ b/src/human-theme/gtk-3.0/gtk.css @@ -1,7 +1,6 @@ /** - * Copyright 2020-2023 | Fabrice Creuzot (luigifab) + * Copyright 2020-2024 | Fabrice Creuzot (luigifab) * https://github.com/luigifab/human-theme - * https://www.luigifab.fr/gtk/human-theme * * Forked from * Copyright 2020 | Mike Kazantsev (mk-fg) @@ -23,27 +22,35 @@ * GNU General Public License (GPL) for more details. */ -@define-color theme_base #FFF; @define-color theme_bg #E6DDD5; @define-color theme_fg #101010; +@define-color theme_base #FFF; @define-color theme_text #1A1A1A; @define-color theme_selected_bg #8F5F4A; @define-color theme_selected_fg #FFF; +@define-color insensitive_fg shade(@theme_bg, 0.65); + @define-color theme_tooltip_bg #F5F5B5; @define-color theme_tooltip_fg #000; @define-color theme_tooltip_border shade(@theme_tooltip_bg, 0.63); /* #C2C250 instead of #C2C24E */ @define-color outline shade(@theme_selected_bg, 1.499); - @define-color link #00E; @define-color visited_link shade(@link, 0.2); -@define-color error #C00; +@define-color insensitive_selected alpha(@theme_selected_fg, 0.8); @define-color insensitive_text_shadow alpha(@theme_base, 0.5); -@define-color insensitive_fg shade(@theme_bg, 0.65); @define-color checkradio shade(@theme_bg, 0.839); +/* https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/named-colors.html */ +@define-color theme_bg_color @theme_bg; +@define-color theme_fg_color @theme_fg; +@define-color theme_base_color @theme_base; +@define-color theme_text_color @theme_text; +@define-color theme_selected_bg_color @theme_selected_bg; +@define-color theme_selected_fg_color @theme_selected_fg; +@define-color insensitive_fg_color @insensitive_fg; + @import url("gtk-shade.css"); @import url("base.css"); @import url("mate.css"); @import url("xfce.css"); @import url("apps.css"); -@import url("override.css"); diff --git a/src/human-theme/gtk-3.0/mate.css b/src/human-theme/gtk-3.0/mate.css index a381268..45a8e98 100644 --- a/src/human-theme/gtk-3.0/mate.css +++ b/src/human-theme/gtk-3.0/mate.css @@ -1,7 +1,6 @@ /** - * Copyright 2020-2023 | Fabrice Creuzot (luigifab) + * Copyright 2020-2024 | Fabrice Creuzot (luigifab) * https://github.com/luigifab/human-theme - * https://www.luigifab.fr/gtk/human-theme * * Forked from * Copyright 2020 | Mike Kazantsev (mk-fg) @@ -247,7 +246,8 @@ box.primary-toolbar toolbar { .lock-dialog frame, .lock-dialog border, .lock-dialog notebook, -.lock-dialog stack { +.lock-dialog stack, +.lock-dialog stack > box { border: 0; border-radius: 0; background: @theme_bg; @@ -261,6 +261,10 @@ box.primary-toolbar toolbar { padding-left: 0; } +.lock-dialog textview { + padding: 2px; +} + /* --- mate-keyboard-layout-view + mate-keyboard-layout-chooser --- */ /* .gswitchit-layout-view > box.dialog-vbox > box.vertical > widget, diff --git a/src/human-theme/gtk-3.0/override.css b/src/human-theme/gtk-3.0/override.css deleted file mode 100644 index 4d24d50..0000000 --- a/src/human-theme/gtk-3.0/override.css +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Copyright 2020-2023 | Fabrice Creuzot (luigifab) - * https://github.com/luigifab/human-theme - * https://www.luigifab.fr/gtk/human-theme - * - * Forked from - * Copyright 2020 | Mike Kazantsev (mk-fg) - * https://github.com/mk-fg/clearlooks-phenix-humanity - * - * Forked from - * Copyright 2011-2014 | Jean-Philippe Fleury - * Copyright 2013-2014 | Andrew Shadura - * https://github.com/jpfleury/clearlooks-phenix - * - * This program is free software, you can redistribute it or modify - * it under the terms of the GNU General Public License (GPL) as published - * by the free software foundation, either version 3 of the license, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but without any warranty, without even the implied warranty of - * merchantability or fitness for a particular purpose. See the - * GNU General Public License (GPL) for more details. - */ - -/* empty */ diff --git a/src/human-theme/gtk-3.0/xfce.css b/src/human-theme/gtk-3.0/xfce.css index 6549aa3..3b3abb3 100644 --- a/src/human-theme/gtk-3.0/xfce.css +++ b/src/human-theme/gtk-3.0/xfce.css @@ -1,7 +1,6 @@ /** - * Copyright 2020-2023 | Fabrice Creuzot (luigifab) + * Copyright 2020-2024 | Fabrice Creuzot (luigifab) * https://github.com/luigifab/human-theme - * https://www.luigifab.fr/gtk/human-theme * * Forked from * Copyright 2020 | Mike Kazantsev (mk-fg) diff --git a/src/human-theme/gtk-4.0/apps.css b/src/human-theme/gtk-4.0/apps.css index 4ebb703..55f3b07 100644 --- a/src/human-theme/gtk-4.0/apps.css +++ b/src/human-theme/gtk-4.0/apps.css @@ -1,7 +1,6 @@ /** - * Copyright 2020-2023 | Fabrice Creuzot (luigifab) + * Copyright 2020-2024 | Fabrice Creuzot (luigifab) * https://github.com/luigifab/human-theme - * https://www.luigifab.fr/gtk/human-theme * * Forked from * Copyright 2020 | Mike Kazantsev (mk-fg) @@ -23,20 +22,13 @@ * GNU General Public License (GPL) for more details. */ -/* --- ubuntu welcome and software center --- */ - -@define-color theme_bg_color @theme_bg; -@define-color theme_fg_color @theme_fg; -@define-color theme_selected_bg_color @theme_selected_bg; -@define-color theme_selected_fg_color @theme_selected_fg; - /* --- audacity --- */ window > box > widget > widget { background-color: @theme_bg; } -/* --- geany pluma --- */ +/* --- geany and pluma --- */ #GeanyMainWindow #notebook_info { margin-bottom: 5px; @@ -51,15 +43,40 @@ window.pluma-window notebook stack > box scrolledwindow { border: 0; } -notebook widget scrollbar.vertical { +#GeanyMainWindow notebook widget scrollbar.vertical:dir(ltr) { margin-left: 0; } -notebook widget scrollbar.horizontal { +#GeanyMainWindow notebook widget scrollbar.vertical:dir(rtl) { + margin-right: 0; +} + +#GeanyMainWindow notebook widget scrollbar.horizontal { margin-top: 0; } -/* fix for some maximized windows https://github.com/mate-desktop/mate-desktop/issues/291 */ +/* --- caja --- */ + +window.caja-navigation-window notebook.caja-notebook scrolledwindow scrollbar.vertical:dir(ltr) { + margin-left: 0; + background: @theme_bg; +} + +window.caja-navigation-window notebook.caja-notebook scrolledwindow scrollbar.vertical:dir(rtl) { + margin-right: 0; + background: @theme_bg; +} + +window.caja-navigation-window notebook.caja-notebook scrolledwindow.frame.view scrollbar.vertical { + /* margin-top: 0; */ +} + +window.caja-navigation-window notebook.caja-notebook scrolledwindow scrollbar.horizontal { + margin-top: 0; + background: @theme_bg; +} + +/* --- fix for some maximized windows https://github.com/mate-desktop/mate-desktop/issues/291 --- */ #GeanyMainWindow.maximized:dir(ltr) #notebook_info stack, window.background.maximized.engrampa-window:dir(ltr) > grid.horizontal > paned.horizontal > scrolledwindow.frame, @@ -78,3 +95,8 @@ window.background.maximized.logview-window:dir(rtl) > box.vertical > paned.horiz window.background.maximized.caja-navigation-window:dir(rtl) notebook.caja-notebook scrolledwindow.frame { border-left-width: 0; } + +/* --- awf-extended --- */ + +#AwfMainWindow .awf-cheatcode-btn7 { min-height: 18px; } +#AwfMainWindow .awf-cheatcode-btn8 { min-height: 20px; } diff --git a/src/human-theme/gtk-4.0/base.css b/src/human-theme/gtk-4.0/base.css index 6a786c9..6cf0de0 100644 --- a/src/human-theme/gtk-4.0/base.css +++ b/src/human-theme/gtk-4.0/base.css @@ -1,7 +1,6 @@ /** - * Copyright 2020-2023 | Fabrice Creuzot (luigifab) + * Copyright 2020-2024 | Fabrice Creuzot (luigifab) * https://github.com/luigifab/human-theme - * https://www.luigifab.fr/gtk/human-theme * * Forked from * Copyright 2020 | Mike Kazantsev (mk-fg) @@ -380,6 +379,15 @@ statusbar box label { padding-bottom: 1px; } +statusbar progressbar.horizontal { + margin: 2px -2px -2px; + font-size: 85%; +} + +statusbar progressbar.horizontal text { + padding-top: 4px; +} + /* --- switch --- */ switch { @@ -475,7 +483,11 @@ button.flat { button.flat:disabled { border-color: transparent; background: none; - opacity: 0.3; + opacity: 0.3; /* @todo -> .flat.image */ +} + +button.link:disabled { + opacity: 1; /* @todo */ } button.toggle { @@ -664,7 +676,7 @@ checkbutton label { } checkbutton label:dir(rtl) { - margin: 0 -2px 0 -1px; + margin: -1px -2px 0 -1px; } checkbutton check:dir(rtl), checkbutton radio:dir(rtl) { @@ -1046,7 +1058,7 @@ box.primary-toolbar separator { box.toolbar button, box.primary-toolbar button { - padding-bottom: 3px; + /* @todo 4.12? padding-bottom: 3px; */ } /* --- menu bar --- */ @@ -1063,13 +1075,13 @@ menubar item { text-shadow: none; /* libreoffice 6.4.1 */ color: @theme_fg; /* libreoffice 6.4.1 */ border: 1px solid transparent; + border-radius: 2px 2px 0 0; } -menubar item:active:hover { +menubar item:selected { color: @menuitem_hover; border: 1px solid @menuitem_hover_border; border-bottom: 0; - border-radius: 2px 2px 0 0; background: radial-gradient(ellipse 110% 50%, @menuitem_hover_glaze_glow_center, @@ -1081,11 +1093,6 @@ menubar item:active:hover { @menuitem_hover_glaze_bot); } -menubar > item { - padding-top: 2px; - padding-bottom: 3px; -} - /* --- popover --- */ popover.menu scrolledwindow, @@ -1470,8 +1477,8 @@ expander-widget scrollbar.horizontal { background: @theme_bg; } -/* dialog:dir(rtl) scrolledwindow.frame scrollbar.vertical, -expander-widget:dir(rtl) scrollbar.vertical { +/* dialog scrolledwindow.frame scrollbar.vertical:dir(rtl), +expander-widget scrollbar.vertical:dir(rtl) { margin: -1px -3px -1px -1px; padding: 0 3px 0 0; border-left: 0; @@ -1497,7 +1504,7 @@ treeview ~ scrollbar.horizontal ~ scrollbar.vertical { background: @theme_bg; } -/* treeview:dir(rtl) ~ scrollbar.horizontal ~ scrollbar.vertical { +/* treeview ~ scrollbar.horizontal ~ scrollbar.vertical:dir(rtl) { margin: -26px -3px -19px -1px; padding: 25px 3px 21px 0; border-left: 0; @@ -1531,7 +1538,7 @@ expander-widget expander { } expander-widget expander:dir(rtl) { - margin: -2px -1px 0 0; + margin: 2px 4px 2px 1px; -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } @@ -1539,7 +1546,7 @@ expander-widget expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } -/* --- notebook --- */ +/* --- notebook - left/right not inverted in rtl mode --- */ notebook { margin: 1px 0; @@ -1554,6 +1561,10 @@ notebook stack notebook { margin: -1px; } +notebook stack notebook header { + background: @nb_bg; +} + notebook header { padding: 1px; background: @theme_bg; @@ -1579,6 +1590,11 @@ notebook header tab button { padding: 0; } +notebook header tabs arrow { + min-width: 18px; + min-height: 18px; +} + notebook header.top tab { margin: 0 -1px -2px -1px; border-bottom-color: @nb_border; @@ -1772,88 +1788,86 @@ notebook:focus header tab:checked label { background: @nb_tab_focus_bg; } -/* --- notebook top arrow --- */ +/* --- notebook stack - left/right not inverted in rtl mode - with gtk4-classic (notebook__stack_class.patch) --- */ + +notebook stack.top { + border-radius: 0 0 2.4px 2.4px; + box-shadow: + inset -1px -1px alpha(@nb_border, 0.125), + inset 1px 0 alpha(@entry_bg, 0.42); +} + +notebook stack.bottom { + border-radius: 2.4px 2.4px 0 0; + box-shadow: + inset -1px 0 alpha(@nb_border, 0.125), + inset 1px 1px alpha(@entry_bg, 0.42); +} + +notebook stack.left:dir(ltr), +notebook stack.right:dir(rtl) { + border-radius: 0 2.4px 2.4px 0; + box-shadow: + inset -1px -1px alpha(@nb_border, 0.125), + inset 0 1px alpha(@entry_bg, 0.42); +} + +notebook stack.right:dir(ltr), +notebook stack.left:dir(rtl) { + border-radius: 2.4px 0 0 2.4px; + box-shadow: + inset 0 -1px alpha(@nb_border, 0.125), + inset 1px 1px alpha(@entry_bg, 0.42); +} -notebook header.top tabs arrow.up:first-child, -notebook header.top tabs arrow.down:first-child { +/* --- notebook arrow --- */ + +notebook header.top tabs arrow.down { margin: 1px 2px 0 0; - padding: 2px 2px 2px 1px; - -gtk-icon-transform: scale(0.8); } -notebook header.top tabs arrow.down:last-child, -notebook header.top tabs arrow.up:last-child { +notebook header.top tabs arrow.up { margin: 1px 0 0 2px; - padding: 2px 1px 2px 2px; - -gtk-icon-transform: scale(0.8); } -/* --- notebook bottom arrow --- */ - -notebook header.bottom tabs arrow.up:first-child, -notebook header.bottom tabs arrow.down:first-child { +notebook header.bottom tabs arrow.down { margin: 0 2px 1px 0; - padding: 2px 2px 2px 1px; - -gtk-icon-transform: scale(0.8); } -notebook header.bottom tabs arrow.down:last-child, -notebook header.bottom tabs arrow.up:last-child { +notebook header.bottom tabs arrow.up { margin: 0 0 1px 2px; - padding: 2px 1px 2px 2px; - -gtk-icon-transform: scale(0.8); } -/* --- notebook left arrow --- */ - -notebook header.left tabs arrow.up:first-child { +notebook header.left tabs arrow.down:dir(ltr) { margin: 0 0 2px 1px; - padding: 1px 2px 2px; - -gtk-icon-transform: scale(0.8); } -notebook header.left tabs arrow.down:first-child { - margin: 0 0 2px 1px; - padding: 1px 2px 2px; - -gtk-icon-transform: rotate(180deg) scale(0.8); +notebook header.left tabs arrow.down:dir(rtl) { + margin: 0 1px 2px 0; } -notebook header.left tabs arrow.up:last-child { +notebook header.left tabs arrow.up:dir(ltr) { margin: 2px 0 0 1px; - padding: 2px 2px 1px; - -gtk-icon-transform: rotate(180deg) scale(0.8); } -notebook header.left tabs arrow.down:last-child { - margin: 2px 0 0 1px; - padding: 2px 2px 1px; - -gtk-icon-transform: scale(0.8); +notebook header.left tabs arrow.up:dir(rtl) { + margin: 2px 1px 0 0; } -/* --- notebook right arrow --- */ - -notebook header.right tabs arrow.up:first-child { +notebook header.right tabs arrow.down:dir(ltr) { margin: 0 1px 2px 0; - padding: 1px 2px 2px; - -gtk-icon-transform: scale(0.8); } -notebook header.right tabs arrow.down:first-child { - margin: 0 1px 2px 0; - padding: 1px 2px 2px; - -gtk-icon-transform: rotate(180deg) scale(0.8); +notebook header.right tabs arrow.down:dir(rtl) { + margin: 0 0 2px 1px; } -notebook header.right tabs arrow.up:last-child { +notebook header.right tabs arrow.up:dir(ltr) { margin: 2px 1px 0 0; - padding: 2px 2px 1px; - -gtk-icon-transform: rotate(180deg) scale(0.8); } -notebook header.right tabs arrow.down:last-child { - margin: 2px 1px 0 0; - padding: 2px 2px 1px; - -gtk-icon-transform: scale(0.8); +notebook header.right tabs arrow.up:dir(rtl) { + margin: 2px 0 0 1px; } /* --- progress bar --- */ @@ -1876,7 +1890,62 @@ progressbar trough { inset 1px 1px @slider_trough_border; } -progressbar trough progress { +treeview.view.trough, +treeview.view.trough.odd, +treeview.view.trough.even, +treeview.view.trough.sorted, +treeview.view.trough.sorted.odd, +treeview.view.trough.sorted.even { + padding: 0; + color: @theme_text; /* = progressbar.classic text.trough */ + border-top: 1px solid @theme_base; + border-bottom: 1px solid @theme_base; + background: @theme_bg; + box-shadow: + inset -1px -1px @slider_border_treeview, + inset 1px 1px @slider_border_treeview; +} + +treeview.view.trough.even { + border-top: 1px solid #EEE; + border-bottom: 1px solid #EEE; +} + +treeview.view.trough:selected, +treeview.view.trough.odd:selected, +treeview.view.trough.even:selected { + color: @theme_text; /* = progressbar.classic text.trough */ + border-top: 1px solid @theme_selected_bg; + border-bottom: 1px solid @theme_selected_bg; +} + +treeview.view.trough:disabled, +treeview.view.trough.odd:disabled, +treeview.view.trough.even:disabled { + color: @insensitive_fg; /* = progressbar.classic:disabled text.trough */ + background: @theme_bg; +} + +treeview.view.progressbar { + color: @theme_selected_fg; /* = progressbar.classic text.progress */ + border-top: 1px solid transparent; + border-bottom: 1px solid transparent; + text-shadow: none; + box-shadow: + inset -1px -1px @slider_border, + inset 1px 1px @slider_border; +} + +treeview.view.progressbar:selected { + border-top-color: @theme_selected_bg; + border-bottom-color: @theme_selected_bg; +} + +treeview.view.progressbar:disabled { + color: @insensitive_selected; /* = progressbar.classic:disabled text.progress */ +} + +progressbar trough:not(.empty) progress { border-radius: 2.75px; box-shadow: inset -1px -1px @slider_border, @@ -1929,11 +1998,6 @@ progressbar.vertical trough progress.bottom { @slider_pattern 30px); } -treeview.view.progressbar { - color: @theme_selected_fg; - text-shadow: none; -} - treeview.view.progressbar, progressbar.horizontal trough progress { min-height: 20px; @@ -1977,16 +2041,62 @@ progressbar.horizontal trough.empty progress { background: none; } +statusbar progressbar.horizontal trough, +statusbar progressbar.horizontal trough progress, +statusbar progressbar.horizontal.classic trough, +statusbar progressbar.horizontal.classic trough progress { + min-height: 16px; +} + +/* progressbar > text... but for now position of text with GTK_PROGRESS_TEXT_INSIDE=1 does not work, so same recipe */ + +progressbar.vertical text { + /* margin-left: -39px; + padding-left: 3px; */ +} + +progressbar.horizontal text { + /* margin-bottom: -24px; + padding-top: 3px; */ +} + +progressbar.vertical.classic trough, +progressbar.vertical.classic trough progress, progressbar.vertical text + trough, progressbar.vertical text + trough progress { - min-width: 39px; + min-width: 40px; +} + +progressbar.vertical.classic trough.full text { + /* margin-left: -47px; + padding-left: 2px; */ } +progressbar.horizontal.classic trough, +progressbar.horizontal.classic trough progress, progressbar.horizontal text + trough, progressbar.horizontal text + trough progress { min-height: 24px; } +/* --- progress bar text colors - with gtk4-classic (appearance__progress_text.patch) when GTK_PROGRESS_TEXT_INSIDE=1 --- */ + +progressbar.classic text.trough { + color: @theme_text; +} + +progressbar.classic text.progress { + color: @theme_selected_fg; +} + +progressbar.classic:disabled text.trough { + color: @insensitive_fg; +} + +progressbar.classic:disabled text.progress { + color: @insensitive_selected; +} + /* --- scale --- */ scale:disabled { @@ -2354,7 +2464,7 @@ infobar.error { background: linear-gradient(to bottom, @errorbar_bg_top, @errorbar_bg_bot); } -/* --- treeview alternating colours CSS - with gtk3-classic (treeview__alternating_row_colours.patch) --- */ +/* --- treeview alternating colours - with gtk4-classic (treeview__alternating_row_colours.patch) --- */ treeview.view.odd { background-color: @theme_base; @@ -2364,33 +2474,35 @@ treeview.view.even { background-color: #EEE; } -treeview.view.sorted.odd { +treeview.view.odd.sorted { background-color: #EEE; } -treeview.view.sorted.even { +treeview.view.even.sorted { background-color: #DDD; } -treeview.view.odd:selected, -treeview.view.odd.sorted:selected, -treeview.view.even:selected, -treeview.view.even.sorted:selected { - color: @theme_selected_fg; - background-color: @theme_selected_bg; -} - treeview.view.odd:not(.last):not(.trough):not(.progressbar), treeview.view.even:not(.last):not(.trough):not(.progressbar) { - padding-right: 1px; background-image: url("img/treeview-separator.svg"); background-repeat: repeat-y; background-position: right bottom; } -treeview.view check, -treeview.view radio { - background: transparent; +treeview.view.odd:not(.trough):not(.progressbar):selected, +treeview.view.odd.sorted:not(.trough):not(.progressbar):selected, +treeview.view.even:not(.trough):not(.progressbar):selected, +treeview.view.even.sorted:not(.trough):not(.progressbar):selected { + color: @theme_selected_fg; + background-color: @theme_selected_bg; +} + +treeview.view:disabled, +treeview.view.odd:not(.trough):not(.progressbar):selected:disabled, +treeview.view.odd.sorted:not(.trough):not(.progressbar):selected:disabled, +treeview.view.even:not(.trough):not(.progressbar):selected:disabled, +treeview.view.even.sorted:not(.trough):not(.progressbar):selected:disabled { + color: @insensitive_fg; } /* --- treeview --- */ @@ -2459,26 +2571,10 @@ listview row:nth-child(2n):selected { background-color: @theme_selected_bg; } -treeview.view:not(.progressbar):not(.trough) { +treeview.view:not(.trough):not(.progressbar) { min-height: 21px; } -treeview.view:not(.progressbar):disabled:selected { - color: @insensitive_fg; -} - -treeview.view.trough, -treeview.view.trough:selected { - padding: 1px; - color: @theme_text; - border: 1px solid @slider_border_treeview; - background: @theme_bg; -} - -treeview.view.trough:disabled { - color: @insensitive_fg; -} - treeview.view.image:disabled { -gtk-icon-filter: opacity(0.5); } @@ -2603,3 +2699,77 @@ calendar .today { calendar .other-month { color: alpha(@theme_fg, 0.2); } + +/* --- overrride --- */ +/* GTK 4.12 + Pango 1.51 (Pango 1.51 is similar to Pango 1.42, so we have almost same rendering with GTK 2.24 - 3.24 - 4.12) */ + +* { + line-height: 17px; +} + +textview { + line-height: 17px; +} + +menubar item { + padding-top: 2px; + padding-bottom: 2px; +} + +entry { + padding-bottom: 3px; +} + +button.text-button { + padding-bottom: 3px; +} + +button.text-button.toggle:checked, +button.text-button.toggle:active { + padding-bottom: 2px; +} + +combobox entry { + padding-top: 4px; + padding-bottom: 4px; +} + +combobox button { + padding-bottom: 4px; +} + +spinbutton.horizontal text { + padding-bottom: 3px; +} + +button.font label { + margin-bottom: -1px; +} + +checkbutton label { + margin-bottom: 0; +} + +statusbar box label { + padding-bottom: 0; +} + +notebook header.left label, +notebook header.right label { + margin-bottom: -1px; +} + +expander-widget title { + padding: 0; + margin-bottom: 1px; +} + +expander-widget title expander { + margin: 2px 3px 2px 1px; + -gtk-icon-size: 16px; +} + +treeview header button > box, +columnview header button > box { + margin-bottom: 2px; +} diff --git a/src/human-theme/gtk-4.0/mate.css b/src/human-theme/gtk-4.0/mate.css index ac0d58d..8569a39 100644 --- a/src/human-theme/gtk-4.0/mate.css +++ b/src/human-theme/gtk-4.0/mate.css @@ -1,7 +1,6 @@ /** - * Copyright 2020-2023 | Fabrice Creuzot (luigifab) + * Copyright 2020-2024 | Fabrice Creuzot (luigifab) * https://github.com/luigifab/human-theme - * https://www.luigifab.fr/gtk/human-theme * * Forked from * Copyright 2020 | Mike Kazantsev (mk-fg) @@ -240,7 +239,8 @@ window.mate-terminal:not(.maximized) box.vertical notebook header.top ~ stack { .lock-dialog frame, .lock-dialog border, .lock-dialog notebook, -.lock-dialog stack { +.lock-dialog stack, +.lock-dialog stack > box { border: 0; border-radius: 0; background: @theme_bg; @@ -254,6 +254,10 @@ window.mate-terminal:not(.maximized) box.vertical notebook header.top ~ stack { padding-left: 0; } +.lock-dialog textview { + padding: 2px; +} + /* --- mate-keyboard-layout-view + mate-keyboard-layout-chooser --- */ /* .gswitchit-layout-view > box.dialog-vbox > box.vertical > widget, diff --git a/src/human-theme/gtk-4.0/override.css b/src/human-theme/gtk-4.0/override.css deleted file mode 100644 index fa4eaf2..0000000 --- a/src/human-theme/gtk-4.0/override.css +++ /dev/null @@ -1,76 +0,0 @@ -/** - * Copyright 2020-2023 | Fabrice Creuzot (luigifab) - * https://github.com/luigifab/human-theme - * https://www.luigifab.fr/gtk/human-theme - * - * Forked from - * Copyright 2020 | Mike Kazantsev (mk-fg) - * https://github.com/mk-fg/clearlooks-phenix-humanity - * - * Forked from - * Copyright 2011-2014 | Jean-Philippe Fleury - * Copyright 2013-2014 | Andrew Shadura - * https://github.com/jpfleury/clearlooks-phenix - * - * This program is free software, you can redistribute it or modify - * it under the terms of the GNU General Public License (GPL) as published - * by the free software foundation, either version 3 of the license, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but without any warranty, without even the implied warranty of - * merchantability or fitness for a particular purpose. See the - * GNU General Public License (GPL) for more details. - */ - -/* GTK 4.0 + Pango 1.48 */ -button label { - padding-top: 1px; - padding-bottom: 0; -} - -spinbutton.horizontal text { - padding: 4px 3px 3px; -} - -entry { - padding-top: 4px; - padding-bottom: 3px; -} - -entry image.left { - margin: -1px 0 1px; -} - -entry image.right { - margin: -1px 0 1px; -} - -combobox entry { - padding: 5px 3px 4px; -} - -combobox button { - padding: 4px; -} - -checkbutton label { - margin: 0 -1px 0 -2px; -} - -menubar > item { - padding: 3px 7px 2px; -} - -statusbar box label { - padding-top: 1px; - padding-bottom: 0; -} - -levelbar.horizontal.discrete block:last-child { - margin: 0 -3px 0 1px; -} - -notebook header tab label { - padding: 1px 1px 0; -} diff --git a/src/human-theme/gtk-4.0/xfce.css b/src/human-theme/gtk-4.0/xfce.css index 6549aa3..3b3abb3 100644 --- a/src/human-theme/gtk-4.0/xfce.css +++ b/src/human-theme/gtk-4.0/xfce.css @@ -1,7 +1,6 @@ /** - * Copyright 2020-2023 | Fabrice Creuzot (luigifab) + * Copyright 2020-2024 | Fabrice Creuzot (luigifab) * https://github.com/luigifab/human-theme - * https://www.luigifab.fr/gtk/human-theme * * Forked from * Copyright 2020 | Mike Kazantsev (mk-fg) diff --git a/src/human-theme/gtk-4.10/apps.css b/src/human-theme/gtk-4.10/apps.css deleted file mode 120000 index 6fb3ecd..0000000 --- a/src/human-theme/gtk-4.10/apps.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/apps.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.10/base.css b/src/human-theme/gtk-4.10/base.css deleted file mode 120000 index cd9790f..0000000 --- a/src/human-theme/gtk-4.10/base.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/base.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.10/gtk-shade.css b/src/human-theme/gtk-4.10/gtk-shade.css deleted file mode 120000 index 01f2211..0000000 --- a/src/human-theme/gtk-4.10/gtk-shade.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk-shade.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.10/gtk.css b/src/human-theme/gtk-4.10/gtk.css deleted file mode 120000 index ad6b61e..0000000 --- a/src/human-theme/gtk-4.10/gtk.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.10/img b/src/human-theme/gtk-4.10/img deleted file mode 120000 index 18c9885..0000000 --- a/src/human-theme/gtk-4.10/img +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/img/ \ No newline at end of file diff --git a/src/human-theme/gtk-4.10/mate.css b/src/human-theme/gtk-4.10/mate.css deleted file mode 120000 index cb14d59..0000000 --- a/src/human-theme/gtk-4.10/mate.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/mate.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.10/override.css b/src/human-theme/gtk-4.10/override.css deleted file mode 100644 index b6a31c0..0000000 --- a/src/human-theme/gtk-4.10/override.css +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright 2020-2023 | Fabrice Creuzot (luigifab) - * https://github.com/luigifab/human-theme - * https://www.luigifab.fr/gtk/human-theme - * - * Forked from - * Copyright 2020 | Mike Kazantsev (mk-fg) - * https://github.com/mk-fg/clearlooks-phenix-humanity - * - * Forked from - * Copyright 2011-2014 | Jean-Philippe Fleury - * Copyright 2013-2014 | Andrew Shadura - * https://github.com/jpfleury/clearlooks-phenix - * - * This program is free software, you can redistribute it or modify - * it under the terms of the GNU General Public License (GPL) as published - * by the free software foundation, either version 3 of the license, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but without any warranty, without even the implied warranty of - * merchantability or fitness for a particular purpose. See the - * GNU General Public License (GPL) for more details. - */ - -/* GTK 4.10 + Pango 1.50 */ -* { - line-height: 16px; -} - -textview { - line-height: 17px; -} diff --git a/src/human-theme/gtk-4.10/xfce.css b/src/human-theme/gtk-4.10/xfce.css deleted file mode 120000 index dbfa61d..0000000 --- a/src/human-theme/gtk-4.10/xfce.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/xfce.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.12/apps.css b/src/human-theme/gtk-4.12/apps.css deleted file mode 120000 index 6fb3ecd..0000000 --- a/src/human-theme/gtk-4.12/apps.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/apps.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.12/base.css b/src/human-theme/gtk-4.12/base.css deleted file mode 120000 index cd9790f..0000000 --- a/src/human-theme/gtk-4.12/base.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/base.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.12/gtk-shade.css b/src/human-theme/gtk-4.12/gtk-shade.css deleted file mode 120000 index 01f2211..0000000 --- a/src/human-theme/gtk-4.12/gtk-shade.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk-shade.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.12/gtk.css b/src/human-theme/gtk-4.12/gtk.css deleted file mode 120000 index ad6b61e..0000000 --- a/src/human-theme/gtk-4.12/gtk.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.12/img b/src/human-theme/gtk-4.12/img deleted file mode 120000 index 18c9885..0000000 --- a/src/human-theme/gtk-4.12/img +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/img/ \ No newline at end of file diff --git a/src/human-theme/gtk-4.12/mate.css b/src/human-theme/gtk-4.12/mate.css deleted file mode 120000 index cb14d59..0000000 --- a/src/human-theme/gtk-4.12/mate.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/mate.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.12/override.css b/src/human-theme/gtk-4.12/override.css deleted file mode 100644 index 2572118..0000000 --- a/src/human-theme/gtk-4.12/override.css +++ /dev/null @@ -1,87 +0,0 @@ -/** - * Copyright 2020-2023 | Fabrice Creuzot (luigifab) - * https://github.com/luigifab/human-theme - * https://www.luigifab.fr/gtk/human-theme - * - * Forked from - * Copyright 2020 | Mike Kazantsev (mk-fg) - * https://github.com/mk-fg/clearlooks-phenix-humanity - * - * Forked from - * Copyright 2011-2014 | Jean-Philippe Fleury - * Copyright 2013-2014 | Andrew Shadura - * https://github.com/jpfleury/clearlooks-phenix - * - * This program is free software, you can redistribute it or modify - * it under the terms of the GNU General Public License (GPL) as published - * by the free software foundation, either version 3 of the license, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but without any warranty, without even the implied warranty of - * merchantability or fitness for a particular purpose. See the - * GNU General Public License (GPL) for more details. - */ - -/* GTK 4.12 + Pango 1.51 (Pango 1.51 is similar to Pango 1.42?, so we have same rendering with GTK 2.24 - 3.24 - 4.12?) */ -* { - line-height: 17px; -} - -textview { - line-height: 17px; -} - -menubar item { - padding-top: 2px; - padding-bottom: 2px; -} - -entry { - padding-bottom: 3px; -} - -button.text-button { - padding-bottom: 3px; -} - -button.text-button.toggle:checked, -button.text-button.toggle:active { - padding-bottom: 2px; -} - -combobox entry { - padding-top: 4px; - padding-bottom: 4px; -} - -combobox button { - padding-bottom: 4px; -} - -spinbutton.horizontal text { - padding-bottom: 3px; -} - -checkbutton label { - margin-bottom: 0; -} - -statusbar box label { - padding-bottom: 0; -} - -notebook header.left label, -notebook header.right label { - margin-bottom: -1px; -} - -expander-widget title { - padding: 0; - margin-bottom: 1px; -} - -expander-widget title expander { - margin: 2px 3px 2px 1px; - -gtk-icon-size: 16px; -} diff --git a/src/human-theme/gtk-4.12/xfce.css b/src/human-theme/gtk-4.12/xfce.css deleted file mode 120000 index dbfa61d..0000000 --- a/src/human-theme/gtk-4.12/xfce.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/xfce.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.2/apps.css b/src/human-theme/gtk-4.2/apps.css deleted file mode 120000 index 6fb3ecd..0000000 --- a/src/human-theme/gtk-4.2/apps.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/apps.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.2/base.css b/src/human-theme/gtk-4.2/base.css deleted file mode 120000 index cd9790f..0000000 --- a/src/human-theme/gtk-4.2/base.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/base.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.2/gtk-shade.css b/src/human-theme/gtk-4.2/gtk-shade.css deleted file mode 120000 index 01f2211..0000000 --- a/src/human-theme/gtk-4.2/gtk-shade.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk-shade.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.2/gtk.css b/src/human-theme/gtk-4.2/gtk.css deleted file mode 120000 index ad6b61e..0000000 --- a/src/human-theme/gtk-4.2/gtk.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.2/img b/src/human-theme/gtk-4.2/img deleted file mode 120000 index 18c9885..0000000 --- a/src/human-theme/gtk-4.2/img +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/img/ \ No newline at end of file diff --git a/src/human-theme/gtk-4.2/mate.css b/src/human-theme/gtk-4.2/mate.css deleted file mode 120000 index cb14d59..0000000 --- a/src/human-theme/gtk-4.2/mate.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/mate.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.2/override.css b/src/human-theme/gtk-4.2/override.css deleted file mode 100644 index 375a3a3..0000000 --- a/src/human-theme/gtk-4.2/override.css +++ /dev/null @@ -1,76 +0,0 @@ -/** - * Copyright 2020-2023 | Fabrice Creuzot (luigifab) - * https://github.com/luigifab/human-theme - * https://www.luigifab.fr/gtk/human-theme - * - * Forked from - * Copyright 2020 | Mike Kazantsev (mk-fg) - * https://github.com/mk-fg/clearlooks-phenix-humanity - * - * Forked from - * Copyright 2011-2014 | Jean-Philippe Fleury - * Copyright 2013-2014 | Andrew Shadura - * https://github.com/jpfleury/clearlooks-phenix - * - * This program is free software, you can redistribute it or modify - * it under the terms of the GNU General Public License (GPL) as published - * by the free software foundation, either version 3 of the license, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but without any warranty, without even the implied warranty of - * merchantability or fitness for a particular purpose. See the - * GNU General Public License (GPL) for more details. - */ - -/* GTK 4.2 + Pango 1.48..49 ? */ -button label { - padding-top: 1px; - padding-bottom: 0; -} - -spinbutton.horizontal text { - padding: 4px 3px 3px; -} - -entry { - padding-top: 4px; - padding-bottom: 3px; -} - -entry image.left { - margin: -1px 0 1px; -} - -entry image.right { - margin: -1px 0 1px; -} - -combobox entry { - padding: 5px 3px 4px; -} - -combobox button { - padding: 4px; -} - -checkbutton label { - margin: 0 -1px 0 -2px; -} - -menubar > item { - padding: 3px 7px 2px; -} - -statusbar box label { - padding-top: 1px; - padding-bottom: 0; -} - -levelbar.horizontal.discrete block:last-child { - margin: 0 -3px 0 1px; -} - -notebook header tab label { - padding: 1px 1px 0; -} diff --git a/src/human-theme/gtk-4.2/xfce.css b/src/human-theme/gtk-4.2/xfce.css deleted file mode 120000 index dbfa61d..0000000 --- a/src/human-theme/gtk-4.2/xfce.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/xfce.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.4/apps.css b/src/human-theme/gtk-4.4/apps.css deleted file mode 120000 index 6fb3ecd..0000000 --- a/src/human-theme/gtk-4.4/apps.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/apps.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.4/base.css b/src/human-theme/gtk-4.4/base.css deleted file mode 120000 index cd9790f..0000000 --- a/src/human-theme/gtk-4.4/base.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/base.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.4/gtk-shade.css b/src/human-theme/gtk-4.4/gtk-shade.css deleted file mode 120000 index 01f2211..0000000 --- a/src/human-theme/gtk-4.4/gtk-shade.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk-shade.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.4/gtk.css b/src/human-theme/gtk-4.4/gtk.css deleted file mode 120000 index ad6b61e..0000000 --- a/src/human-theme/gtk-4.4/gtk.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.4/img b/src/human-theme/gtk-4.4/img deleted file mode 120000 index 18c9885..0000000 --- a/src/human-theme/gtk-4.4/img +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/img/ \ No newline at end of file diff --git a/src/human-theme/gtk-4.4/mate.css b/src/human-theme/gtk-4.4/mate.css deleted file mode 120000 index cb14d59..0000000 --- a/src/human-theme/gtk-4.4/mate.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/mate.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.4/override.css b/src/human-theme/gtk-4.4/override.css deleted file mode 100644 index 3f090d3..0000000 --- a/src/human-theme/gtk-4.4/override.css +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright 2020-2023 | Fabrice Creuzot (luigifab) - * https://github.com/luigifab/human-theme - * https://www.luigifab.fr/gtk/human-theme - * - * Forked from - * Copyright 2020 | Mike Kazantsev (mk-fg) - * https://github.com/mk-fg/clearlooks-phenix-humanity - * - * Forked from - * Copyright 2011-2014 | Jean-Philippe Fleury - * Copyright 2013-2014 | Andrew Shadura - * https://github.com/jpfleury/clearlooks-phenix - * - * This program is free software, you can redistribute it or modify - * it under the terms of the GNU General Public License (GPL) as published - * by the free software foundation, either version 3 of the license, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but without any warranty, without even the implied warranty of - * merchantability or fitness for a particular purpose. See the - * GNU General Public License (GPL) for more details. - */ - -/* GTK 4.4 + Pango 1.48 */ -button.font box { - margin-bottom: -1px; -} - -levelbar.horizontal.discrete block:last-child { - margin: 0 -3px 0 1px; -} diff --git a/src/human-theme/gtk-4.4/xfce.css b/src/human-theme/gtk-4.4/xfce.css deleted file mode 120000 index dbfa61d..0000000 --- a/src/human-theme/gtk-4.4/xfce.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/xfce.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.6/apps.css b/src/human-theme/gtk-4.6/apps.css deleted file mode 120000 index 6fb3ecd..0000000 --- a/src/human-theme/gtk-4.6/apps.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/apps.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.6/base.css b/src/human-theme/gtk-4.6/base.css deleted file mode 120000 index cd9790f..0000000 --- a/src/human-theme/gtk-4.6/base.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/base.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.6/gtk-shade.css b/src/human-theme/gtk-4.6/gtk-shade.css deleted file mode 120000 index 01f2211..0000000 --- a/src/human-theme/gtk-4.6/gtk-shade.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk-shade.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.6/gtk.css b/src/human-theme/gtk-4.6/gtk.css deleted file mode 120000 index ad6b61e..0000000 --- a/src/human-theme/gtk-4.6/gtk.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.6/img b/src/human-theme/gtk-4.6/img deleted file mode 120000 index 18c9885..0000000 --- a/src/human-theme/gtk-4.6/img +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/img/ \ No newline at end of file diff --git a/src/human-theme/gtk-4.6/mate.css b/src/human-theme/gtk-4.6/mate.css deleted file mode 120000 index cb14d59..0000000 --- a/src/human-theme/gtk-4.6/mate.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/mate.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.6/override.css b/src/human-theme/gtk-4.6/override.css deleted file mode 100644 index 440b2f3..0000000 --- a/src/human-theme/gtk-4.6/override.css +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright 2020-2023 | Fabrice Creuzot (luigifab) - * https://github.com/luigifab/human-theme - * https://www.luigifab.fr/gtk/human-theme - * - * Forked from - * Copyright 2020 | Mike Kazantsev (mk-fg) - * https://github.com/mk-fg/clearlooks-phenix-humanity - * - * Forked from - * Copyright 2011-2014 | Jean-Philippe Fleury - * Copyright 2013-2014 | Andrew Shadura - * https://github.com/jpfleury/clearlooks-phenix - * - * This program is free software, you can redistribute it or modify - * it under the terms of the GNU General Public License (GPL) as published - * by the free software foundation, either version 3 of the license, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but without any warranty, without even the implied warranty of - * merchantability or fitness for a particular purpose. See the - * GNU General Public License (GPL) for more details. - */ - -/* GTK 4.6 + Pango 1.50 */ -* { - line-height: 16px; -} - -textview { - line-height: 17px; -} diff --git a/src/human-theme/gtk-4.6/xfce.css b/src/human-theme/gtk-4.6/xfce.css deleted file mode 120000 index dbfa61d..0000000 --- a/src/human-theme/gtk-4.6/xfce.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/xfce.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.8/apps.css b/src/human-theme/gtk-4.8/apps.css deleted file mode 120000 index 6fb3ecd..0000000 --- a/src/human-theme/gtk-4.8/apps.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/apps.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.8/base.css b/src/human-theme/gtk-4.8/base.css deleted file mode 120000 index cd9790f..0000000 --- a/src/human-theme/gtk-4.8/base.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/base.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.8/gtk-shade.css b/src/human-theme/gtk-4.8/gtk-shade.css deleted file mode 120000 index 01f2211..0000000 --- a/src/human-theme/gtk-4.8/gtk-shade.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk-shade.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.8/gtk.css b/src/human-theme/gtk-4.8/gtk.css deleted file mode 120000 index ad6b61e..0000000 --- a/src/human-theme/gtk-4.8/gtk.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/gtk.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.8/img b/src/human-theme/gtk-4.8/img deleted file mode 120000 index 18c9885..0000000 --- a/src/human-theme/gtk-4.8/img +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/img/ \ No newline at end of file diff --git a/src/human-theme/gtk-4.8/mate.css b/src/human-theme/gtk-4.8/mate.css deleted file mode 120000 index cb14d59..0000000 --- a/src/human-theme/gtk-4.8/mate.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/mate.css \ No newline at end of file diff --git a/src/human-theme/gtk-4.8/override.css b/src/human-theme/gtk-4.8/override.css deleted file mode 100644 index fae8d49..0000000 --- a/src/human-theme/gtk-4.8/override.css +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright 2020-2023 | Fabrice Creuzot (luigifab) - * https://github.com/luigifab/human-theme - * https://www.luigifab.fr/gtk/human-theme - * - * Forked from - * Copyright 2020 | Mike Kazantsev (mk-fg) - * https://github.com/mk-fg/clearlooks-phenix-humanity - * - * Forked from - * Copyright 2011-2014 | Jean-Philippe Fleury - * Copyright 2013-2014 | Andrew Shadura - * https://github.com/jpfleury/clearlooks-phenix - * - * This program is free software, you can redistribute it or modify - * it under the terms of the GNU General Public License (GPL) as published - * by the free software foundation, either version 3 of the license, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but without any warranty, without even the implied warranty of - * merchantability or fitness for a particular purpose. See the - * GNU General Public License (GPL) for more details. - */ - -/* GTK 4.8 + Pango 1.50 */ -* { - line-height: 16px; -} - -textview { - line-height: 17px; -} diff --git a/src/human-theme/gtk-4.8/xfce.css b/src/human-theme/gtk-4.8/xfce.css deleted file mode 120000 index dbfa61d..0000000 --- a/src/human-theme/gtk-4.8/xfce.css +++ /dev/null @@ -1 +0,0 @@ -../gtk-4.0/xfce.css \ No newline at end of file diff --git a/src/human-theme/metacity-1/metacity-theme-1.xml b/src/human-theme/metacity-1/metacity-theme-1.xml index e66ae4d..71dc284 100644 --- a/src/human-theme/metacity-1/metacity-theme-1.xml +++ b/src/human-theme/metacity-1/metacity-theme-1.xml @@ -32,7 +32,7 @@ - + @@ -54,7 +54,7 @@ - + diff --git a/src/svg.sh b/src/svg.sh index 4d5c507..04d343b 100644 --- a/src/svg.sh +++ b/src/svg.sh @@ -2,10 +2,18 @@ cd "$(dirname "$0")" for f in */gtk-3.0/gtk.css; do - echo $f + + svgs="$(dirname "$f")/img/*.svg" + cnts=($svgs) + cnts=${#cnts[@]} + + echo "With colors of $f..." + echo " there are $cnts images" IFS=$'\n' + count=0 colors=$(grep 'define-color theme_' $f | grep -v \() + for color in $colors; do # the color string (define-color keyword #XXX) @@ -20,11 +28,20 @@ for f in */gtk-3.0/gtk.css; do replace="\"${BASH_REMATCH[2]}\" class=\"${BASH_REMATCH[1]}\"" done - # action - for svg in $(dirname "$f")/img/*.svg; do - echo " update $svg" + # search and replace in theme images + for svg in $svgs; do + + original_md5=$(md5sum "$svg" | awk '{print $1}') sed -r -i 's/"#[a-zA-Z0-9]+" class="'$class'"/'$replace'/g' $svg + new_md5=$(md5sum "$svg" | awk '{print $1}') + + if [ "$original_md5" != "$new_md5" ]; then + echo " updated $svg" + ((count++)) + fi done done + + echo " $count svg updated" unset IFS done \ No newline at end of file