From 602c4b9008cbcd8548ce998b33b55e17ad3303b9 Mon Sep 17 00:00:00 2001 From: Megax <megax@yeahunter.hu> Date: Mon, 18 Apr 2016 14:58:29 +0200 Subject: [PATCH 1/3] * Fixed #357. --- gtk-3.20/scss/widgets/_scrollbar.scss | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gtk-3.20/scss/widgets/_scrollbar.scss b/gtk-3.20/scss/widgets/_scrollbar.scss index 2658546..61dc4be 100644 --- a/gtk-3.20/scss/widgets/_scrollbar.scss +++ b/gtk-3.20/scss/widgets/_scrollbar.scss @@ -31,8 +31,8 @@ slider { min-width: 7px; min-height: 7px; - margin: -2px; - border: 4px solid transparent; + margin: -1px; + border: 2px solid transparent; border-radius: $roundness; background-clip: padding-box; background-color: $scrollbar_slider_color; @@ -52,8 +52,8 @@ min-height: 7px; } - &.horizontal slider { border-width: 1px; } - &.vertical slider { border-width: 1px; } + &.horizontal slider { border-width: 1px 2px; } + &.vertical slider { border-width: 2px 1px; } } &.overlay-indicator { @@ -64,15 +64,15 @@ slider { margin: 0; - min-width: 5px; - min-height: 5px; + min-width: 4px; + min-height: 4px; background-color: $fg_color; border: 1px solid if($variant == 'light', white, black); } button { - min-width: 5px; - min-height: 5px; + min-width: 4px; + min-height: 4px; background-color: $fg_color; background-clip: padding-box; border-radius: $roundness; @@ -82,7 +82,7 @@ &.horizontal { slider { - margin: 0 2px; + margin: 0; min-width: $_slider_min_length; } @@ -94,7 +94,7 @@ &.vertical { slider { - margin: 2px 0; + margin: 0; min-height: $_slider_min_length; } From c295ddc279877c1193ffd91eed27fc499022c198 Mon Sep 17 00:00:00 2001 From: Megax <megax@yeahunter.hu> Date: Tue, 19 Apr 2016 18:29:47 +0200 Subject: [PATCH 2/3] * Slider min length and code fix. --- gtk-3.20/scss/widgets/_scrollbar.scss | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/gtk-3.20/scss/widgets/_scrollbar.scss b/gtk-3.20/scss/widgets/_scrollbar.scss index 61dc4be..739f375 100644 --- a/gtk-3.20/scss/widgets/_scrollbar.scss +++ b/gtk-3.20/scss/widgets/_scrollbar.scss @@ -4,7 +4,7 @@ @include exports("scrollbar") { scrollbar { - $_slider_min_length: 20px; + $_slider_min_length: 40px; // disable steppers @at-root * { @@ -31,8 +31,8 @@ slider { min-width: 7px; min-height: 7px; - margin: -1px; - border: 2px solid transparent; + margin: 0; + border: 1px solid transparent; border-radius: $roundness; background-clip: padding-box; background-color: $scrollbar_slider_color; @@ -52,14 +52,15 @@ min-height: 7px; } - &.horizontal slider { border-width: 1px 2px; } - &.vertical slider { border-width: 2px 1px; } + &.horizontal slider { border-width: 1px 1px; } + + &.vertical slider { border-width: 1px 1px; } } &.overlay-indicator { &:not(.dragging):not(.hovering) { border-color: transparent; - opacity: 0.4; + opacity: .4; background-color: transparent; slider { @@ -106,12 +107,13 @@ } &.dragging, - &.hovering { opacity: 0.8; } + &.hovering { opacity: .8; } } &.horizontal slider { min-width: $_slider_min_length; } &.vertical slider { min-height: $_slider_min_length; } + // button styling button { padding: 0; @@ -153,9 +155,4 @@ } } } - - treeview ~ scrollbar.vertical { - border-top: 1px solid $borders_color; - margin-top: -1px; - } } From cf8f4a81db35375878f597469c94a28029b05b8b Mon Sep 17 00:00:00 2001 From: Megax <megax@yeahunter.hu> Date: Tue, 19 Apr 2016 18:32:41 +0200 Subject: [PATCH 3/3] * Border-width fix. --- gtk-3.20/scss/widgets/_scrollbar.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk-3.20/scss/widgets/_scrollbar.scss b/gtk-3.20/scss/widgets/_scrollbar.scss index 739f375..66c1c67 100644 --- a/gtk-3.20/scss/widgets/_scrollbar.scss +++ b/gtk-3.20/scss/widgets/_scrollbar.scss @@ -52,9 +52,9 @@ min-height: 7px; } - &.horizontal slider { border-width: 1px 1px; } + &.horizontal slider { border-width: 1px; } - &.vertical slider { border-width: 1px 1px; } + &.vertical slider { border-width: 1px; } } &.overlay-indicator {