From 62528fbcf6a04c95e88ab15e4dbb6715e4143cde Mon Sep 17 00:00:00 2001 From: Csaba Jakosa Date: Mon, 16 May 2016 12:02:20 +0200 Subject: [PATCH] GTK 3.20 :: Fixed levelbar nth-child (#446) * * Fixed levelbar nth-child. * * Border color fix. --- gtk-3.20/scss/widgets/_progress.scss | 66 ++++++++++++++-------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/gtk-3.20/scss/widgets/_progress.scss b/gtk-3.20/scss/widgets/_progress.scss index 2d2eb05..56b3bd5 100644 --- a/gtk-3.20/scss/widgets/_progress.scss +++ b/gtk-3.20/scss/widgets/_progress.scss @@ -20,37 +20,37 @@ background-color: shade($bg_color, 1.08); background-image: none; } - } - progressbar progress { - @include linear-gradient($selected_bg_color); + progress { + @include linear-gradient($selected_bg_color); - border-radius: 0; - box-shadow: none; + border-radius: 0; + box-shadow: none; - &.left { - border-top-left-radius: $roundness; - border-bottom-left-radius: $roundness; - } - - &.right { - border-top-right-radius: $roundness; - border-bottom-right-radius: $roundness; - } - - &.left.right { box-shadow: none; } - - &.vertical { - @include linear-gradient($selected_bg_color, to right); - - &.bottom { + &.left { + border-top-left-radius: $roundness; border-bottom-left-radius: $roundness; + } + + &.right { + border-top-right-radius: $roundness; border-bottom-right-radius: $roundness; } - &.top { - border-top-left-radius: $roundness; - border-top-right-radius: $roundness; + &.left.right { box-shadow: none; } + + &.vertical { + @include linear-gradient($selected_bg_color, to right); + + &.bottom { + border-bottom-left-radius: $roundness; + border-bottom-right-radius: $roundness; + } + + &.top { + border-top-left-radius: $roundness; + border-top-right-radius: $roundness; + } } } } @@ -75,22 +75,21 @@ border-radius: $roundness; } - &.horizontal.discrete { margin-right: 1px; } + &.horizontal.discrete block { + margin: 0 2px; - &.vertical.discrete { margin-bottom: 1px; } + &:first-child { margin: 0; } + } - block:not(.empty) { - @include linear-gradient($selected_bg_color); + &.vertical.discrete block { + margin: 2px 0; - border-color: transparent; - border-radius: 0; + &:first-child { margin: 0; } } block { @include linear-gradient($selected_bg_color); - // FIXME: it would be nice to set make fill blocks bigger, but we'd need - // :nth-child working on discrete indicators border-color: transparent; border-radius: 0; @@ -99,7 +98,8 @@ border-color: transparent; } - &.high { + &.high, + :not(.empty) { background-color: $selected_bg_color; border-color: transparent; }