From ac977a737017401946476379d9a33bb63b33d85e Mon Sep 17 00:00:00 2001 From: Vince Date: Wed, 28 Apr 2021 23:28:20 +0800 Subject: [PATCH] Fixed dash to dock issues --- src/sass/gnome-shell/common/_app-grid.scss | 37 +++++++- .../extensions-40-0/_dash-to-dock.scss | 94 +++++++++---------- .../gnome-shell/widgets-3-28/_app-grid.scss | 35 ------- .../gnome-shell/widgets-40-0/_app-grid.scss | 12 --- src/sass/gnome-shell/widgets-40-0/_dash.scss | 2 +- src/sass/gtk/_applications-4.0.scss | 4 - 6 files changed, 84 insertions(+), 100 deletions(-) diff --git a/src/sass/gnome-shell/common/_app-grid.scss b/src/sass/gnome-shell/common/_app-grid.scss index b0d0d9a8..878b57d1 100644 --- a/src/sass/gnome-shell/common/_app-grid.scss +++ b/src/sass/gnome-shell/common/_app-grid.scss @@ -6,7 +6,7 @@ %app-well-app { & .overview-icon { color: $light_alt_fg_color; - border-radius: $bd_radius * 1.5; + border-radius: $wm_radius; padding: 8px; border: none; transition-duration: 100ms; @@ -115,6 +115,41 @@ } } +.page-indicator { + padding: $base_padding $base_padding * 2; + + .page-indicator-icon { + width: 12px; + height: 12px; + border-radius: 12px; + margin: 0; + padding: 0; + background-image: none; + color: transparent; + border: none; + box-shadow: none; + background-color: $light_alt_disabled_fg_color; + } + &:hover .page-indicator-icon { + background-image: none; + background-color: $light_disabled_fg_color; + } + &:active .page-indicator-icon { + margin: 0; + padding: 0; + background-image: none; + color: transparent; + border: none; + box-shadow: none; + background-color: $light_alt_fg_color; + } + &:checked .page-indicator-icon { + background-image: none; + background-color: $light_alt_fg_color; + } + &:checked:active { background-image: none; } +} + // right-click app menu .app-menu, .app-well-menu { diff --git a/src/sass/gnome-shell/extensions-40-0/_dash-to-dock.scss b/src/sass/gnome-shell/extensions-40-0/_dash-to-dock.scss index d3ae2b62..cdd412e1 100644 --- a/src/sass/gnome-shell/extensions-40-0/_dash-to-dock.scss +++ b/src/sass/gnome-shell/extensions-40-0/_dash-to-dock.scss @@ -35,51 +35,69 @@ $dash_radius: 18px; text-align: center; } - &.straight-corner #dash .dash-background, - &.shrink.straight-corner #dash .dash-background { + &.straight-corner #dash, + &.shrink.straight-corner #dash { border-radius: 0; - margin: 0; + border-left: 0; + border-right: 0; + padding-top: 0; + padding-bottom: 0; + margin-top: 0; + + .dash-background { + border-radius: 0; + margin-bottom: 0; + } } &.extended.top, - &.extended.bottom { - #dash { - border-left: 0; - border-right: 0; - padding-top: 0; - padding-bottom: 0; - margin-top: 0; - } - - .dash-background { - margin-bottom: 0; - } - } - + &.extended.bottom, &.extended.right, &.extended.left { #dash { - border-top: 0; - border-bottom: 0; - padding-top: 0; - padding-bottom: 0; + margin-left: 0; + margin-right: 0; margin-top: 0; - } - - .dash-background { margin-bottom: 0; + padding: 0 0; + + .dash-background { + border-radius: 0; + margin-left: 0; + margin-right: 0; + margin-top: 0; + margin-bottom: 0; + } } } - &.dashtodock #dash { background: none; } + &.left, + &.right { + #dash { + margin-top: 0; + padding: $dash_padding 0; + + .dash-background { // default-mode + margin-bottom: 0; + } + } + + .dash-item-container .app-well-app, .show-apps { + padding: $dash_padding / 2; + } + } + + &.left #dash { + margin-left: $base_padding; + } + + &.right #dash { + margin-right: $base_padding; + } #dash { // default-mode background: none; - // .app-well-app-running-dot { - // background-color: rgba($dash_panel_fg, 0.85); - // } - // StWidget.focused .app-well-app-running-dot { background-color: $primary_color; } @@ -91,12 +109,6 @@ $dash_radius: 18px; box-shadow: inset 0 0 0 1px rgba(white, 0.05); } - // .dash-separator { - // width: 1px !important; - // // margin: 0 0 !important; - // background-color: $light_divider_color; - // } - &:overview #dash { // overview-mode #1 background: none; @@ -133,10 +145,6 @@ $dash_radius: 18px; #dash { background: none; } - - // .dash-background { - // background-color: $light_divider_color; - // } } &.running-dots, @@ -154,14 +162,6 @@ $dash_radius: 18px; } } - .app-well-app, - .show-apps { - .overview-icon { - padding: 8px; - background-size: contain; - } - } - &.extended, &.extended:overview { .app-well-app, diff --git a/src/sass/gnome-shell/widgets-3-28/_app-grid.scss b/src/sass/gnome-shell/widgets-3-28/_app-grid.scss index 5ff2640e..931dfb46 100644 --- a/src/sass/gnome-shell/widgets-3-28/_app-grid.scss +++ b/src/sass/gnome-shell/widgets-3-28/_app-grid.scss @@ -40,41 +40,6 @@ $app_icon_padding: 24px; & StButton#vhandle:active { background-color: transparent; } } -.page-indicator { - padding: 15px 20px; - - .page-indicator-icon { - width: 12px; - height: 12px; - border-radius: 12px; - margin: 0; - padding: 0; - background-image: none; - color: transparent; - border: none; - box-shadow: none; - background-color: $light_alt_disabled_fg_color; - } - &:hover .page-indicator-icon { - background-image: none; - background-color: $light_disabled_fg_color; - } - &:active .page-indicator-icon { - margin: 0; - padding: 0; - background-image: none; - color: transparent; - border: none; - box-shadow: none; - background-color: $light_alt_fg_color; - } - &:checked .page-indicator-icon { - background-image: none; - background-color: $light_alt_fg_color; - } - &:checked:active { background-image: none; } -} - //Some hacks I don't even .all-apps, .search-display > StBoxLayout, diff --git a/src/sass/gnome-shell/widgets-40-0/_app-grid.scss b/src/sass/gnome-shell/widgets-40-0/_app-grid.scss index 96cc0acb..fd23c15b 100644 --- a/src/sass/gnome-shell/widgets-40-0/_app-grid.scss +++ b/src/sass/gnome-shell/widgets-40-0/_app-grid.scss @@ -17,18 +17,6 @@ $app_icon_size: 96px; background-color: rgba(#262626, 0.9); } -// App Grid pagination indicators -.page-indicator { - padding: $base_padding $base_padding * 2 0; - - .page-indicator-icon { - width: 10px; - height: 10px; - border-radius: 10px; // the same as height&width - background-color: white; - } -} - .apps-scroll-view { padding: 0; } diff --git a/src/sass/gnome-shell/widgets-40-0/_dash.scss b/src/sass/gnome-shell/widgets-40-0/_dash.scss index 6bdf78f6..508c74d9 100644 --- a/src/sass/gnome-shell/widgets-40-0/_dash.scss +++ b/src/sass/gnome-shell/widgets-40-0/_dash.scss @@ -3,7 +3,7 @@ $dash_placeholder_size: 32px; $dash_padding: $base_padding + 4px; // 10px $dash_spacing: $base_padding / 4; $dash_bottom_margin: $base_margin * 4; -$dash_border_radius: $bt_radius * 3; +$dash_border_radius: $wm_radius + $dash_padding; #dash { margin-top: $base_spacing * 2; diff --git a/src/sass/gtk/_applications-4.0.scss b/src/sass/gtk/_applications-4.0.scss index 1f33d14a..cc89580a 100644 --- a/src/sass/gtk/_applications-4.0.scss +++ b/src/sass/gtk/_applications-4.0.scss @@ -5,8 +5,6 @@ // GNOME Terminal, MATE Terminal // terminal-window { -// &.background.csd { border-radius: 0 0 0 0; } - notebook { button.flat.toggle.popup { min-height: 28px; @@ -14,8 +12,6 @@ terminal-window { margin: -2px; } } - -// &.background.csd.maximized { border-radius: 0 0 0 0; } // Fixed gnome 3.32 issue: Unable to restore window size after maximization } //