diff --git a/lib-install.sh b/lib-install.sh index 033dcaa9..92857932 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -727,14 +727,14 @@ install_dash_to_dock_theme() { if [[ -d "${DASH_TO_DOCK_DIR_HOME}" ]]; then backup_file "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" "udo" udoify_file "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" - if [[ "${GNOME_VERSION}" == 'new' ]]; then + if [[ "${GNOME_VERSION}" != '3-28' ]]; then udo sassc ${SASSC_OPT} "${DASH_TO_DOCK_SRC_DIR}/stylesheet-4.scss" "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" else udo sassc ${SASSC_OPT} "${DASH_TO_DOCK_SRC_DIR}/stylesheet-3.scss" "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" fi elif [[ -d "${DASH_TO_DOCK_DIR_ROOT}" ]]; then backup_file "${DASH_TO_DOCK_DIR_ROOT}/stylesheet.css" "sudo" - if [[ "${GNOME_VERSION}" == 'new' ]]; then + if [[ "${GNOME_VERSION}" != '3-28' ]]; then sudo sassc ${SASSC_OPT} "${DASH_TO_DOCK_SRC_DIR}/stylesheet-4.scss" "${DASH_TO_DOCK_DIR_ROOT}/stylesheet.css" else sudo sassc ${SASSC_OPT} "${DASH_TO_DOCK_SRC_DIR}/stylesheet-3.scss" "${DASH_TO_DOCK_DIR_ROOT}/stylesheet.css" diff --git a/src/sass/gnome-shell/common/_panel.scss b/src/sass/gnome-shell/common/_panel.scss index 3adf8fa5..dadb290e 100644 --- a/src/sass/gnome-shell/common/_panel.scss +++ b/src/sass/gnome-shell/common/_panel.scss @@ -181,8 +181,34 @@ $panel_height: $menuitem_size; // dimensions of the icon are hardcoded } - &#panelActivities { - -natural-hpadding: $base_padding * 3; + &#panelActivities { // Activities button + background-image: url("assets/activities.svg"); + background-position: center center; + background-size: 24px 24px; + width: 24px; + height: 24px; + background-gradient-direction: none; + border: none; + color: transparent; + font-size: 0; + + > * { width: $medium_size; } + + &:active, &:overview, &:focus, &:checked { + border: none; + color: transparent; + // background-image: url("assets/activities-active.svg"); + } + + &:overview { background-color: transparent; } + + @if $variant == 'light' { + @if $panel_font == 'black' or $trans == 'false' { + &:overview { + background-image: url("assets/activities-white.svg"); + } + } + } } } @@ -268,33 +294,3 @@ $panel_height: $menuitem_size; .screencast-indicator, .remote-access-indicator { color: $warning_color; } } - -// Activities button -#panel #panelActivities.panel-button { - > * { - background-image: url("assets/activities.svg"); - background-position: center center; - background-size: 24px 24px; - width: 24px; - height: 24px; - background-color: transparent !important; - background-gradient-direction: none !important; - border: none; - color: transparent; - } - - &:active, &:overview, &:focus, &:checked { - background-color: transparent; - border: none; - - // > * { background-image: url("assets/activities-active.svg"); } - } - - @if $variant == 'light' { - @if $panel_font == 'black' or $trans == 'false' { - &:overview { - > * { background-image: url("assets/activities-white.svg"); } - } - } - } -} diff --git a/src/sass/gnome-shell/common/_popovers.scss b/src/sass/gnome-shell/common/_popovers.scss index c8db565b..36a54597 100644 --- a/src/sass/gnome-shell/common/_popovers.scss +++ b/src/sass/gnome-shell/common/_popovers.scss @@ -87,7 +87,7 @@ $popop_menuitem_radius: $wm_radius - 4px; } .popup-menu-content { - padding: 6px 0; + padding: $base_padding; @extend %theme_dialogs; box-shadow: 0 5px 10px 0 rgba(black, 0.18); border: 1px solid if($variant=='light', rgba(black, 0), rgba(black, 0.75)); @@ -96,13 +96,11 @@ $popop_menuitem_radius: $wm_radius - 4px; } .popup-menu-item { - spacing: $base_spacing * 2; - padding-top: 6px; - padding-bottom: 6px; + spacing: $base_spacing; + padding: $base_padding * 1.5 $base_padding * 2; color: $alt_fg_color; text-shadow: none; border-radius: $popop_menuitem_radius; - margin: 0 6px; font-weight: normal; transition: none; @@ -148,7 +146,6 @@ $popop_menuitem_radius: $wm_radius - 4px; border-radius: 0 0 $popop_menuitem_radius $popop_menuitem_radius; border: none; box-shadow: none; - margin: 0 6px; .popup-menu-item { margin: 0; @@ -179,6 +176,7 @@ $popop_menuitem_radius: $wm_radius - 4px; // container for radio and check boxes .popup-menu-ornament { width: 1.2em; + text-align: center !important; &:ltr { text-align: right; } &:rtl { text-align: left; } @@ -215,8 +213,10 @@ $popop_menuitem_radius: $wm_radius - 4px; // lock screen, shutdown, etc. buttons .popup-menu-icon { - padding: 0; - margin: 0 0; + padding: 0 !important; -st-icon-style: symbolic; + + &:ltr { margin-right: $base_margin * 2 !important; } + &:rtl { margin-left: $base_margin * 2 !important; } } } diff --git a/src/sass/gnome-shell/widgets-42-0/_popovers.scss b/src/sass/gnome-shell/widgets-42-0/_popovers.scss index cd03e34e..1b45b054 100644 --- a/src/sass/gnome-shell/widgets-42-0/_popovers.scss +++ b/src/sass/gnome-shell/widgets-42-0/_popovers.scss @@ -1,7 +1,7 @@ .popup-menu-item { - &:ltr { padding-right: $base_padding * 2 !important; padding-left: 0 !important; } - &:rtl { padding-left: $base_padding * 2 !important; padding-right: 0 !important; } + &:ltr { padding-right: $base_padding * 2; padding-left: $base_padding * 2; } + &:rtl { padding-left: $base_padding * 2; padding-right: $base_padding * 2; } } // separator @@ -11,8 +11,27 @@ // system status popover menu .aggregate-menu { + // this is unneeded at the top-level in this menu, hide it + .popup-menu-ornament, .popup-sub-menu .popup-menu-ornament { width: 0 !important; } + .popup-sub-menu .popup-menu-item > :first-child { - &:ltr { padding-left: $base_padding * 2 !important; margin-left: 0 !important; } - &:rtl { padding-right: $base_padding * 2 !important; margin-right: 0 !important; } + &:ltr { margin-left: 10px; } + &:rtl { margin-right: 10px; } + } +} + +// right-click (and panel) app menu +.app-menu { + max-width: 27.25em; + + // this is unneeded at the top-level in this menu, hide it + .popup-menu-ornament { width: 0 !important; } + + .popup-inactive-menu-item:first-child { + // "Open Windows" label + > StLabel { + &:ltr { margin-right: $base_margin * 2; } + &:rtl { margin-left: $base_margin * 2; } + } } } diff --git a/src/sass/gtk/apps/_misc.scss b/src/sass/gtk/apps/_misc.scss index 92f92cc2..ff802fb6 100644 --- a/src/sass/gtk/apps/_misc.scss +++ b/src/sass/gtk/apps/_misc.scss @@ -85,8 +85,14 @@ window.background:not(.csd) { > menu > menuitem { padding: 4px 6px; + border-radius: 0; > label:disabled { color: $disabled_fg_color; } + + > radio, + > check { + padding: 0; + } } > window > menu { @@ -276,7 +282,7 @@ window.background:not(.solid-csd) { } window.background:not(.solid-csd) { - // for 'Notebookbar' toolbar + // for 'Notebookbar' toolbar > notebook { border: none; // unset borders background-color: $base_color;