From c7010ae868e160284c33fefb12233d6416d6e162 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Sat, 29 May 2021 19:07:17 +0800 Subject: [PATCH] update --- src/sass/gtk/_applications-3.0.scss | 6 ++- src/sass/gtk/_common-3.0.scss | 84 ++++++++++++++--------------- src/sass/gtk/_common-4.0.scss | 12 +---- 3 files changed, 47 insertions(+), 55 deletions(-) diff --git a/src/sass/gtk/_applications-3.0.scss b/src/sass/gtk/_applications-3.0.scss index a45edc6..61472bf 100644 --- a/src/sass/gtk/_applications-3.0.scss +++ b/src/sass/gtk/_applications-3.0.scss @@ -3345,7 +3345,7 @@ window#GearyMainWindow.background.csd { // <= 3.32 scrolledwindow { // margin: -1px 0; - padding: 6px; + padding: 0 6px; background-color: $base_color; treeview.view { @@ -3356,7 +3356,9 @@ window#GearyMainWindow.background.csd { // <= 3.32 &:hover { background-color: rgba($fg_color, 0.1); } - &:selected { + &:selected, &:active { + border-color: $base_color; + border-radius: $mn_radius; background-color: rgba($fg_color, 0.15); color: if($variant == 'light', $fg_color, $selected_fg_color); } diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss index eaccd17..ed28662 100644 --- a/src/sass/gtk/_common-3.0.scss +++ b/src/sass/gtk/_common-3.0.scss @@ -728,13 +728,11 @@ $_dot_color: $selected_bg_color; } %flat_button { - &:not(.suggested-action):not(.destructive-action):not(.titlebutton) { - @include button(flat-normal); - &:hover { @include button(flat-hover); } - &:active { @include button(flat-active); } - &:checked { @include button(flat-checked); } - &:disabled { @include button(flat-insensitive); } - } + @include button(flat-normal); + &:hover { @include button(flat-hover); } + &:active { @include button(flat-active); } + &:checked { @include button(flat-checked); } + &:disabled { @include button(flat-insensitive); } } button { @@ -774,7 +772,6 @@ button { &:active, &:checked { background-color: if($variant=='light', darken($button_bg, 8%), lighten($button_bg, 8%)); - background-clip: if($variant=='light', border-box, padding-box); transition-duration: 200ms; @@ -785,7 +782,7 @@ button { @include button(insensitive); } - .background &:not(.flat):not(.suggested-action):not(.destructive-action):not(.titlebutton) { + .background &:not(.flat) { &:active, &:checked { @include button(active); } @@ -1495,7 +1492,7 @@ actionbar { // Headerbar Buttons %headerbar_buttons { - &:not(.flat):not(.suggested-action):not(.destructive-action):not(.titlebutton) { + &:not(.flat) { @include button(header-normal); &:backdrop { opacity: 0.65; background-image: none; } @@ -1529,7 +1526,6 @@ actionbar { } } -headerbar, .background headerbar { min-height: $headerbar_size; padding: 0 $container_padding + 10px; @@ -1605,7 +1601,7 @@ headerbar, } } - button:not(.flat):not(.suggested-action):not(.destructive-action):not(.titlebutton) { + button:not(.flat) { @include button(header-normal); &:backdrop { opacity: 0.65; background-image: none; } @@ -1997,7 +1993,7 @@ headerbar, .titlebar { // // Pathbars // -.path-bar button { +.background .path-bar button { min-width: 12px; min-height: if($variant == 'light', 24px, 26px); @@ -2039,8 +2035,8 @@ headerbar, .titlebar { // // Tree Views // -@mixin viewwy($c) { - background-color: $c; +.background treeview.view { + background-color: $base_color; @at-root * { -GtkTreeView-horizontal-separator: 4; @@ -2144,26 +2140,30 @@ headerbar, .titlebar { min-width: 38px; padding: 0 $container_padding; font-weight: bold; - color: $_column_header_color; background-color: $base_color; background-image: none; box-shadow: none; border-style: none solid none none; - border-radius: 0; + border-radius: 3px; border-image: linear-gradient(to bottom, $base_color 20%, transparentize(if($variant == 'light', black, white), 0.89) 20%, transparentize(if($variant == 'light', black, white), 0.89) 80%, $base_color 80%) 0 1 0 0 / 0 1px 0 0 stretch; - &:hover { color: $selected_bg_color; } - &:active { color: $fg_color; } + &:hover { + color: $fg_color; + background-color: rgba($fg_color, 0.06); + } - &:active, &:hover { background-color: $base_color; } - &:active:hover { color: $fg_color; } + &:active { + color: $fg_color; + background-color: rgba($fg_color, 0.1); + } &:disabled { + color: $disabled_fg_color; border-color: $bg_color; background-image: none; } @@ -2188,10 +2188,6 @@ headerbar, .titlebar { } } -treeview.view { - @include viewwy($base_color); -} - // // Menus // @@ -3582,16 +3578,8 @@ messagedialog { // Message Dialog styling transition: $button_transition; } - &:active, &:checked { - - @if $variant == 'light' { - background-color: $selected_bg_color; - color: $selected_fg_color; - } - - @else { - @include button(active); - } + &:active { + @include button(active); } } @@ -3617,14 +3605,15 @@ messagedialog { // Message Dialog styling // filechooser { .csd & { - background-color: $base_color; + background-color: $dark_sidebar_bg; border-radius: 0 0 $wm_radius $wm_radius; placessidebar { background-color: transparent; + border-bottom-left-radius: $wm_radius; list { - background-color: $dark_sidebar_bg; + background-color: transparent; border-bottom-left-radius: $wm_radius; } } @@ -3632,7 +3621,7 @@ filechooser { > actionbar { > revealer > box { border-top: 1px solid $header_border; - background-color: $dark_sidebar_bg; + background-color: transparent; color: $dark_sidebar_fg; border-radius: 0 0 $wm_radius $wm_radius; } @@ -3648,7 +3637,8 @@ filechooser { } stack.view { - background-color: transparent; + background-color: $base_color; + border-bottom-right-radius: $wm_radius; scrolledwindow { background-color: transparent; @@ -3741,7 +3731,7 @@ stacksidebar { } } -placessidebar { +.background placessidebar { > viewport.frame { border-style: none; } row { @@ -3831,9 +3821,17 @@ placesview { } // this selects the "connect to server" label - > actionbar > revealer > box > label { - padding-left: 8px; - padding-right: 8px; + > actionbar.background { + background: none; + + > revealer > box { + background: none; + + > label { + padding-left: 8px; + padding-right: 8px; + } + } } } diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss index 281ed88..3f5dde9 100644 --- a/src/sass/gtk/_common-4.0.scss +++ b/src/sass/gtk/_common-4.0.scss @@ -3668,16 +3668,8 @@ window.dialog.message { // Message Dialog styling transition: $button_transition; } - &:active, &:checked { - - @if $variant == 'light' { - background-color: $selected_bg_color; - color: $selected_fg_color; - } - - @else { - @include button(active); - } + &:active { + @include button(active); } }