diff --git a/libs/lib-install.sh b/libs/lib-install.sh index e4a2e1de..f3ba606d 100755 --- a/libs/lib-install.sh +++ b/libs/lib-install.sh @@ -1096,6 +1096,7 @@ libadwaita_base() { shell_base() { cp -rf "${THEME_SRC_DIR}/main/gnome-shell/_shell-base"{".scss","-temp.scss"} + sed $SED_OPT "/\GNOME_SHELL/s/46/$SHELL_VERSION/" "${THEME_SRC_DIR}/main/gnome-shell/_shell-base-temp.scss" sed $SED_OPT "/\widgets/s/46-0/$GNOME_VERSION/" "${THEME_SRC_DIR}/main/gnome-shell/_shell-base-temp.scss" if [[ "${GNOME_VERSION}" == '3-28' ]]; then diff --git a/src/main/gnome-shell/_shell-base.scss b/src/main/gnome-shell/_shell-base.scss index 13ef4899..d6bdc929 100644 --- a/src/main/gnome-shell/_shell-base.scss +++ b/src/main/gnome-shell/_shell-base.scss @@ -1,3 +1,5 @@ +$GNOME_SHELL: 46; + @import '../../sass/variables'; @import '../../sass/colors'; @import '../../sass/gnome-shell/drawing'; diff --git a/src/sass/gnome-shell/widgets-48-0/_quick-settings.scss b/src/sass/gnome-shell/widgets-48-0/_quick-settings.scss index 6cc96eba..e25016e9 100644 --- a/src/sass/gnome-shell/widgets-48-0/_quick-settings.scss +++ b/src/sass/gnome-shell/widgets-48-0/_quick-settings.scss @@ -162,9 +162,14 @@ color: $text_color !important; border-radius: $base_border_radius * 3; padding: $base_padding * 3; - margin: $base_padding * 2 $base_padding * 6 0; border: none !important; + @if($GNOME_SHELL == '48') { + margin: $base_padding * 2 $base_padding * 6; + } @else { + margin: $base_padding * 2 0 0; + } + .popup-menu-item { border-radius: $circular_radius !important; // min-height: 20px;