From bae1127280a4832e1b885bb98a4c351b10c5b992 Mon Sep 17 00:00:00 2001 From: Mate Date: Sat, 19 Jun 2021 06:56:38 +0200 Subject: improve tabs and panel grabber --- desktop-themes/YaruGreen/gtk-3.0/_apps.scss | 2 +- desktop-themes/YaruGreen/gtk-3.0/_common.scss | 18 +++++++++++------- desktop-themes/YaruGreen/gtk-3.0/gtk.css | 14 +++++--------- desktop-themes/YaruOk/gtk-3.0/_apps.scss | 2 +- desktop-themes/YaruOk/gtk-3.0/_common.scss | 18 +++++++++++------- desktop-themes/YaruOk/gtk-3.0/gtk.css | 14 +++++--------- 6 files changed, 34 insertions(+), 34 deletions(-) diff --git a/desktop-themes/YaruGreen/gtk-3.0/_apps.scss b/desktop-themes/YaruGreen/gtk-3.0/_apps.scss index d187ba35..ad312b5c 100644 --- a/desktop-themes/YaruGreen/gtk-3.0/_apps.scss +++ b/desktop-themes/YaruGreen/gtk-3.0/_apps.scss @@ -1129,7 +1129,7 @@ window#Main.background { MatePanelAppletFrameDBus > MatePanelAppletFrameDBus { background-image: -gtk-scaled(url("assets/panel-grid.svg")); background-color: transparent; - color: #bebebe; + color: #8f8f8f; background-repeat: no-repeat; background-position: left; } diff --git a/desktop-themes/YaruGreen/gtk-3.0/_common.scss b/desktop-themes/YaruGreen/gtk-3.0/_common.scss index ade64d1c..131de296 100644 --- a/desktop-themes/YaruGreen/gtk-3.0/_common.scss +++ b/desktop-themes/YaruGreen/gtk-3.0/_common.scss @@ -2448,9 +2448,10 @@ notebook { &:backdrop { } &:checked { background-image: linear-gradient(to bottom, + gtkshade($core_color_a, 0.7), $core_color_a 3px, desaturate(darken($core_color_a, 30%), 15%) 5px, - $notebook_base_color 5px, + lighten($notebook_base_color, 4%) 5px, $notebook_base_color); box-shadow: 0px -1px desaturate(darken($core_color_a, 30%), 15%), 1px 0px $borders_color, -1px 0px $borders_color; } // Yaru change: 4px underlines are too much } @@ -2471,9 +2472,10 @@ notebook { &:backdrop { } &:checked { background-image: linear-gradient(to top, + gtkshade($core_color_a, 0.7), $core_color_a 3px, desaturate(darken($core_color_a, 30%), 15%) 5px, - $notebook_base_color 5px, + lighten($notebook_base_color, 4%) 5px, $notebook_base_color); box-shadow: 0px 1px desaturate(darken($core_color_a, 30%), 15%) , 1px 0px $borders_color, -1px 0px $borders_color; } // Yaru change: 4px underlines are too much } @@ -2492,13 +2494,14 @@ notebook { &:hover { } // Yaru change: 4px underlines are too much - &:backdrop { box-shadow: none; } + &:backdrop { } &:checked { background-image: linear-gradient(to right, + gtkshade($core_color_a, 0.7), $core_color_a 3px, desaturate(darken($core_color_a, 30%), 15%) 5px, - $notebook_base_color 5px, - $notebook_base_color); + lighten($notebook_base_color, 4%) 5px, + $notebook_base_color); box-shadow: -1px 0px desaturate(darken($core_color_a, 30%), 15%) , 0px -1px $borders_color,0px 1px $borders_color; } // Yaru change: 4px underlines are too much } } @@ -2515,12 +2518,13 @@ notebook { border-bottom-right-radius: 3px; &:hover { } // Yaru change: 4px underlines are too much - &:backdrop { box-shadow: none; } + &:backdrop { } &:checked { background-image: linear-gradient(to left, + gtkshade($core_color_a, 0.7), $core_color_a 3px, desaturate(darken($core_color_a, 30%), 15%) 5px, - $notebook_base_color 5px, + lighten($notebook_base_color, 4%) 5px, $notebook_base_color); box-shadow:1px 0px desaturate(darken($core_color_a, 30%), 15%), 0px -1px $borders_color,0px 1px $borders_color;} // Yaru change: 4px underlines are too much } diff --git a/desktop-themes/YaruGreen/gtk-3.0/gtk.css b/desktop-themes/YaruGreen/gtk-3.0/gtk.css index 579289a3..dc7330da 100644 --- a/desktop-themes/YaruGreen/gtk-3.0/gtk.css +++ b/desktop-themes/YaruGreen/gtk-3.0/gtk.css @@ -879,7 +879,7 @@ notebook > header.top > tabs { margin-bottom: -2px; margin-top: 2px; } notebook > header.top > tabs > tab { background-image: linear-gradient(to bottom, #f1f1f0, #c0bdba); box-shadow: 0px -1px #94908c, 1px 0px #94908c, -1px 0px #94908c, inset 0px -1px #94908c; border-top-left-radius: 3px; border-top-right-radius: 3px; } -notebook > header.top > tabs > tab:checked { background-image: linear-gradient(to bottom, #d3d8c7 3px, #848680 5px, #f4f4f3 5px, #f4f4f3); box-shadow: 0px -1px #848680, 1px 0px #94908c, -1px 0px #94908c; } +notebook > header.top > tabs > tab:checked { background-image: linear-gradient(to bottom, #979f84, #d3d8c7 3px, #848680 5px, #fefefe 5px, #f4f4f3); box-shadow: 0px -1px #848680, 1px 0px #94908c, -1px 0px #94908c; } notebook > header.bottom { border-top-style: solid; } @@ -887,7 +887,7 @@ notebook > header.bottom > tabs { margin-top: -2px; margin-bottom: 2px; } notebook > header.bottom > tabs > tab { background-image: linear-gradient(to top, #f1f1f0, #c0bdba); box-shadow: 0px 1px #94908c, 1px 0px #94908c, -1px 0px #94908c, inset 0px 1px #94908c; border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; } -notebook > header.bottom > tabs > tab:checked { background-image: linear-gradient(to top, #d3d8c7 3px, #848680 5px, #f4f4f3 5px, #f4f4f3); box-shadow: 0px 1px #848680, 1px 0px #94908c, -1px 0px #94908c; } +notebook > header.bottom > tabs > tab:checked { background-image: linear-gradient(to top, #979f84, #d3d8c7 3px, #848680 5px, #fefefe 5px, #f4f4f3); box-shadow: 0px 1px #848680, 1px 0px #94908c, -1px 0px #94908c; } notebook > header.left { border-right-style: solid; } @@ -895,9 +895,7 @@ notebook > header.left > tabs { margin-right: -2px; } notebook > header.left > tabs > tab { background-image: linear-gradient(to right, #f1f1f0, #c0bdba); box-shadow: 0px 1px #94908c, 0px -1px #94908c, -1px 0px #94908c, inset -1px 0px #94908c; border-top-left-radius: 3px; border-bottom-left-radius: 3px; } -notebook > header.left > tabs > tab:backdrop { box-shadow: none; } - -notebook > header.left > tabs > tab:checked { background-image: linear-gradient(to right, #d3d8c7 3px, #848680 5px, #f4f4f3 5px, #f4f4f3); box-shadow: -1px 0px #848680, 0px -1px #94908c, 0px 1px #94908c; } +notebook > header.left > tabs > tab:checked { background-image: linear-gradient(to right, #979f84, #d3d8c7 3px, #848680 5px, #fefefe 5px, #f4f4f3); box-shadow: -1px 0px #848680, 0px -1px #94908c, 0px 1px #94908c; } notebook > header.right { border-left-style: solid; } @@ -905,9 +903,7 @@ notebook > header.right > tabs { margin-left: -2px; } notebook > header.right > tabs > tab { background-image: linear-gradient(to left, #f1f1f0, #c0bdba); box-shadow: 0px 1px #94908c, 0px -1px #94908c, 1px 0px #94908c, inset 1px 0px #94908c; border-top-right-radius: 3px; border-bottom-right-radius: 3px; } -notebook > header.right > tabs > tab:backdrop { box-shadow: none; } - -notebook > header.right > tabs > tab:checked { background-image: linear-gradient(to left, #d3d8c7 3px, #848680 5px, #f4f4f3 5px, #f4f4f3); box-shadow: 1px 0px #848680, 0px -1px #94908c, 0px 1px #94908c; } +notebook > header.right > tabs > tab:checked { background-image: linear-gradient(to left, #979f84, #d3d8c7 3px, #848680 5px, #fefefe 5px, #f4f4f3); box-shadow: 1px 0px #848680, 0px -1px #94908c, 0px 1px #94908c; } notebook > header.top > tabs > arrow { border-top-style: none; } @@ -2429,7 +2425,7 @@ window#Main.background #search { background: #ffffff; color: #000000; box-shadow window#Main.background #search entry { border-color: #94908c; } -MatePanelAppletFrameDBus > MatePanelAppletFrameDBus { background-image: -gtk-scaled(url("assets/panel-grid.svg")); background-color: transparent; color: #bebebe; background-repeat: no-repeat; background-position: left; } +MatePanelAppletFrameDBus > MatePanelAppletFrameDBus { background-image: -gtk-scaled(url("assets/panel-grid.svg")); background-color: transparent; color: #8f8f8f; background-repeat: no-repeat; background-position: left; } /* for firefox and probably other apps */ label:selected, label selection, label selection:focus, label selection:hover { color: #42453E; } diff --git a/desktop-themes/YaruOk/gtk-3.0/_apps.scss b/desktop-themes/YaruOk/gtk-3.0/_apps.scss index d187ba35..ad312b5c 100644 --- a/desktop-themes/YaruOk/gtk-3.0/_apps.scss +++ b/desktop-themes/YaruOk/gtk-3.0/_apps.scss @@ -1129,7 +1129,7 @@ window#Main.background { MatePanelAppletFrameDBus > MatePanelAppletFrameDBus { background-image: -gtk-scaled(url("assets/panel-grid.svg")); background-color: transparent; - color: #bebebe; + color: #8f8f8f; background-repeat: no-repeat; background-position: left; } diff --git a/desktop-themes/YaruOk/gtk-3.0/_common.scss b/desktop-themes/YaruOk/gtk-3.0/_common.scss index f4046b23..4a157cef 100644 --- a/desktop-themes/YaruOk/gtk-3.0/_common.scss +++ b/desktop-themes/YaruOk/gtk-3.0/_common.scss @@ -2448,9 +2448,10 @@ notebook { &:backdrop { } &:checked { background-image: linear-gradient(to bottom, + gtkshade($core_color_a, 0.7), $core_color_a 3px, desaturate(darken($core_color_a, 30%), 15%) 5px, - $notebook_base_color 5px, + lighten($notebook_base_color, 4%) 5px, $notebook_base_color); box-shadow: 0px -1px desaturate(darken($core_color_a, 30%), 15%), 1px 0px $borders_color, -1px 0px $borders_color; } // Yaru change: 4px underlines are too much } @@ -2471,9 +2472,10 @@ notebook { &:backdrop { } &:checked { background-image: linear-gradient(to top, + gtkshade($core_color_a, 0.7), $core_color_a 3px, desaturate(darken($core_color_a, 30%), 15%) 5px, - $notebook_base_color 5px, + lighten($notebook_base_color, 4%) 5px, $notebook_base_color); box-shadow: 0px 1px desaturate(darken($core_color_a, 30%), 15%) , 1px 0px $borders_color, -1px 0px $borders_color; } // Yaru change: 4px underlines are too much } @@ -2492,13 +2494,14 @@ notebook { &:hover { } // Yaru change: 4px underlines are too much - &:backdrop { box-shadow: none; } + &:backdrop { } &:checked { background-image: linear-gradient(to right, + gtkshade($core_color_a, 0.7), $core_color_a 3px, desaturate(darken($core_color_a, 30%), 15%) 5px, - $notebook_base_color 5px, - $notebook_base_color); + lighten($notebook_base_color, 4%) 5px, + $notebook_base_color); box-shadow: -1px 0px desaturate(darken($core_color_a, 30%), 15%) , 0px -1px $borders_color,0px 1px $borders_color; } // Yaru change: 4px underlines are too much } } @@ -2515,12 +2518,13 @@ notebook { border-bottom-right-radius: 3px; &:hover { } // Yaru change: 4px underlines are too much - &:backdrop { box-shadow: none; } + &:backdrop { } &:checked { background-image: linear-gradient(to left, + gtkshade($core_color_a, 0.7), $core_color_a 3px, desaturate(darken($core_color_a, 30%), 15%) 5px, - $notebook_base_color 5px, + lighten($notebook_base_color, 4%) 5px, $notebook_base_color); box-shadow:1px 0px desaturate(darken($core_color_a, 30%), 15%), 0px -1px $borders_color,0px 1px $borders_color;} // Yaru change: 4px underlines are too much } diff --git a/desktop-themes/YaruOk/gtk-3.0/gtk.css b/desktop-themes/YaruOk/gtk-3.0/gtk.css index 09c3e362..f3a793a5 100644 --- a/desktop-themes/YaruOk/gtk-3.0/gtk.css +++ b/desktop-themes/YaruOk/gtk-3.0/gtk.css @@ -879,7 +879,7 @@ notebook > header.top > tabs { margin-bottom: -2px; margin-top: 2px; } notebook > header.top > tabs > tab { background-image: linear-gradient(to bottom, #f1f1f0, #c0bdba); box-shadow: 0px -1px #a29e9b, 1px 0px #a29e9b, -1px 0px #a29e9b, inset 0px -1px #a29e9b; border-top-left-radius: 3px; border-top-right-radius: 3px; } -notebook > header.top > tabs > tab:checked { background-image: linear-gradient(to bottom, #a4c2e8 3px, #4373b0 5px, #f4f4f3 5px, #f4f4f3); box-shadow: 0px -1px #4373b0, 1px 0px #a29e9b, -1px 0px #a29e9b; } +notebook > header.top > tabs > tab:checked { background-image: linear-gradient(to bottom, #5a85bb, #a4c2e8 3px, #4373b0 5px, #fefefe 5px, #f4f4f3); box-shadow: 0px -1px #4373b0, 1px 0px #a29e9b, -1px 0px #a29e9b; } notebook > header.bottom { border-top-style: solid; } @@ -887,7 +887,7 @@ notebook > header.bottom > tabs { margin-top: -2px; margin-bottom: 2px; } notebook > header.bottom > tabs > tab { background-image: linear-gradient(to top, #f1f1f0, #c0bdba); box-shadow: 0px 1px #a29e9b, 1px 0px #a29e9b, -1px 0px #a29e9b, inset 0px 1px #a29e9b; border-bottom-left-radius: 3px; border-bottom-right-radius: 3px; } -notebook > header.bottom > tabs > tab:checked { background-image: linear-gradient(to top, #a4c2e8 3px, #4373b0 5px, #f4f4f3 5px, #f4f4f3); box-shadow: 0px 1px #4373b0, 1px 0px #a29e9b, -1px 0px #a29e9b; } +notebook > header.bottom > tabs > tab:checked { background-image: linear-gradient(to top, #5a85bb, #a4c2e8 3px, #4373b0 5px, #fefefe 5px, #f4f4f3); box-shadow: 0px 1px #4373b0, 1px 0px #a29e9b, -1px 0px #a29e9b; } notebook > header.left { border-right-style: solid; } @@ -895,9 +895,7 @@ notebook > header.left > tabs { margin-right: -2px; } notebook > header.left > tabs > tab { background-image: linear-gradient(to right, #f1f1f0, #c0bdba); box-shadow: 0px 1px #a29e9b, 0px -1px #a29e9b, -1px 0px #a29e9b, inset -1px 0px #a29e9b; border-top-left-radius: 3px; border-bottom-left-radius: 3px; } -notebook > header.left > tabs > tab:backdrop { box-shadow: none; } - -notebook > header.left > tabs > tab:checked { background-image: linear-gradient(to right, #a4c2e8 3px, #4373b0 5px, #f4f4f3 5px, #f4f4f3); box-shadow: -1px 0px #4373b0, 0px -1px #a29e9b, 0px 1px #a29e9b; } +notebook > header.left > tabs > tab:checked { background-image: linear-gradient(to right, #5a85bb, #a4c2e8 3px, #4373b0 5px, #fefefe 5px, #f4f4f3); box-shadow: -1px 0px #4373b0, 0px -1px #a29e9b, 0px 1px #a29e9b; } notebook > header.right { border-left-style: solid; } @@ -905,9 +903,7 @@ notebook > header.right > tabs { margin-left: -2px; } notebook > header.right > tabs > tab { background-image: linear-gradient(to left, #f1f1f0, #c0bdba); box-shadow: 0px 1px #a29e9b, 0px -1px #a29e9b, 1px 0px #a29e9b, inset 1px 0px #a29e9b; border-top-right-radius: 3px; border-bottom-right-radius: 3px; } -notebook > header.right > tabs > tab:backdrop { box-shadow: none; } - -notebook > header.right > tabs > tab:checked { background-image: linear-gradient(to left, #a4c2e8 3px, #4373b0 5px, #f4f4f3 5px, #f4f4f3); box-shadow: 1px 0px #4373b0, 0px -1px #a29e9b, 0px 1px #a29e9b; } +notebook > header.right > tabs > tab:checked { background-image: linear-gradient(to left, #5a85bb, #a4c2e8 3px, #4373b0 5px, #fefefe 5px, #f4f4f3); box-shadow: 1px 0px #4373b0, 0px -1px #a29e9b, 0px 1px #a29e9b; } notebook > header.top > tabs > arrow { border-top-style: none; } @@ -2429,7 +2425,7 @@ window#Main.background #search { background: #ffffff; color: #000000; box-shadow window#Main.background #search entry { border-color: #a29e9b; } -MatePanelAppletFrameDBus > MatePanelAppletFrameDBus { background-image: -gtk-scaled(url("assets/panel-grid.svg")); background-color: transparent; color: #bebebe; background-repeat: no-repeat; background-position: left; } +MatePanelAppletFrameDBus > MatePanelAppletFrameDBus { background-image: -gtk-scaled(url("assets/panel-grid.svg")); background-color: transparent; color: #8f8f8f; background-repeat: no-repeat; background-position: left; } /* for firefox and probably other apps */ label:selected, label selection, label selection:focus, label selection:hover { color: #ffffff; } -- cgit v1.2.1