From be437bc11ef234062a5f195cf15fdb093b54ead0 Mon Sep 17 00:00:00 2001 From: Mate Date: Thu, 10 Jun 2021 21:04:10 +0200 Subject: import scrollbar code from traditional green to yaru green --- desktop-themes/YaruGreen/gtk-3.0/_common.scss | 26 ++++++++++++--------- .../YaruGreen/gtk-3.0/assets/Makefile.am | 4 +++- .../YaruGreen/gtk-3.0/assets/slider-horz-grip.png | Bin 0 -> 173 bytes .../YaruGreen/gtk-3.0/assets/slider-vert-grip.png | Bin 0 -> 162 bytes desktop-themes/YaruGreen/gtk-3.0/gtk.css | 10 ++++---- 5 files changed, 23 insertions(+), 17 deletions(-) create mode 100644 desktop-themes/YaruGreen/gtk-3.0/assets/slider-horz-grip.png create mode 100644 desktop-themes/YaruGreen/gtk-3.0/assets/slider-vert-grip.png (limited to 'desktop-themes/YaruGreen') diff --git a/desktop-themes/YaruGreen/gtk-3.0/_common.scss b/desktop-themes/YaruGreen/gtk-3.0/_common.scss index d3715eb6..46e270e3 100644 --- a/desktop-themes/YaruGreen/gtk-3.0/_common.scss +++ b/desktop-themes/YaruGreen/gtk-3.0/_common.scss @@ -2593,8 +2593,8 @@ notebook { } tab { - min-height: 30px; - min-width: 30px; + min-height: 25px; + min-width: 25px; padding: 3px 12px; outline-offset: -5px; @@ -2790,7 +2790,8 @@ scrollbar { } &.horizontal slider { - background-image: linear-gradient(to bottom, + background-position: center center; + background-image: url("assets/slider-horz-grip.png"), linear-gradient(to bottom, transparentize($scrollbar_slider_gradient_a, 0.01) 1px, transparentize($scrollbar_slider_gradient_b, 0.01) 50%, transparentize($scrollbar_slider_gradient_c, 0.01) 50%, @@ -2798,7 +2799,8 @@ scrollbar { } &.vertical slider { - background-image: linear-gradient(to right, + background-position: center center; + background-image: url("assets/slider-vert-grip.png"), linear-gradient(to right, transparentize($scrollbar_slider_gradient_a, 0.01) 1px, transparentize($scrollbar_slider_gradient_b, 0.01) 50%, transparentize($scrollbar_slider_gradient_c, 0.01) 50%, @@ -2806,7 +2808,8 @@ scrollbar { } &.vertical slider:hover { - background-image: linear-gradient(to right, + background-position: center center; + background-image: url("assets/slider-vert-grip.png"), linear-gradient(to right, $scrollbar_slider_inner_border_color, $scrollbar_slider_hover_gradient_a 1px, $scrollbar_slider_hover_gradient_b 50%, @@ -2816,7 +2819,8 @@ scrollbar { } &.horizontal slider:hover { - background-image: linear-gradient(to bottom, + background-position: center center; + background-image: url("assets/slider-horz-grip.png"), linear-gradient(to bottom, $scrollbar_slider_inner_border_color, $scrollbar_slider_hover_gradient_a 1px, $scrollbar_slider_hover_gradient_b 50%, @@ -2829,9 +2833,9 @@ scrollbar { slider { background-repeat: no-repeat; background-position: center center; - min-width: 13px; - min-height: 13px; - border: 1px solid darken($core_color_a , 20%); + min-width: 14px; + min-height: 14px; + border: 1px solid darken($core_color_a , 35%); border-radius: 0px; // background-clip: padding-box; // background-color: $scrollbar_slider_color; @@ -3765,8 +3769,8 @@ progressbar { repeating-linear-gradient(135deg, gtkalpha($progressbar_pattern_color, 0.0), gtkalpha($progressbar_pattern_color, 0.0) 12px, - gtkalpha($progressbar_pattern_color, 0.5) 12px, - gtkalpha($progressbar_pattern_color, 0.5) 24px), + gtkalpha($progressbar_pattern_color, 0.4) 12px, + gtkalpha($progressbar_pattern_color, 0.4) 24px), linear-gradient(to bottom, gtkalpha($progressbar_gradient_a, 0.7), gtkalpha($progressbar_gradient_b, 0.7) 50%, diff --git a/desktop-themes/YaruGreen/gtk-3.0/assets/Makefile.am b/desktop-themes/YaruGreen/gtk-3.0/assets/Makefile.am index da701114..588fc36f 100644 --- a/desktop-themes/YaruGreen/gtk-3.0/assets/Makefile.am +++ b/desktop-themes/YaruGreen/gtk-3.0/assets/Makefile.am @@ -1,8 +1,10 @@ -THEME_NAME=YaruGreen +THEME_NAME=YaruOk themedir = $(datadir)/themes/$(THEME_NAME)/gtk-3.0/assets theme_DATA = \ + slider-horz-grip.png \ + slider-vert-grip.png \ bullet-symbolic.svg \ bullet-symbolic.symbolic.png \ check-symbolic.svg \ diff --git a/desktop-themes/YaruGreen/gtk-3.0/assets/slider-horz-grip.png b/desktop-themes/YaruGreen/gtk-3.0/assets/slider-horz-grip.png new file mode 100644 index 00000000..313c11dc Binary files /dev/null and b/desktop-themes/YaruGreen/gtk-3.0/assets/slider-horz-grip.png differ diff --git a/desktop-themes/YaruGreen/gtk-3.0/assets/slider-vert-grip.png b/desktop-themes/YaruGreen/gtk-3.0/assets/slider-vert-grip.png new file mode 100644 index 00000000..4b5a55a3 Binary files /dev/null and b/desktop-themes/YaruGreen/gtk-3.0/assets/slider-vert-grip.png differ diff --git a/desktop-themes/YaruGreen/gtk-3.0/gtk.css b/desktop-themes/YaruGreen/gtk-3.0/gtk.css index 01faf6c6..1291226f 100644 --- a/desktop-themes/YaruGreen/gtk-3.0/gtk.css +++ b/desktop-themes/YaruGreen/gtk-3.0/gtk.css @@ -1016,15 +1016,15 @@ scrollbar.horizontal trough { min-height: 14px; border-radius: 0px; border-width scrollbar.vertical trough { min-height: 14px; border-radius: 0px; border-width: 0px 1px 0px 1px; border-image: none; background-image: linear-gradient(to right, #cdcbc9, #d6d4d2 50%); } -scrollbar.horizontal slider { background-image: linear-gradient(to bottom, rgba(209, 214, 197, 0.99) 1px, rgba(203, 209, 190, 0.99) 50%, rgba(195, 201, 181, 0.99) 50%, rgba(187, 194, 171, 0.99) 95%); } +scrollbar.horizontal slider { background-position: center center; background-image: url("assets/slider-horz-grip.png"), linear-gradient(to bottom, rgba(209, 214, 197, 0.99) 1px, rgba(203, 209, 190, 0.99) 50%, rgba(195, 201, 181, 0.99) 50%, rgba(187, 194, 171, 0.99) 95%); } -scrollbar.vertical slider { background-image: linear-gradient(to right, rgba(209, 214, 197, 0.99) 1px, rgba(203, 209, 190, 0.99) 50%, rgba(195, 201, 181, 0.99) 50%, rgba(187, 194, 171, 0.99) 95%); } +scrollbar.vertical slider { background-position: center center; background-image: url("assets/slider-vert-grip.png"), linear-gradient(to right, rgba(209, 214, 197, 0.99) 1px, rgba(203, 209, 190, 0.99) 50%, rgba(195, 201, 181, 0.99) 50%, rgba(187, 194, 171, 0.99) 95%); } -scrollbar.vertical slider:hover { background-image: linear-gradient(to right, #dbdfd1, #d9ddce 1px, #d1d6c5 50%, #cbd1be 50%, #c1c8b2 95%, #dbdfd1); } +scrollbar.vertical slider:hover { background-position: center center; background-image: url("assets/slider-vert-grip.png"), linear-gradient(to right, #dbdfd1, #d9ddce 1px, #d1d6c5 50%, #cbd1be 50%, #c1c8b2 95%, #dbdfd1); } -scrollbar.horizontal slider:hover { background-image: linear-gradient(to bottom, #dbdfd1, #d9ddce 1px, #d1d6c5 50%, #cbd1be 50%, #c1c8b2 95%, #dbdfd1); } +scrollbar.horizontal slider:hover { background-position: center center; background-image: url("assets/slider-horz-grip.png"), linear-gradient(to bottom, #dbdfd1, #d9ddce 1px, #d1d6c5 50%, #cbd1be 50%, #c1c8b2 95%, #dbdfd1); } -scrollbar slider { background-repeat: no-repeat; background-position: center center; min-width: 13px; min-height: 13px; border: 1px solid #7f8b61; border-radius: 0px; } +scrollbar slider { background-repeat: no-repeat; background-position: center center; min-width: 14px; min-height: 14px; border: 1px solid #7f8b61; border-radius: 0px; } scrollbar slider:hover { background-color: #2f2f2f; } -- cgit v1.2.1