From 65f141f226f80018b15d7903792104caabf9a96b Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Wed, 8 Jun 2022 22:59:51 +0800 Subject: [PATCH] Fixed issues --- src/main/gtk-3.0/gtk-Dark.css | 17 ++++++++--------- src/main/gtk-3.0/gtk-Light.css | 1 - src/main/gtk-4.0/gtk-Dark.css | 11 ++++++----- src/main/gtk-4.0/gtk-Light.css | 1 + src/sass/_colors.scss | 2 +- src/sass/gtk/_common-3.0.scss | 1 - src/sass/gtk/_common-4.0.scss | 1 + 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/gtk-3.0/gtk-Dark.css b/src/main/gtk-3.0/gtk-Dark.css index 179cb789..7e863368 100644 --- a/src/main/gtk-3.0/gtk-Dark.css +++ b/src/main/gtk-3.0/gtk-Dark.css @@ -1724,7 +1724,6 @@ headerbar.windowhandle viewswitchertitle > squeezer > viewswitcher > box.horizon treeview.view { border-left-color: rgba(255, 255, 255, 0.3); border-top-color: rgba(255, 255, 255, 0.12); - padding: 3px; } * { @@ -1948,7 +1947,7 @@ menu, background-color: #3C3C3C; background-clip: border-box; border-radius: 12px; - border: 1px solid #4b4b4b; + border: 1px solid #454545; } .csd menu, .csd .menu, .csd .context-menu { @@ -4089,7 +4088,7 @@ messagedialog.csd decoration { border-radius: 0; box-shadow: none; background-color: #242424; - border: 1px solid #4b4b4b; + border: 1px solid #454545; } .solid-csd decoration:backdrop { @@ -6007,7 +6006,7 @@ window.background.chromium { window.background.chromium entry, window.background.chromium > button { - border: 1px solid #4b4b4b; + border: 1px solid #454545; } window.background.chromium > button { @@ -6070,7 +6069,7 @@ tooltip.background.chromium { } #MozillaGtkWidget > widget > separator { - color: #4b4b4b; + color: #454545; } #MozillaGtkWidget > widget > scrollbar { @@ -6078,12 +6077,12 @@ tooltip.background.chromium { } #MozillaGtkWidget > widget > frame > border { - border-color: #4b4b4b; + border-color: #454545; } #MozillaGtkWidget > widget > entry, #MozillaGtkWidget > widget > button > button { - border: 1px solid #4b4b4b; + border: 1px solid #454545; border-radius: 6px; box-shadow: none; } @@ -6159,11 +6158,11 @@ tooltip.background.chromium { } #MozillaGtkWidget > widget > frame { - color: #4b4b4b; + color: #454545; } #MozillaGtkWidget menu > separator { - color: #4b4b4b; + color: #454545; } window.background:not(.csd) > window > menu menuitem { diff --git a/src/main/gtk-3.0/gtk-Light.css b/src/main/gtk-3.0/gtk-Light.css index 6e78d057..b43075ff 100644 --- a/src/main/gtk-3.0/gtk-Light.css +++ b/src/main/gtk-3.0/gtk-Light.css @@ -1724,7 +1724,6 @@ headerbar.windowhandle viewswitchertitle > squeezer > viewswitcher > box.horizon treeview.view { border-left-color: rgba(0, 0, 0, 0.26); border-top-color: rgba(0, 0, 0, 0.12); - padding: 3px; } * { diff --git a/src/main/gtk-4.0/gtk-Dark.css b/src/main/gtk-4.0/gtk-Dark.css index 2965d3f0..f412027f 100644 --- a/src/main/gtk-4.0/gtk-Dark.css +++ b/src/main/gtk-4.0/gtk-Dark.css @@ -1923,8 +1923,8 @@ pathbar > button.slider-button { **************/ columnview.view, treeview.view { - border-left-color: #4b4b4b; - border-top-color: #4b4b4b; + border-left-color: #454545; + border-top-color: #454545; } columnview.view:hover, columnview.view:selected, @@ -4355,16 +4355,17 @@ paned > separator { -gtk-icon-source: none; border-style: none; background-color: transparent; - background-image: image(#4b4b4b); + background-image: image(#454545); background-size: 1px 1px; background-clip: content-box; + box-shadow: none; } paned > separator.wide { min-width: 6px; min-height: 6px; background-color: #2C2C2C; - background-image: image(#4b4b4b), image(#4b4b4b); + background-image: image(#454545), image(#454545); background-size: 1px 1px, 1px 1px; } @@ -4660,7 +4661,7 @@ window.csd.dialog.message { padding: 2px; border-radius: 0; background-color: #242424; - border: 1px solid #4b4b4b; + border: 1px solid #454545; } .solid-csd window.csd:backdrop { diff --git a/src/main/gtk-4.0/gtk-Light.css b/src/main/gtk-4.0/gtk-Light.css index 49f69955..45435f72 100644 --- a/src/main/gtk-4.0/gtk-Light.css +++ b/src/main/gtk-4.0/gtk-Light.css @@ -4366,6 +4366,7 @@ paned > separator { background-image: image(#e0e0e0); background-size: 1px 1px; background-clip: content-box; + box-shadow: none; } paned > separator.wide { diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss index 7c829025..bb387f16 100644 --- a/src/sass/_colors.scss +++ b/src/sass/_colors.scss @@ -150,7 +150,7 @@ $assets-color: $primary; $frame: if($variant == 'light', rgba($black, 0.12), rgba($black, 0.20)); $border: if($variant == 'light', rgba($black, 0.12), rgba($white, 0.12)); $window-border: if($variant == 'light', rgba($black, 0.12), rgba($black, 0.75)); -$solid-border: if($variant == 'light', darken($background, 12%), lighten($background, 12%)); +$solid-border: if($variant == 'light', mix(black, $base, 12%), mix(white, $base, 12%)); $border-alt: rgba($black, 0.16); // darker border color for Chrome and Firefox // diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss index dd8a373e..bd201792 100644 --- a/src/sass/gtk/_common-3.0.scss +++ b/src/sass/gtk/_common-3.0.scss @@ -1504,7 +1504,6 @@ treeview.view { border-left-color: $track; // this is actually the tree lines color, border-top-color: $divider; // while this is the grid lines color, better then nothing - padding: $space-size / 2; .csd &:not(:selected):not(:hover):not(.progressbar):not(.expander):not(.trough):not(.separator) { background-color: transparent; } diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss index a648efba..5ce69d02 100644 --- a/src/sass/gtk/_common-4.0.scss +++ b/src/sass/gtk/_common-4.0.scss @@ -4026,6 +4026,7 @@ paned { background-image: image($solid-border); background-size: 1px 1px; background-clip: content-box; // avoids borders image being rendered twice (?) + box-shadow: none; &.wide { min-width: 6px;