From f673429780804bfb66160fe04096dcbfd3ab0889 Mon Sep 17 00:00:00 2001 From: eudaimon Date: Wed, 3 Jan 2024 20:47:03 +0100 Subject: [PATCH] Fixed XFCE desktop --- gtk-3.0/gtk.css | 6 ++++++ gtk-4.0/gtk.css | 6 ++++++ source/common/desktops.scss | 38 +++++++++++++++++++++++++++++++++++++ source/common/xfce.scss | 17 ----------------- source/gtk3/_common.scss | 2 +- source/gtk3/gtk-new.css | 6 ++++++ source/gtk4/_common.scss | 2 +- source/gtk4/gtk-new.css | 6 ++++++ 8 files changed, 64 insertions(+), 19 deletions(-) create mode 100644 source/common/desktops.scss delete mode 100644 source/common/xfce.scss diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css index 43969fb..6d09700 100644 --- a/gtk-3.0/gtk.css +++ b/gtk-3.0/gtk.css @@ -1512,6 +1512,12 @@ undershoot.left { background-size: 0.5em 100%; background-position: left; } undershoot.right { background-size: 0.5em 100%; background-position: right; } +XfdesktopIconView.view { text-shadow: 0 0 2px #323232, 0 0 2px #323232, 0 0 2px #323232; color: #EDF0F5; background-color: transparent; } + +XfdesktopIconView.view .rubberband { background-color: alpha(#669900,0.5); } + +XfdesktopIconView.view:active { text-shadow: none; color: #d1ff96; background-color: alpha(#669900,0.5); } + #XfceNotifyWindow { color: #66cbec; border-radius: 0px; border-width: 2px; border-style: solid; background-color: #203d79; border-left-color: #6377a1; border-top-color: #6377a1; border-right-color: #15284f; border-bottom-color: #15284f; } #XfceNotifyWindow label { color: #66cbec; } diff --git a/gtk-4.0/gtk.css b/gtk-4.0/gtk.css index 14516b2..0cba66f 100644 --- a/gtk-4.0/gtk.css +++ b/gtk-4.0/gtk.css @@ -1667,6 +1667,12 @@ undershoot.left { background-size: 0.5em 100%; background-position: left; } undershoot.right { background-size: 0.5em 100%; background-position: right; } +XfdesktopIconView.view { text-shadow: 0 0 2px #323232, 0 0 2px #323232, 0 0 2px #323232; color: #EDF0F5; background-color: transparent; } + +XfdesktopIconView.view .rubberband { background-color: alpha(#669900,0.5); } + +XfdesktopIconView.view:active { text-shadow: none; color: #d1ff96; background-color: alpha(#669900,0.5); } + #XfceNotifyWindow { color: #66cbec; border-radius: 0px; border-width: 2px; border-style: solid; background-color: #203d79; border-left-color: #6377a1; border-top-color: #6377a1; border-right-color: #15284f; border-bottom-color: #15284f; } #XfceNotifyWindow label { color: #66cbec; } diff --git a/source/common/desktops.scss b/source/common/desktops.scss new file mode 100644 index 0000000..75ae1a6 --- /dev/null +++ b/source/common/desktops.scss @@ -0,0 +1,38 @@ +// Other desktops fixes + +// XFCE + + +XfdesktopIconView.view { + text-shadow: 0 0 2px $base_color, 0 0 2px $base_color, 0 0 2px $base_color; + color: $text_color; + background-color: transparent; + + .rubberband { + background-color: gtkalpha($selected_bg_color, 0.5); + } +} + +XfdesktopIconView.view:active { + text-shadow: none; + color: $selected_fg_color; + background-color: gtkalpha($selected_bg_color, 0.5); +} + +#XfceNotifyWindow { + + color: $hint_fg; + border-radius: $window_radius; + border-width: $border_width; + border-style: solid; + @include relief($hint_bg); + label {color: $hint_fg} + label #summary { font-weight: bold; } + + button { + @include button(osd); + &:hover {@include button(osd-hover); } + &:active {@include button(osd-active);} + } + + } diff --git a/source/common/xfce.scss b/source/common/xfce.scss deleted file mode 100644 index 071e7f5..0000000 --- a/source/common/xfce.scss +++ /dev/null @@ -1,17 +0,0 @@ -#XfceNotifyWindow { - - color: $hint_fg; - border-radius: $window_radius; - border-width: $border_width; - border-style: solid; - @include relief($hint_bg); - label {color: $hint_fg} - label #summary { font-weight: bold; } - - button { - @include button(osd); - &:hover {@include button(osd-hover); } - &:active {@include button(osd-active);} - } - - } diff --git a/source/gtk3/_common.scss b/source/gtk3/_common.scss index da6bb53..91c81bf 100644 --- a/source/gtk3/_common.scss +++ b/source/gtk3/_common.scss @@ -3881,4 +3881,4 @@ statusbar { @import '../common/undershoot.scss'; -@import '../common/xfce.scss'; +@import '../common/desktops.scss'; diff --git a/source/gtk3/gtk-new.css b/source/gtk3/gtk-new.css index 43969fb..6d09700 100644 --- a/source/gtk3/gtk-new.css +++ b/source/gtk3/gtk-new.css @@ -1512,6 +1512,12 @@ undershoot.left { background-size: 0.5em 100%; background-position: left; } undershoot.right { background-size: 0.5em 100%; background-position: right; } +XfdesktopIconView.view { text-shadow: 0 0 2px #323232, 0 0 2px #323232, 0 0 2px #323232; color: #EDF0F5; background-color: transparent; } + +XfdesktopIconView.view .rubberband { background-color: alpha(#669900,0.5); } + +XfdesktopIconView.view:active { text-shadow: none; color: #d1ff96; background-color: alpha(#669900,0.5); } + #XfceNotifyWindow { color: #66cbec; border-radius: 0px; border-width: 2px; border-style: solid; background-color: #203d79; border-left-color: #6377a1; border-top-color: #6377a1; border-right-color: #15284f; border-bottom-color: #15284f; } #XfceNotifyWindow label { color: #66cbec; } diff --git a/source/gtk4/_common.scss b/source/gtk4/_common.scss index 2f9c019..1e120cb 100644 --- a/source/gtk4/_common.scss +++ b/source/gtk4/_common.scss @@ -3773,4 +3773,4 @@ splitbutton { } @import '../common/undershoot.scss'; -@import '../common/xfce.scss'; +@import '../common/desktops.scss'; diff --git a/source/gtk4/gtk-new.css b/source/gtk4/gtk-new.css index 14516b2..0cba66f 100644 --- a/source/gtk4/gtk-new.css +++ b/source/gtk4/gtk-new.css @@ -1667,6 +1667,12 @@ undershoot.left { background-size: 0.5em 100%; background-position: left; } undershoot.right { background-size: 0.5em 100%; background-position: right; } +XfdesktopIconView.view { text-shadow: 0 0 2px #323232, 0 0 2px #323232, 0 0 2px #323232; color: #EDF0F5; background-color: transparent; } + +XfdesktopIconView.view .rubberband { background-color: alpha(#669900,0.5); } + +XfdesktopIconView.view:active { text-shadow: none; color: #d1ff96; background-color: alpha(#669900,0.5); } + #XfceNotifyWindow { color: #66cbec; border-radius: 0px; border-width: 2px; border-style: solid; background-color: #203d79; border-left-color: #6377a1; border-top-color: #6377a1; border-right-color: #15284f; border-bottom-color: #15284f; } #XfceNotifyWindow label { color: #66cbec; }