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 61e1d46..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') 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/sass/cinnamon/_common.scss b/src/sass/cinnamon/_common.scss index 274c353..880c4d1 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; } diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss index 308e9f2..23b7589 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; @@ -4199,7 +4199,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/_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; } + } + } + } + } + } +}