diff --git a/README.md b/README.md index 94a8c3f..53b4ea4 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ Usage: `./install.sh [OPTIONS...]` -s, --size [default|180|220|240|260|280] Set Nautilus sidebar minimum width. Default is 200px - -i, --icon [standard|simple|gnome|ubuntu|arch|manjaro|fedora|debian|void] + -i, --icon [standard|simple|gnome|ubuntu|arch|manjaro|fedora|debian|void|opensuse|popos|mxlinux|zorin] Set 'Activities' icon. Default is 'standard' -b, --background [default|blank|IMAGE_PATH] diff --git a/lib-core.sh b/lib-core.sh index cd7adb1..b29c749 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -83,7 +83,7 @@ COLOR_VARIANTS=('light' 'dark') OPACITY_VARIANTS=('normal' 'solid') ALT_VARIANTS=('normal' 'alt') THEME_VARIANTS=('default' 'blue' 'purple' 'pink' 'red' 'orange' 'yellow' 'green' 'grey') -ICON_VARIANTS=('standard' 'simple' 'gnome' 'ubuntu' 'arch' 'manjaro' 'fedora' 'debian' 'void') +ICON_VARIANTS=('standard' 'simple' 'gnome' 'ubuntu' 'arch' 'manjaro' 'fedora' 'debian' 'void' 'opensuse' 'popos' 'mxlinux' 'zorin') SIDEBAR_SIZE_VARIANTS=('default' '180' '220' '240' '260' '280') PANEL_OPACITY_VARIANTS=('default' '30' '45' '60' '75') NAUTILUS_STYLE_VARIANTS=('stable' 'normal' 'mojave' 'glassy') @@ -158,6 +158,23 @@ anim=( " ${c_blue}•${c_green}•${c_red}•${c_magenta}•" ) +# Check command availability +has_command() { + command -v "$1" &> /dev/null +} + +has_flatpak_app() { + flatpak list --columns=application | grep "${1}" &> /dev/null || return 1 +} + +has_snap_app() { + snap list "${1}" &> /dev/null || return 1 +} + +is_my_distro() { + [[ "$(cat '/etc/os-release' | awk -F '=' '/ID/{print $2}')" =~ "${1}" ]] +} + ############################################################################### # CORE UTILITIES # ############################################################################### @@ -286,6 +303,10 @@ signal_error() { prompt -e "GNOME : ${GNOME_VERSION}" prompt -e "REPO : ${repo_ver}\n" + if has_command apt; then + prompt -i "HINT: Try install depends to fix this: sudo apt install sassc libglib2.0-dev-bin libxml2-utils\n" + fi + prompt -i "HINT: You can google or report to us the info above\n" prompt -i "https://github.com/vinceliuice/WhiteSur-gtk-theme/issues\n\n" @@ -351,23 +372,6 @@ helpify() { printf " ${c_blue}%s ${c_green}%s\n ${c_magenta}%s. ${c_cyan}%s\n\n${c_default}" "${1}" "${2}" "${3}" "${4}" } -# Check command availability -has_command() { - command -v "$1" &> /dev/null -} - -has_flatpak_app() { - flatpak list --columns=application | grep "${1}" &> /dev/null || return 1 -} - -has_snap_app() { - snap list "${1}" &> /dev/null || return 1 -} - -is_my_distro() { - [[ "$(cat '/etc/os-release' | awk -F '=' '/ID/{print $2}')" =~ "${1}" ]] -} - ############################################################################### # PARAMETERS # ############################################################################### diff --git a/lib-install.sh b/lib-install.sh index be2d1e2..f212ce1 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -775,7 +775,7 @@ customize_theme() { # Change panel font color if [[ "${monterey}" == 'true' ]]; then black_font="true" - prompt -s "Changing to montery style ..." + prompt -s "Changing to Monterey style ..." sed $SED_OPT "/\$monterey/s/false/true/" "${THEME_SRC_DIR}/sass/_theme-options-temp.scss" sed $SED_OPT "/\$panel_opacity/s/0.15/0.5/" "${THEME_SRC_DIR}/sass/_theme-options-temp.scss" fi diff --git a/release/WhiteSur-dark-3-38.tar.xz b/release/WhiteSur-dark-3-38.tar.xz index 7a560d9..feb61f8 100644 Binary files a/release/WhiteSur-dark-3-38.tar.xz and b/release/WhiteSur-dark-3-38.tar.xz differ diff --git a/release/WhiteSur-dark-40-0.tar.xz b/release/WhiteSur-dark-40-0.tar.xz index 396b9eb..a7d3cb3 100644 Binary files a/release/WhiteSur-dark-40-0.tar.xz and b/release/WhiteSur-dark-40-0.tar.xz differ diff --git a/release/WhiteSur-dark-solid-3-38.tar.xz b/release/WhiteSur-dark-solid-3-38.tar.xz index b6bb72a..5fd4c75 100644 Binary files a/release/WhiteSur-dark-solid-3-38.tar.xz and b/release/WhiteSur-dark-solid-3-38.tar.xz differ diff --git a/release/WhiteSur-dark-solid-40-0.tar.xz b/release/WhiteSur-dark-solid-40-0.tar.xz index 1210372..b50e3bf 100644 Binary files a/release/WhiteSur-dark-solid-40-0.tar.xz and b/release/WhiteSur-dark-solid-40-0.tar.xz differ diff --git a/release/WhiteSur-light-3-38.tar.xz b/release/WhiteSur-light-3-38.tar.xz index c831a3e..0c11d11 100644 Binary files a/release/WhiteSur-light-3-38.tar.xz and b/release/WhiteSur-light-3-38.tar.xz differ diff --git a/release/WhiteSur-light-40-0.tar.xz b/release/WhiteSur-light-40-0.tar.xz index 7dd44c8..e127128 100644 Binary files a/release/WhiteSur-light-40-0.tar.xz and b/release/WhiteSur-light-40-0.tar.xz differ diff --git a/release/WhiteSur-light-solid-3-38.tar.xz b/release/WhiteSur-light-solid-3-38.tar.xz index e2c94cb..32ed4ef 100644 Binary files a/release/WhiteSur-light-solid-3-38.tar.xz and b/release/WhiteSur-light-solid-3-38.tar.xz differ diff --git a/release/WhiteSur-light-solid-40-0.tar.xz b/release/WhiteSur-light-solid-40-0.tar.xz index a5af002..b53e8e3 100644 Binary files a/release/WhiteSur-light-solid-40-0.tar.xz and b/release/WhiteSur-light-solid-40-0.tar.xz differ diff --git a/src/assets/gnome-shell/activities-black/activities-mxlinux.svg b/src/assets/gnome-shell/activities-black/activities-mxlinux.svg new file mode 100644 index 0000000..06e67bc --- /dev/null +++ b/src/assets/gnome-shell/activities-black/activities-mxlinux.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/gnome-shell/activities-black/activities-opensuse.svg b/src/assets/gnome-shell/activities-black/activities-opensuse.svg new file mode 100644 index 0000000..1805990 --- /dev/null +++ b/src/assets/gnome-shell/activities-black/activities-opensuse.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/gnome-shell/activities-black/activities-popos.svg b/src/assets/gnome-shell/activities-black/activities-popos.svg new file mode 100644 index 0000000..56da326 --- /dev/null +++ b/src/assets/gnome-shell/activities-black/activities-popos.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/gnome-shell/activities-black/activities-zorin.svg b/src/assets/gnome-shell/activities-black/activities-zorin.svg new file mode 100644 index 0000000..1cad42e --- /dev/null +++ b/src/assets/gnome-shell/activities-black/activities-zorin.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/gnome-shell/activities/activities-mxlinux.svg b/src/assets/gnome-shell/activities/activities-mxlinux.svg new file mode 100644 index 0000000..aca9404 --- /dev/null +++ b/src/assets/gnome-shell/activities/activities-mxlinux.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/gnome-shell/activities/activities-opensuse.svg b/src/assets/gnome-shell/activities/activities-opensuse.svg new file mode 100644 index 0000000..bf3e809 --- /dev/null +++ b/src/assets/gnome-shell/activities/activities-opensuse.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/gnome-shell/activities/activities-popos.svg b/src/assets/gnome-shell/activities/activities-popos.svg new file mode 100644 index 0000000..f218a92 --- /dev/null +++ b/src/assets/gnome-shell/activities/activities-popos.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/gnome-shell/activities/activities-zorin.svg b/src/assets/gnome-shell/activities/activities-zorin.svg new file mode 100644 index 0000000..4adfa95 --- /dev/null +++ b/src/assets/gnome-shell/activities/activities-zorin.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/xfwm4/assets-dark-hdpi/close-active.png b/src/assets/xfwm4/assets-dark-hdpi/close-active.png index 76e5ac6..863be72 100644 Binary files a/src/assets/xfwm4/assets-dark-hdpi/close-active.png and b/src/assets/xfwm4/assets-dark-hdpi/close-active.png differ diff --git a/src/assets/xfwm4/assets-dark-hdpi/close-prelight.png b/src/assets/xfwm4/assets-dark-hdpi/close-prelight.png index 65290b7..77e800c 100644 Binary files a/src/assets/xfwm4/assets-dark-hdpi/close-prelight.png and b/src/assets/xfwm4/assets-dark-hdpi/close-prelight.png differ diff --git a/src/assets/xfwm4/assets-dark-hdpi/close-pressed.png b/src/assets/xfwm4/assets-dark-hdpi/close-pressed.png index 7e82c75..4e36337 100644 Binary files a/src/assets/xfwm4/assets-dark-hdpi/close-pressed.png and b/src/assets/xfwm4/assets-dark-hdpi/close-pressed.png differ diff --git a/src/assets/xfwm4/assets-dark-hdpi/hide-active.png b/src/assets/xfwm4/assets-dark-hdpi/hide-active.png index 00dbd7c..1d06ff7 100644 Binary files a/src/assets/xfwm4/assets-dark-hdpi/hide-active.png and b/src/assets/xfwm4/assets-dark-hdpi/hide-active.png differ diff --git a/src/assets/xfwm4/assets-dark-hdpi/hide-prelight.png b/src/assets/xfwm4/assets-dark-hdpi/hide-prelight.png index 8b97b53..d1cd198 100644 Binary files a/src/assets/xfwm4/assets-dark-hdpi/hide-prelight.png and b/src/assets/xfwm4/assets-dark-hdpi/hide-prelight.png differ diff --git a/src/assets/xfwm4/assets-dark-hdpi/hide-pressed.png b/src/assets/xfwm4/assets-dark-hdpi/hide-pressed.png index 42fe6a8..45f14ff 100644 Binary files a/src/assets/xfwm4/assets-dark-hdpi/hide-pressed.png and b/src/assets/xfwm4/assets-dark-hdpi/hide-pressed.png differ diff --git a/src/assets/xfwm4/assets-dark-hdpi/maximize-active.png b/src/assets/xfwm4/assets-dark-hdpi/maximize-active.png index 1394e9a..d5cbd10 100644 Binary files a/src/assets/xfwm4/assets-dark-hdpi/maximize-active.png and b/src/assets/xfwm4/assets-dark-hdpi/maximize-active.png differ diff --git a/src/assets/xfwm4/assets-dark-hdpi/maximize-prelight.png b/src/assets/xfwm4/assets-dark-hdpi/maximize-prelight.png index 0cd37f0..d7ef99a 100644 Binary files a/src/assets/xfwm4/assets-dark-hdpi/maximize-prelight.png and b/src/assets/xfwm4/assets-dark-hdpi/maximize-prelight.png differ diff --git a/src/assets/xfwm4/assets-dark-hdpi/maximize-pressed.png b/src/assets/xfwm4/assets-dark-hdpi/maximize-pressed.png index 981c56e..2867f2d 100644 Binary files a/src/assets/xfwm4/assets-dark-hdpi/maximize-pressed.png and b/src/assets/xfwm4/assets-dark-hdpi/maximize-pressed.png differ diff --git a/src/assets/xfwm4/assets-dark-hdpi/maximize-toggled-active.png b/src/assets/xfwm4/assets-dark-hdpi/maximize-toggled-active.png index 1394e9a..d5cbd10 100644 Binary files a/src/assets/xfwm4/assets-dark-hdpi/maximize-toggled-active.png and b/src/assets/xfwm4/assets-dark-hdpi/maximize-toggled-active.png differ diff --git a/src/assets/xfwm4/assets-dark-hdpi/maximize-toggled-prelight.png b/src/assets/xfwm4/assets-dark-hdpi/maximize-toggled-prelight.png index f3859af..916bd51 100644 Binary files a/src/assets/xfwm4/assets-dark-hdpi/maximize-toggled-prelight.png and b/src/assets/xfwm4/assets-dark-hdpi/maximize-toggled-prelight.png differ diff --git a/src/assets/xfwm4/assets-dark-hdpi/maximize-toggled-pressed.png b/src/assets/xfwm4/assets-dark-hdpi/maximize-toggled-pressed.png index 1f4dd5f..238e751 100644 Binary files a/src/assets/xfwm4/assets-dark-hdpi/maximize-toggled-pressed.png and b/src/assets/xfwm4/assets-dark-hdpi/maximize-toggled-pressed.png differ diff --git a/src/assets/xfwm4/assets-dark-xhdpi/close-active.png b/src/assets/xfwm4/assets-dark-xhdpi/close-active.png index 02b9039..1f96326 100644 Binary files a/src/assets/xfwm4/assets-dark-xhdpi/close-active.png and b/src/assets/xfwm4/assets-dark-xhdpi/close-active.png differ diff --git a/src/assets/xfwm4/assets-dark-xhdpi/close-prelight.png b/src/assets/xfwm4/assets-dark-xhdpi/close-prelight.png index fe82a3e..d208754 100644 Binary files a/src/assets/xfwm4/assets-dark-xhdpi/close-prelight.png and b/src/assets/xfwm4/assets-dark-xhdpi/close-prelight.png differ diff --git a/src/assets/xfwm4/assets-dark-xhdpi/close-pressed.png b/src/assets/xfwm4/assets-dark-xhdpi/close-pressed.png index 878ae89..1daa17c 100644 Binary files a/src/assets/xfwm4/assets-dark-xhdpi/close-pressed.png and b/src/assets/xfwm4/assets-dark-xhdpi/close-pressed.png differ diff --git a/src/assets/xfwm4/assets-dark-xhdpi/hide-active.png b/src/assets/xfwm4/assets-dark-xhdpi/hide-active.png index 97e72ef..63bde89 100644 Binary files a/src/assets/xfwm4/assets-dark-xhdpi/hide-active.png and b/src/assets/xfwm4/assets-dark-xhdpi/hide-active.png differ diff --git a/src/assets/xfwm4/assets-dark-xhdpi/hide-prelight.png b/src/assets/xfwm4/assets-dark-xhdpi/hide-prelight.png index c292766..8496a15 100644 Binary files a/src/assets/xfwm4/assets-dark-xhdpi/hide-prelight.png and b/src/assets/xfwm4/assets-dark-xhdpi/hide-prelight.png differ diff --git a/src/assets/xfwm4/assets-dark-xhdpi/hide-pressed.png b/src/assets/xfwm4/assets-dark-xhdpi/hide-pressed.png index 85d94c9..d066351 100644 Binary files a/src/assets/xfwm4/assets-dark-xhdpi/hide-pressed.png and b/src/assets/xfwm4/assets-dark-xhdpi/hide-pressed.png differ diff --git a/src/assets/xfwm4/assets-dark-xhdpi/maximize-active.png b/src/assets/xfwm4/assets-dark-xhdpi/maximize-active.png index 2ec58a1..af2368e 100644 Binary files a/src/assets/xfwm4/assets-dark-xhdpi/maximize-active.png and b/src/assets/xfwm4/assets-dark-xhdpi/maximize-active.png differ diff --git a/src/assets/xfwm4/assets-dark-xhdpi/maximize-prelight.png b/src/assets/xfwm4/assets-dark-xhdpi/maximize-prelight.png index f6c2a88..a6d7717 100644 Binary files a/src/assets/xfwm4/assets-dark-xhdpi/maximize-prelight.png and b/src/assets/xfwm4/assets-dark-xhdpi/maximize-prelight.png differ diff --git a/src/assets/xfwm4/assets-dark-xhdpi/maximize-pressed.png b/src/assets/xfwm4/assets-dark-xhdpi/maximize-pressed.png index 5c0cf19..48bc0c8 100644 Binary files a/src/assets/xfwm4/assets-dark-xhdpi/maximize-pressed.png and b/src/assets/xfwm4/assets-dark-xhdpi/maximize-pressed.png differ diff --git a/src/assets/xfwm4/assets-dark-xhdpi/maximize-toggled-active.png b/src/assets/xfwm4/assets-dark-xhdpi/maximize-toggled-active.png index 2ec58a1..af2368e 100644 Binary files a/src/assets/xfwm4/assets-dark-xhdpi/maximize-toggled-active.png and b/src/assets/xfwm4/assets-dark-xhdpi/maximize-toggled-active.png differ diff --git a/src/assets/xfwm4/assets-dark-xhdpi/maximize-toggled-prelight.png b/src/assets/xfwm4/assets-dark-xhdpi/maximize-toggled-prelight.png index c896a61..ea9bafb 100644 Binary files a/src/assets/xfwm4/assets-dark-xhdpi/maximize-toggled-prelight.png and b/src/assets/xfwm4/assets-dark-xhdpi/maximize-toggled-prelight.png differ diff --git a/src/assets/xfwm4/assets-dark-xhdpi/maximize-toggled-pressed.png b/src/assets/xfwm4/assets-dark-xhdpi/maximize-toggled-pressed.png index a126be9..4e50ca1 100644 Binary files a/src/assets/xfwm4/assets-dark-xhdpi/maximize-toggled-pressed.png and b/src/assets/xfwm4/assets-dark-xhdpi/maximize-toggled-pressed.png differ diff --git a/src/assets/xfwm4/assets-dark.svg b/src/assets/xfwm4/assets-dark.svg index 3f4b99e..92c51bd 100644 --- a/src/assets/xfwm4/assets-dark.svg +++ b/src/assets/xfwm4/assets-dark.svg @@ -2,40 +2,31 @@ + inkscape:version="1.1 (c4e8f9ed74, 2021-05-24)" + sodipodi:docname="assets-dark.svg" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + inkscape:swatch="solid"> - - - - - - - - - + inkscape:window-maximized="1" + inkscape:pagecheckerboard="0"> image/svg+xml - @@ -599,12 +574,17 @@ inkscape:connector-curvature="0" id="path2" d="m 12.000061,1047.3622 c 3.865929,0 6.999939,-3.134 6.999939,-7 0,-3.866 -3.13401,-7 -6.999939,-7 -3.8660427,0 -7.0000616,3.134 -7.0000616,7 0,3.866 3.1340189,7 7.0000616,7" - style="fill:#d52735;fill-opacity:1;fill-rule:evenodd;stroke:none" /> + style="fill:#e9524a;fill-opacity:1;fill-rule:evenodd;stroke:none" /> + + style="fill:#59c837;fill-opacity:1;fill-rule:evenodd;stroke:none" /> + + style="fill:#f1ae1b;fill-opacity:1;fill-rule:evenodd;stroke:none" /> + + style="fill:#f1ae1b;fill-opacity:1;fill-rule:evenodd;stroke:none" /> + style="opacity:1;fill:#f1ae1b;fill-opacity:1;fill-rule:evenodd;stroke:none" /> + style="fill:#59c837;fill-opacity:1;fill-rule:evenodd;stroke:none" /> + style="opacity:1;fill:#59c837;fill-opacity:1;fill-rule:evenodd;stroke:none" /> + style="fill:#e9524a;fill-opacity:1;fill-rule:evenodd;stroke:none" /> + style="fill:#e9524a;fill-opacity:1;fill-rule:evenodd;stroke:none" /> @@ -1510,12 +1500,12 @@ transform="translate(7,-436.00004)" id="g1515"> @@ -1634,12 +1624,12 @@ transform="translate(7,-469.00004)" id="g1523"> @@ -1968,12 +1958,12 @@ inkscape:connector-curvature="0" id="path1825" d="m 12.000061,1047.3622 c 3.865929,0 6.999939,-3.134 6.999939,-7 0,-3.866 -3.13401,-7 -6.999939,-7 -3.8660427,0 -7.0000616,3.134 -7.0000616,7 0,3.866 3.1340189,7 7.0000616,7" - style="fill:#39ea49;fill-opacity:1;fill-rule:evenodd;stroke:none" /> + style="fill:#59c837;fill-opacity:1;fill-rule:evenodd;stroke:none" /> + style="opacity:1;fill:#59c837;fill-opacity:1;fill-rule:evenodd;stroke:none" /> + style="fill:#59c837;fill-opacity:1;fill-rule:evenodd;stroke:none" /> + style="opacity:1;fill:#59c837;fill-opacity:1;fill-rule:evenodd;stroke:none" /> + style="fill:#59c837;fill-opacity:1;fill-rule:evenodd;stroke:none" /> + menu > menupopup { @@ -25,6 +22,8 @@ menubar > menu > menupopup { menuitem, menupopup menu { -moz-appearance: none !important; padding: 4px 8px !important; + border: none !important; + box-shadow: none !important; } menuitem[type="checkbox"] image, menuitem[type="radio"] image { @@ -35,8 +34,30 @@ menuitem[disabled="true"]:hover, menupopup menu[disabled="true"]:hover { background: transparent !important; } +menupopup { + --panel-background: transparent !important; + --panel-border-color: transparent !important; +} + +panel { + --panel-background: var(--gnome-menu-background) !important; + --panel-border-color: var(--gnome-menu-border-color) !important; +} + +:is(menupopup, panel)[type="arrow"] { + --panel-border-radius: 12px !important; + --panel-padding: 8px !important; +} + +:is(panel, menupopup)::part(content) { + border: none !important; +} + /* Adjust popovers position */ -panel[type=arrow] { +panel[type="arrow"] { + appearance: none !important; + border: none !important; + background-color: transparent !important; margin-top: 8px !important; } @@ -45,23 +66,23 @@ panel[type=arrow] { .panel-header, .PanelUI-subView, .panel-subview-body, #widget-overflow-mainView, #protections-popup-footer, panelview { - border: 0 !important; + border: none !important; background: transparent !important; } +panelview { + padding: 8px !important; + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1), inset 0 0 0 1px rgba(255, 255, 255, 0.06) !important; + border-radius: 12px !important; +} + .panel-arrowcontent { background: var(--gnome-popover-background) !important; - border: 1px solid !important; - border-color: var(--gnome-popover-border-color) !important; - border-radius: 8px!important; - padding: 12px !important; + border: 1px solid var(--gnome-popover-border-color) !important; + border-radius: 12px !important; color: var(--gnome-toolbar-color) !important; } -.panel-arrow { - fill: var(--gnome-popover-background) !important; - stroke: var(--gnome-popover-border-color) !important; - display: -moz-inline-box !important; -} + panel:not([remote]), #BMB_bookmarksPopup { --arrowpanel-background: var(--gnome-popover-background) !important; } diff --git a/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css b/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css index e17f3bc..206e085 100644 --- a/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css +++ b/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css @@ -156,12 +156,6 @@ toolbarspring { fill-opacity: 1 !important; } -.urlbar-icon { - width: 28px !important; - height: 28px !important; - padding: 6px !important; -} - #page-action-buttons { padding: 2px 0 !important; } diff --git a/src/other/firefox/WhiteSur/parts/icons.css b/src/other/firefox/WhiteSur/parts/icons.css index 56784c0..f765252 100644 --- a/src/other/firefox/WhiteSur/parts/icons.css +++ b/src/other/firefox/WhiteSur/parts/icons.css @@ -347,7 +347,7 @@ menuitem[type="radio"]:not([disabled="true"]):hover .menu-iconic-icon { list-style-image: url("../icons/drm-symbolic.svg") !important; } -#reader-mode-button { +#reader-mode-button > .urlbar-icon { list-style-image: url("../icons/reader-mode.svg") !important; } @@ -524,7 +524,7 @@ menuitem[type="radio"]:not([disabled="true"]):hover .menu-iconic-icon { #pageActionButton, #permissions-granted-icon, #tracking-protection-icon-animatable-image, - #reader-mode-button, + #reader-mode-button > .urlbar-icon, #star-button:not([starred]), #geo-sharing-icon[sharing], .geo-icon, .blocked-permission-icon.popup-icon, diff --git a/src/other/firefox/WhiteSur/parts/popups.css b/src/other/firefox/WhiteSur/parts/popups.css index 7d44212..4e1ee20 100644 --- a/src/other/firefox/WhiteSur/parts/popups.css +++ b/src/other/firefox/WhiteSur/parts/popups.css @@ -9,12 +9,9 @@ menupopup { background: var(--gnome-menu-background) !important; border: 1px solid var(--gnome-menu-border-color) !important; border-radius: 8px !important; - padding: 8px 0 !important; + padding: 6px 0 !important; color: var(--gnome-toolbar-color) !important; - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1), inset 0 0 0 1px rgba(255, 255, 255, 0.06) !important; -} -menupopup menupopup { - margin: -5px 0 0 -4px; + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1), inset 0 0 0 1px rgba(255, 255, 255, 0.06) !important; } menubar > menu > menupopup { @@ -25,6 +22,8 @@ menubar > menu > menupopup { menuitem, menupopup menu { -moz-appearance: none !important; padding: 4px 8px !important; + border: none !important; + box-shadow: none !important; } menuitem[type="checkbox"] image, menuitem[type="radio"] image { @@ -35,8 +34,30 @@ menuitem[disabled="true"]:hover, menupopup menu[disabled="true"]:hover { background: transparent !important; } +menupopup { + --panel-background: transparent !important; + --panel-border-color: transparent !important; +} + +panel { + --panel-background: var(--gnome-menu-background) !important; + --panel-border-color: var(--gnome-menu-border-color) !important; +} + +:is(menupopup, panel)[type="arrow"] { + --panel-border-radius: 12px !important; + --panel-padding: 8px !important; +} + +:is(panel, menupopup)::part(content) { + border: none !important; +} + /* Adjust popovers position */ -panel[type=arrow] { +panel[type="arrow"] { + appearance: none !important; + border: none !important; + background-color: transparent !important; margin-top: 8px !important; } @@ -45,23 +66,23 @@ panel[type=arrow] { .panel-header, .PanelUI-subView, .panel-subview-body, #widget-overflow-mainView, #protections-popup-footer, panelview { - border: 0 !important; + border: none !important; background: transparent !important; } +panelview { + padding: 8px !important; + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1), inset 0 0 0 1px rgba(255, 255, 255, 0.06) !important; + border-radius: 12px !important; +} + .panel-arrowcontent { background: var(--gnome-popover-background) !important; - border: 1px solid !important; - border-color: var(--gnome-popover-border-color) !important; - border-radius: 8px!important; - padding: 12px !important; + border: 1px solid var(--gnome-popover-border-color) !important; + border-radius: 12px !important; color: var(--gnome-toolbar-color) !important; } -.panel-arrow { - fill: var(--gnome-popover-background) !important; - stroke: var(--gnome-popover-border-color) !important; - display: -moz-inline-box !important; -} + panel:not([remote]), #BMB_bookmarksPopup { --arrowpanel-background: var(--gnome-popover-background) !important; } diff --git a/src/sass/cinnamon/_common.scss b/src/sass/cinnamon/_common.scss index 8361d9a..1f749ac 100644 --- a/src/sass/cinnamon/_common.scss +++ b/src/sass/cinnamon/_common.scss @@ -277,7 +277,7 @@ $menu_border: if($variant=='light', darken($menu_bg, 18%), darken($menu_bg, 12%) .menu, .popup-menu, %menu { - padding: 0 6px; + padding: 0 6px 4px; color: $fg_color; @if $trans == 'true' { @@ -341,7 +341,7 @@ $menu_border: if($variant=='light', darken($menu_bg, 18%), darken($menu_bg, 12%) -arrow-border-color: rgba(0,0,0,0.0); -arrow-base: 0; -arrow-rise: 0; - margin: 0.4em 0.5em 0.5em; + margin: 0.5em; border-radius: $bt_radius; } @@ -1313,14 +1313,13 @@ $menu_border: if($variant=='light', darken($menu_bg, 18%), darken($menu_bg, 12%) font-weight: bold; spacing: 1em; padding: 20px; - // margin: 32px; min-width: 64px; min-height: 64px; color: $osd_fg_color; background-color: $osd_bg_color; + box-shadow: 0 6px 16px rgba(black, 0.25); border: none; border-radius: $wm_radius; - box-shadow: 0 5px 10px rgba(black, 0.25); .osd-monitor-label { font-size: 3em; } diff --git a/src/sass/gnome-shell/common/_panel.scss b/src/sass/gnome-shell/common/_panel.scss index d371b28..e50c0e2 100644 --- a/src/sass/gnome-shell/common/_panel.scss +++ b/src/sass/gnome-shell/common/_panel.scss @@ -81,13 +81,23 @@ &:hover { color: $panel_fg; background-color: $panel_divider; + + &.clock-display { + .clock { + background-color: $panel_divider; + } + } } &:active, &:overview, &:focus, &:checked { - &, &:hover { - background-color: $panel_track; - color: $panel_fg; - box-shadow: none; + background-color: $panel_track; + color: $panel_fg; + box-shadow: none; + + &.clock-display { + .clock { + background-color: $panel_track; + } } } @@ -99,14 +109,18 @@ } &.clock-display { - StLabel { padding: 0 $base_margin; } + background-color: transparent; + + StLabel { padding: 0 $base_padding; } .clock { // transition-duration: 150ms; border: none; - border-radius: 0; - background: none; + border-radius: $bt_radius; + background-color: transparent; box-shadow: none; + padding: 0 $base_padding * 3; + spacing: $base_padding; } } @@ -117,6 +131,7 @@ // we want to exclude the do-not-disturb indicator from the background &.clock-display { box-shadow: none; + background-color: transparent; .clock { box-shadow: none; diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss index 26173a9..1bc2f46 100644 --- a/src/sass/gtk/_common-3.0.scss +++ b/src/sass/gtk/_common-3.0.scss @@ -2170,9 +2170,9 @@ menubar, } } -.context-menu, menu, -.menu { +.menu, +.context-menu { // margin: 4px; padding: $container_padding; border-radius: $mn_radius; @@ -2307,11 +2307,13 @@ menu, // popover, popover.background { - padding: 0; + padding: $container_padding; border-radius: $wm_radius; background-clip: border-box; background-color: $menu_bg; + &.menu { padding: 0; } + box-shadow: 0 3px 6px 0 if($variant=='light', transparentize(black, 0.85), transparentize(black, 0.85)), 0 0 0 1px if($variant=='light', rgba($borders_color, 0.03), rgba($dark_borders_color, 0.55)); @@ -2382,6 +2384,8 @@ cursor-handle { background-color: transparentize($base_color, 1); border: 1px solid transparent; transition: all 150ms ease-out; + border-radius: 0; + padding: $container_padding - 4px $container_padding + 4px; &:hover:not(:checked) { color: mix($fg_color, $disabled_fg_color, 50%); @@ -2396,6 +2400,25 @@ cursor-handle { } } +%monterey_tab { + color: $disabled_fg_color; + background-color: transparentize($base_color, 1); + border: none; + transition: all 150ms ease-out; + border-radius: $bt_radius; + padding: 0 $container_padding + 4px; + + &:hover:not(:checked) { + color: mix($fg_color, $disabled_fg_color, 50%); + background-color: rgba($fg_color, 0.06); + } + + &:checked { + color: $fg_color; + background-color: rgba($fg_color, 0.12); + } +} + notebook { padding: 0; @@ -2410,62 +2433,75 @@ notebook { } > header { - padding: 0; - background-color: darken($header_bg, 10%); + @if $monterey == 'false' { + background-color: darken($header_bg, 10%); - // Set box-shadow to make the header frame color more easy to see - // Set margin to hide the ugly borders around the header - &.top { - margin-top: -1px; - box-shadow: inset 0 1px $solid_borders_color, inset 0 -1px $borders_color; - @if $variant=='light' { - box-shadow: inset 0 1px $borders_color, - inset 0 -1px $borders_color, - 1px 0 $borders_color, - -1px 0 $borders_color; + // Set box-shadow to make the header frame color more easy to see + // Set margin to hide the ugly borders around the header + &.top { + box-shadow: inset 0 1px $borders_color, inset 0 -1px $borders_color; + // @if $variant=='light' { + // box-shadow: inset 0 1px $borders_color, + // inset 0 -1px $borders_color, + // 1px 0 $borders_color, + // -1px 0 $borders_color; + // } } - } - &.bottom { - box-shadow: inset 0 1px $borders_color, inset 0 -1px $solid_borders_color; - @if $variant=='light' { - box-shadow: inset 0 1px $borders_color, - inset 0 -1px $borders_color, - 1px 0 $borders_color, - -1px 0 $borders_color; + &.bottom { + box-shadow: inset 0 1px $borders_color, inset 0 -1px $borders_color; + // @if $variant=='light' { + // box-shadow: inset 0 1px $borders_color, + // inset 0 -1px $borders_color, + // 1px 0 $borders_color, + // -1px 0 $borders_color; + // } } - margin-bottom: -1px; - } - &.right { - box-shadow: inset 1px 0 $borders_color, inset -1px 0 $solid_borders_color; - @if $variant=='light' { - box-shadow: inset 1px 0 $borders_color, - inset -1px 0 $borders_color, - 0 1px $borders_color, - 0 -1px $borders_color; + &.right { + box-shadow: inset 1px 0 $borders_color, inset -1px 0 $borders_color; + // @if $variant=='light' { + // box-shadow: inset 1px 0 $borders_color, + // inset -1px 0 $borders_color, + // 0 1px $borders_color, + // 0 -1px $borders_color; + // } } - margin-right: -1px; - } - &.left { - box-shadow: inset 1px 0 $solid_borders_color, inset -1px 0 $borders_color; - @if $variant=='light' { - box-shadow: inset 1px 0 $borders_color, - inset -1px 0 $borders_color, - 0 1px $borders_color, - 0 -1px $borders_color; + &.left { + box-shadow: inset 1px 0 $borders_color, inset -1px 0 $borders_color; + // @if $variant=='light' { + // box-shadow: inset 1px 0 $borders_color, + // inset -1px 0 $borders_color, + // 0 1px $borders_color, + // 0 -1px $borders_color; + // } + } + } @else { + &.top { + border-bottom: 1px solid $borders_color; + } + + &.bottom { + border-top: 1px solid $borders_color; + } + + &.right { + border-left: 1px solid $borders_color; + } + + &.left { + border-right: 1px solid $borders_color; } - margin-left: -1px; } button.flat.toggle.popup { min-width: $menuitem_size; - border-radius: 0; - padding: 0; border: none; box-shadow: none; - margin: 0; + padding: 0; + margin-left: $container_padding / 2; + border-radius: $bt_radius; &:active, &:checked { color: $fg_color; @@ -2476,19 +2512,29 @@ notebook { @each $_pos, $_bpos in (top, bottom), (bottom, top), (right, left), (left, right) { // sizing and borders &.#{$_pos} { - padding: 0; + @if $monterey == 'false' { + margin-#{$_pos}: -1px; + padding: 0; + } @else { + padding: $container_padding / 2; + } > tabs > tab { - padding: $container_padding - 4px $container_padding + 4px; + outline-offset: -4px; min-width: 24px; min-height: 24px; - border-radius: 0; - outline-offset: -4px; - // tab overlap - + tab { - @if $_pos==top or $_pos==bottom { margin-left: -1px; } - @else { margin-top: -1px; } + @if $monterey == 'false' { + // tab overlap + + tab { + @if $_pos==top or $_pos==bottom { margin-left: -1px; } + @else { margin-top: -1px; } + } + } @else { + + tab { + @if $_pos==top or $_pos==bottom { margin-left: $container_padding / 2; } + @else { margin-top: $container_padding / 2; } + } } } } @@ -2527,34 +2573,52 @@ notebook { &:disabled { color: transparentize($disabled_fg_color,0.3); } } - &.top, - &.bottom { - > tabs > tab { - &:first-child { border-left: none; } - &:last-child { border-right: none; } + @if $monterey == 'false' { + &.top, + &.bottom { + > tabs > tab { + &:first-child { border-left: none; } + &:last-child { border-right: none; } + } } - } - &.left, - &.right { - > tabs > tab { - &:first-child { border-top: none; } - &:last-child { border-bottom: none; } + &.left, + &.right { + > tabs > tab { + &:first-child { border-top: none; } + &:last-child { border-bottom: none; } + } } } > tabs > tab { - @extend %tabs_tab; + @if $monterey == 'false' { + @extend %tabs_tab; + } @else { + @extend %monterey_tab; + } // close button - button.flat, button.close-button { - min-height: $small_size; - min-width: $small_size; + button.flat, + button.close-button, + button.image-button.flat { border-radius: 3px; padding: 0; - margin-top: 2px; - margin-bottom: 2px; color: mix($bg_color, $fg_color, 35%); + margin-left: $container_padding / 2; + margin-right: -$container_padding; + + @if $monterey == 'false' { + min-height: $small_size; + min-width: $small_size; + margin-top: 2px; + margin-bottom: 2px; + } @else { + min-height: 16px; + min-width: 16px; + margin-top: 4px; + margin-bottom: 4px; + } &:hover { @extend %undecorated_button; @@ -2775,14 +2839,6 @@ switch { } } - // the borders of checks and radios are - // too similar in luminosity to the selected background color, hence - // we need special casing. - - // menuitem #{$w}#{$s}:hover, - // .view #{$w}#{$s}:selected, - // treeview.#{$w}#{$s}:selected, - // row:selected #{$w}#{$s}, infobar #{$w}#{$s} { -gtk-icon-source: -gtk-scaled(url("assets/#{$a}#{$as}-selected.png"), url("assets/#{$a}#{$as}-selected@2.png")); @@ -3181,6 +3237,7 @@ levelbar { min-width: 32px; min-height: 1px; } + &.vertical block { min-width: 1px; min-height: 32px; @@ -3201,18 +3258,22 @@ levelbar { background-color: $selected_bg_color; border-radius: $bt_radius; } + block.low { - border-color: $warning_color; - background-color: $warning_color; - } - block.high { border-color: $selected_bg_color; background-color: $selected_bg_color; } - block.full { - border-color: $success_color; - background-color: $success_color; + + block.high { + border-color: $warning_color; + background-color: $warning_color; } + + block.full { + border-color: $error_color; + background-color: $error_color; + } + block.empty { background-color: if($variant=='light', transparentize($fg_color,0.8), $base_color); border-color: if($variant=='light', transparentize($fg_color,0.8), $base_color); @@ -4131,7 +4192,7 @@ decoration { .popup & { box-shadow: none; - border-radius: $wm_radius; + border-radius: $mn_radius; } // server-side decorations as used by mutter diff --git a/src/sass/gtk/apps/_elementary.scss b/src/sass/gtk/apps/_elementary.scss index 0d63582..151f8f8 100644 --- a/src/sass/gtk/apps/_elementary.scss +++ b/src/sass/gtk/apps/_elementary.scss @@ -165,6 +165,86 @@ MarlinViewWindow { &:disabled { @include entry(header-insensitive) } } +// Checkbutton +checkbutton.color-button { + border: 1px solid $borders_color; + border-radius: $circular_radius; + background-clip: border-box; + padding: 0; + + > check { + -gtk-icon-source: none; + background: none; + margin-right: 0; + } + + &.none { + > check { + background-color: transparent; + border-radius: $circular_radius; + -gtk-icon-source: -gtk-icontheme("close-symbolic"); + } + } + + &.blue { + background-color: blue; + } + + &.mint { + background-color: mix(blue, green, 35%); + } + + &.green { + background-color: green; + } + + &.yellow { + background-color: yellow; + } + + &.blue { + background-color: blue; + } + + &.orange { + background-color: orange; + } + + &.red { + background-color: red; + } + + &.pink { + background-color: pink; + } + + &.purple { + background-color: purple; + } + + &.brown { + background-color: brown; + } + + &.slate { + background-color: grey; + } +} + +radiobutton.color-button { + > radio { + -gtk-icon-source: none; + margin-right: 0; + border: 1px solid rgba(black, 0.15); + border-radius: $circular_radius; + background-clip: border-box; + } + + &:active > radio { + border: 1px solid rgba(black, 0.35); + } +} + window.background.csd { > paned.horizontal { > separator { @@ -175,8 +255,7 @@ window.background.csd { > scrolledwindow { > viewport.frame { > box.vertical treeview.view { - - border-right: 1px solid if($variant=='light', $solid_borders_color, $header_border); + border-right: 1px solid $header_border; &:not(:hover):not(:selected) { border-bottom-left-radius: $wm_radius; @@ -187,7 +266,6 @@ window.background.csd { padding-top: 3px; padding-bottom: 3px; border-right: 1px solid $header_border; - // @extend %view; &:not(:selected):hover { background-color: if($variant == 'light', rgba(black, 0.05), rgba(white, 0.05)); } @@ -231,6 +309,57 @@ window.background.csd { } } + &.unified > deck > grid > paned { + > separator { background-image: image($header_border); } + + > .sidebar { + button.expander { color: $disabled_fg_color; } + + actionbar button { @extend %flat_button; } + + list { + padding: $container_padding; + + > row.activatable { + border-radius: $bt_radius; + padding: ($container_padding - 2px) $container_padding * 1.5; + margin: 1px 0; + -gtk-icon-style: symbolic; + + button { + @extend %sidebar_button; + } + + levelbar { + block { + border: none; + + &.low { + background-color: $warning_color; + } + + &.high { + background-color: $selected_bg_color; + } + + &.full { + background-color: $error_color; + } + + &.empty { + background-color: if($variant=='light', transparentize($fg_color,0.8), $base_color); + } + } + + trough { + padding: 0; + } + } + } + } + } + } + &.maximized, &.tiled, &.fullscreen { > stack > stack { > paned.horizontal { @@ -244,8 +373,50 @@ window.background.csd { } } +// Dynamic-notebook .dynamic-notebook { > notebook { + > header { + border-color: $solid_borders_color; + + @if $monterey == 'false' { + background-color: darken($header_bg, 10%); + } @else { + background-color: $header_bg; + } + + > tabs > tab { + padding: 0 10px; + min-height: 0; + + label { + @if $monterey == 'false' { + margin-bottom: -$container_padding / 2; + } @else { + margin-bottom: -$container_padding * 1.5; + } + } + + > widget > grid > revealer > button.image-button.flat { + @if $monterey == 'false' { + margin-top: $container_padding; + margin-right: $container_padding; + margin-bottom: 0; + margin-left: 0; + } @else { + margin-top: $container_padding * 1.5; + margin-right: $container_padding; + margin-bottom: 0; + margin-left: 0; + } + } + } + + > box > button.flat { + margin: 0 $container_padding; + } + } + > stack { border-bottom-right-radius: $wm_radius; background-color: $base_color; @@ -335,6 +506,10 @@ headerbar.titlebar { background-color: $header_bg_backdrop; } } + + &.windowhandle > button { + -gtk-icon-style: symbolic; + } } // Gala @@ -397,8 +572,29 @@ scale.warmth trough { background-color: $bg_color; border-bottom: 1px solid $solid_borders_color; } +} - .dynamic-notebook { - notebook > header { border-color: $solid_borders_color; } +// Popovers +popover.background { + menuitem.toggle { + margin: $container_padding $container_padding * 2; + } +} + +// actionbar +.sidebar > actionbar.inline-toolbar > revealer > box { + border-top: none; +} + +actionbar.bottom-toolbar { + button { -gtk-icon-style: symbolic; } +} + +.sidebar > treeview.view.source-list { + -gtk-icon-style: symbolic; + + &:selected { + background-color: rgba($fg_color, 0.15); + color: $fg_color; } } diff --git a/src/sass/gtk/apps/_gnome-3.22.scss b/src/sass/gtk/apps/_gnome-3.22.scss index eb8f57a..ca0439f 100644 --- a/src/sass/gtk/apps/_gnome-3.22.scss +++ b/src/sass/gtk/apps/_gnome-3.22.scss @@ -337,12 +337,14 @@ $nautilus_sidebar_image: image($dark_sidebar_bg); } notebook { - margin-left: -1px; - margin-right: -1px; - &.background.csd { background-color: transparent; } - tab { margin-left: -1px; } + @if $monterey == 'false' { + margin-left: -1px; + margin-right: -1px; + + tab { margin-left: -1px; } + } scrolledwindow { .view:not(:hover):not(:active):not(:selected) { @@ -592,11 +594,8 @@ terminal-window { } notebook { - button.flat.toggle.popup { - min-height: 28px; - min-width: 28px; - margin: -2px; - } + // button.flat.toggle.popup { + // } } &.background.csd.maximized { border-radius: 0 0 0 0; } // Fixed gnome 3.32 issue: Unable to restore window size after maximization @@ -1952,29 +1951,48 @@ window.background.csd { } tabbox { - background-color: darken($header_bg, 10%); - box-shadow: inset 0 -1px $borders_color; + @if $monterey == 'false' { + background-color: darken($header_bg, 10%); + box-shadow: inset 0 -1px $borders_color; + } @else { + background-color: $header_bg; + border-bottom: 1px solid $borders_color; + padding: 0 $container_padding / 2 $container_padding / 2; + } > tab { - @extend %tabs_tab; - border-top: none; - padding: 2px 10px; - min-width: 24px; - min-height: 24px; - border-top: 1px solid $borders_color; + @if $monterey == 'false' { + @extend %tabs_tab; + border-top: none; + border-top: 1px solid $borders_color; + &:checked { border-top-color: $header_bg; } + } @else { + @extend %monterey_tab; - &:checked { - border-top-color: $header_bg; + + tab { + margin-left: $container_padding / 2; + } } - button { - min-height: 20px; - min-width: 20px; + button.tab-close-button { border-radius: 3px; border: none; padding: 0; @extend %flat_button; + @if $monterey == 'false' { + min-height: $small_size; + min-width: $small_size; + margin-top: 2px; + margin-bottom: 2px; + } @else { + min-height: 16px; + min-width: 16px; + margin-top: 4px; + margin-bottom: 4px; + margin-right: -$container_padding; + } + &:hover { color: $fg_color; background-color: rgba($borders_color, 0.1); @@ -2441,7 +2459,7 @@ window.background.csd { // // Archive Manager // -.background.csd { +window.background.csd { > grid.horizontal > paned.horizontal { > scrolledwindow { border-radius: 0 0 $wm_radius $wm_radius; @@ -2482,7 +2500,7 @@ window.background.csd { // // Eye of GNOME Image Viewer // -.background.csd { +window.background.csd { > box.vertical > box.vertical > box.vertical{ > paned.horizontal { > separator { @@ -2825,6 +2843,18 @@ window#GearyMainWindow.background.csd { // <= 3.32 border-top-right-radius: 8px; } } + + .geary-attachment-pane { + border-radius: 0 0 8px 8px; + + actionbar.background { + background-color: transparent; + + > revealer > box { + border-radius: 0 0 7px 7px; + } + } + } } searchbar { diff --git a/src/sass/gtk/apps/_misc.scss b/src/sass/gtk/apps/_misc.scss index 849b984..2626892 100644 --- a/src/sass/gtk/apps/_misc.scss +++ b/src/sass/gtk/apps/_misc.scss @@ -79,7 +79,7 @@ window.background:not(.csd) { > menu, > menu > menu { - border-radius: 0; + // border-radius: 0; background-color: $menu_bg; } @@ -242,6 +242,8 @@ window.background.chromium { } > menubar { background-color: $header_bg; } + + menu menuitem { border-radius: 0; } } // @@ -586,3 +588,48 @@ menubar.-vala-panel-background { // > window.background.popup > menu { border-radius: 0 0 $wm_radius $wm_radius; } } } + +// +// xapp stutas icon menu +// +.xapp-status-icon-menu-window { + > decoration { + box-shadow: 0 5px 8px rgba(0, 0, 0, 0.15), 0 8px 15px rgba(0, 0, 0, 0.08), $wm_outline; + transition: none; + margin: 0; + } + + > menu { + padding: 0; + separator { + margin: 0; + border-bottom: none; + } + + > menuitem { + padding: 0; + margin: 0 3px; + + &:first-child { margin-top: 3px; } + &:last-child { margin-bottom: 3px; } + + > window > decoration { + box-shadow: none; + transition: none; + margin: 0; + + menu { + padding: 0; + + menuitem { + padding: 0; + margin: 0 3px; + + &:first-child { margin-top: 3px; } + &:last-child { margin-bottom: 3px; } + } + } + } + } + } +}