From 17d96b5c9e2e3127e40fde1923e210043a7624c6 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Fri, 28 Oct 2022 18:34:59 +0800 Subject: [PATCH] Fixed issues --- src/sass/gnome-shell/common/_app-grid.scss | 4 +- src/sass/gnome-shell/common/_buttons.scss | 17 ++++++- src/sass/gnome-shell/common/_entries.scss | 12 +++-- .../gnome-shell/common/_message-list.scss | 8 ++-- src/sass/gnome-shell/common/_overview.scss | 16 +++++++ .../gnome-shell/common/_quick-settings.scss | 6 ++- .../gnome-shell/widgets-3-28/_overview.scss | 12 ----- .../gnome-shell/widgets-42-0/_app-grid.scss | 13 ++--- src/sass/gtk/apps/_gnome-40.0.scss | 47 +++++++++++++++++++ src/sass/gtk/apps/_libadwaita.scss | 37 +++++---------- 10 files changed, 117 insertions(+), 55 deletions(-) diff --git a/src/sass/gnome-shell/common/_app-grid.scss b/src/sass/gnome-shell/common/_app-grid.scss index 4d7ccf0..406bdb6 100644 --- a/src/sass/gnome-shell/common/_app-grid.scss +++ b/src/sass/gnome-shell/common/_app-grid.scss @@ -84,7 +84,7 @@ & .folder-name-label { padding: $base_padding; color: $light_alt_fg_color; } & .edit-folder-button { - background-color: $light_divider_color; + background-color: $light_fill_color; color: $light_alt_fg_color; border: none; padding: 0; @@ -92,7 +92,7 @@ height: 36px; border-radius: $circular_radius; - & > StIcon { icon-size: 16px; } + & > StIcon { icon-size: $base_icon_size; } &:hover { background-color: $light_divider_color; } &:checked, &:active { background-color: $light_track_color; } diff --git a/src/sass/gnome-shell/common/_buttons.scss b/src/sass/gnome-shell/common/_buttons.scss index 2c2f975..c7e350b 100644 --- a/src/sass/gnome-shell/common/_buttons.scss +++ b/src/sass/gnome-shell/common/_buttons.scss @@ -1,8 +1,8 @@ /* Buttons */ .button { - min-height: $medium_size; - padding: 0 16px; + min-height: $small_size; + padding: $container_padding $container_padding * 2; border-radius: $bt_radius; &, .popup-menu & { @@ -15,6 +15,19 @@ } } +.icon-button { + min-height: $small_size; + min-width: $small_size; + padding: $container_padding; + border-radius: $circular_radius; + + @include button(flat-normal); + &:hover { @include button(flat-hover); } + &:active { @include button(flat-active); } + &:insensitive { @include button(flat-insensitive); } + &:focus { @include button(flat-focus); } +} + %osd_button { background-color: transparent; border: none; diff --git a/src/sass/gnome-shell/common/_entries.scss b/src/sass/gnome-shell/common/_entries.scss index adebba9..2803920 100644 --- a/src/sass/gnome-shell/common/_entries.scss +++ b/src/sass/gnome-shell/common/_entries.scss @@ -3,25 +3,29 @@ StEntry, %entry { min-height: $menuitem_size; padding: $base_padding / 2 $base_padding * 2 !important; - // margin: 2px; color: $fg_color; caret-color: $fg_color; selection-background-color: $primary_color !important; selected-color: $light_fg_color !important; - // @include font(subheading); + @include entry(normal); &:hover { @include entry(hover); } &:focus { @include entry(focus); } &:insensitive { @include entry(insensitive);} + + StIcon { icon-size: $base_icon_size !important; } + StIcon.capslock-warning { - icon-size: 16px; + icon-size: $base_icon_size !important; warning-color: $warning_color; padding: 0 0; } + StIcon.peek-password { - icon-size: 16px; + icon-size: $base_icon_size !important; padding: 0 $base_padding; } + StLabel.hint-text { margin-left: $base_padding / 2; color: $alt_fg_color; diff --git a/src/sass/gnome-shell/common/_message-list.scss b/src/sass/gnome-shell/common/_message-list.scss index 3119c31..0efae2d 100644 --- a/src/sass/gnome-shell/common/_message-list.scss +++ b/src/sass/gnome-shell/common/_message-list.scss @@ -104,14 +104,16 @@ // close button .message-close-button { color: $alt_fg_color; - padding: 0; - height: 24px; - width: 24px; + padding: 0 !important; + height: 24px !important; + width: 24px !important; border-radius: $circular_radius; &:hover, &:active { color: $fg_color; } &:hover, &:focus { background-color: $divider_color; } &:active { background-color: $track_color; } + + StIcon { icon-size: $base_icon_size; } } // body diff --git a/src/sass/gnome-shell/common/_overview.scss b/src/sass/gnome-shell/common/_overview.scss index 1513102..398496a 100644 --- a/src/sass/gnome-shell/common/_overview.scss +++ b/src/sass/gnome-shell/common/_overview.scss @@ -2,3 +2,19 @@ .overview-controls { padding-bottom: 32px; } + +%overview_scrollbar { + StBin#trough { + background-color: $light_divider_color; + } + + StButton#vhandle, StButton#hhandle { + background-color: $light_hint_fg_color; + &:hover { background-color: $light_alt_fg_color; } + &:active { background-color: $light_fg_color; } + } +} + +#overview { + StScrollBar { @extend %overview_scrollbar; } +} diff --git a/src/sass/gnome-shell/common/_quick-settings.scss b/src/sass/gnome-shell/common/_quick-settings.scss index a958d42..84d8d59 100644 --- a/src/sass/gnome-shell/common/_quick-settings.scss +++ b/src/sass/gnome-shell/common/_quick-settings.scss @@ -4,6 +4,8 @@ .icon-button, .button { padding: $container_padding; + + StIcon { icon-size: $base_icon_size !important; } } } @@ -53,7 +55,7 @@ &:rtl > StBoxLayout { padding-right: $base_padding * 2.5; } .quick-toggle-label { font-weight: bold; } - .quick-toggle-icon, .quick-toggle-arrow { icon-size: $base_icon_size; } + .quick-toggle-icon, .quick-toggle-arrow { icon-size: $base_icon_size !important; } } .quick-menu-toggle { @@ -86,7 +88,7 @@ } .quick-toggle-icon { - icon-size: $base_icon_size; + icon-size: $base_icon_size !important; } .icon-button { diff --git a/src/sass/gnome-shell/widgets-3-28/_overview.scss b/src/sass/gnome-shell/widgets-3-28/_overview.scss index 3e66288..9a59c80 100644 --- a/src/sass/gnome-shell/widgets-3-28/_overview.scss +++ b/src/sass/gnome-shell/widgets-3-28/_overview.scss @@ -1,16 +1,4 @@ -%overview_scrollbar { - StBin#trough { - background-color: $light_divider_color; - } - - StButton#vhandle, StButton#hhandle { - background-color: $light_hint_fg_color; - &:hover { background-color: $light_alt_fg_color; } - &:active { background-color: $light_fg_color; } - } -} #overview { spacing: 24px; - StScrollBar { @extend %overview_scrollbar; } } diff --git a/src/sass/gnome-shell/widgets-42-0/_app-grid.scss b/src/sass/gnome-shell/widgets-42-0/_app-grid.scss index 5063b8a..d2909d9 100644 --- a/src/sass/gnome-shell/widgets-42-0/_app-grid.scss +++ b/src/sass/gnome-shell/widgets-42-0/_app-grid.scss @@ -56,20 +56,21 @@ width: 24px; height: 24px; border-radius: $circular_radius; + color: $light_fg_color !important; } &:insensitive > StIcon { - backround-color: $light_fill_color; - color: $light_fg_color; + backround-color: transparent !important; + color: transparent !important; } &:hover > StIcon { - backround-color: $light_divider_color; - color: $light_fg_color; + backround-color: $light_divider_color !important; + color: $light_fg_color !important; } &:active > StIcon { - backround-color: $light_track_color; - color: $light_fg_color; + backround-color: $light_track_color !important; + color: $light_fg_color !important; } } diff --git a/src/sass/gtk/apps/_gnome-40.0.scss b/src/sass/gtk/apps/_gnome-40.0.scss index ebd9ad5..1c1f4ab 100644 --- a/src/sass/gtk/apps/_gnome-40.0.scss +++ b/src/sass/gtk/apps/_gnome-40.0.scss @@ -188,6 +188,53 @@ window.background.csd { > stack.background { background-color: $base_color; } } + + preferencesgroup > box { + button.background-preview-button { + padding: $container_padding / 2; + outline: 2px solid transparent; + outline-offset: 0; + border-radius: $bt_radius + $container_padding / 2; + + &, &:hover, &:active, &:checked { + background: none; + border: none; + box-shadow: none; + } + + &:hover { + outline-color: $alt_disabled_fg_color; + } + + &:active { + outline-color: $alt_fg_color; + } + + &:checked { + outline-color: $selected_bg_color; + } + } + + flowbox.background-flowbox > flowboxchild { + outline: 2px solid transparent; + outline-offset: 0; + border-radius: $bt_radius + 3px; + padding: 3px; + + &:hover { + outline-color: $alt_disabled_fg_color; + } + + &:active { + outline-color: $alt_fg_color; + } + + &:selected { + outline-color: $selected_bg_color; + background-color: transparent; + } + } + } } } diff --git a/src/sass/gtk/apps/_libadwaita.scss b/src/sass/gtk/apps/_libadwaita.scss index 1fce50a..944febc 100644 --- a/src/sass/gtk/apps/_libadwaita.scss +++ b/src/sass/gtk/apps/_libadwaita.scss @@ -63,21 +63,6 @@ preferencesgroup > box { > box.single-line { min-height: 34px; } - - button.background-preview-button { - &, &:hover, &:active, &:checked { - background: none; - border: none; - box-shadow: none; - padding: $container_padding / 2; - border: 2px solid transparent; - border-radius: $bt_radius + $container_padding / 2; - } - - &:checked { - border: 2px solid $selected_bg_color; - } - } } // @@ -194,28 +179,28 @@ viewswitcher { margin: 0; &.wide { - border-spacing: $container_padding / 2; + border-spacing: 0; - button.toggle { + > button.toggle { margin: 8px 0; } } - &.narrow button.toggle { + &.narrow > button.toggle { border-radius: 0; margin: 0; } - button.toggle { + > button.toggle { font-weight: normal; padding: 0; > stack > box { &.narrow { font-size: 0.75rem; - padding-top: $container_padding + 1px; - padding-bottom: $container_padding - 1px; - border-spacing: $container_padding - 2px; + padding-top: $container_padding; + padding-bottom: $container_padding; + border-spacing: 0; > stack > label { padding-left: $container_padding + 2px; @@ -225,7 +210,12 @@ viewswitcher { &.wide { padding: 0 $container_padding * 2; - border-spacing: $container_padding; + border-spacing: 0; + + > label, > indicatorbin > image { + padding-left: $container_padding / 2; + padding-right: $container_padding / 2; + } } } } @@ -251,7 +241,6 @@ indicatorbin { min-width: $container_padding * 2; min-height: $container_padding * 2; border-radius: $circular_radius; - margin: 0; } > indicator {