[gtk+] Adwaita: make progressbars and scales the same size
- From: Lapo Calamandrei <lapo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Adwaita: make progressbars and scales the same size
- Date: Mon, 21 Dec 2015 10:52:02 +0000 (UTC)
commit a54fadced69dba4e004fecb97e5e1207cb38df52
Author: Lapo Calamandrei <calamandrei gmail com>
Date: Mon Dec 21 11:50:56 2015 +0100
Adwaita: make progressbars and scales the same size
gtk/theme/Adwaita/_common.scss | 24 +++++++++++-------------
gtk/theme/Adwaita/gtk-contained-dark.css | 22 +++++++++++-----------
gtk/theme/Adwaita/gtk-contained.css | 22 +++++++++++-----------
3 files changed, 33 insertions(+), 35 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 76ee270..636998d 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2239,7 +2239,6 @@ checkbutton check {
}
scale {
- // FIXME: rationalize
-GtkScale-slider-length: 20;
-GtkRange-slider-width: 26;
-GtkRange-trough-border: 2;
@@ -2259,8 +2258,7 @@ scale {
trough { margin: 13px; }
- &:not(.vertical) slider { margin: 3px 0; }
-
+ &.horizontal slider { margin: 3px 0; }
&.vertical slider { margin: 0 3px; }
// the backing bit
@@ -2401,12 +2399,12 @@ progressbar {
// sizing
&.horizontal {
trough,
- progress { min-height: 4px; } // FIXME: should be 6px, but looks like currently gtk+ consider borders
+ progress { min-height: 2px; } // FIXME: should be 4px, but looks like currently gtk+ consider borders
}
&.vertical {
trough,
- progress { min-width: 4px; } // FIXME: should be 6px, but looks like currently gtk+ consider borders
+ progress { min-width: 2px; } // FIXME: should be 4px, but looks like currently gtk+ consider borders
}
&.horizontal progress { margin: 0 -1px; } // the progress node is positioned after the trough border
@@ -2430,20 +2428,20 @@ progressbar {
@extend %scale_highlight;
border-radius: 1.5px;
&.left {
- border-top-left-radius: 3px;
- border-bottom-left-radius: 3px;
+ border-top-left-radius: 2px;
+ border-bottom-left-radius: 2px;
}
&.right {
- border-top-right-radius: 3px;
- border-bottom-right-radius: 3px;
+ border-top-right-radius: 2px;
+ border-bottom-right-radius: 2px;
}
&.top {
- border-top-right-radius: 3px;
- border-top-left-radius: 3px;
+ border-top-right-radius: 2px;
+ border-top-left-radius: 2px;
}
&.bottom {
- border-bottom-right-radius: 3px;
- border-bottom-left-radius: 3px;
+ border-bottom-right-radius: 2px;
+ border-bottom-left-radius: 2px;
}
}
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 8bf804e..2ede396 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -3083,7 +3083,7 @@ scale {
border-radius: 4px; }
scale trough {
margin: 13px; }
- scale:not(.vertical) slider {
+ scale.horizontal slider {
margin: 3px 0; }
scale.vertical slider {
margin: 0 3px; }
@@ -3424,10 +3424,10 @@ progressbar {
box-shadow: 0 1px rgba(238, 238, 236, 0); }
progressbar.horizontal trough,
progressbar.horizontal progress {
- min-height: 4px; }
+ min-height: 2px; }
progressbar.vertical trough,
progressbar.vertical progress {
- min-width: 4px; }
+ min-width: 2px; }
progressbar.horizontal progress {
margin: 0 -1px; }
progressbar.vertical progress {
@@ -3437,17 +3437,17 @@ progressbar {
progressbar progress {
border-radius: 1.5px; }
progressbar progress.left {
- border-top-left-radius: 3px;
- border-bottom-left-radius: 3px; }
+ border-top-left-radius: 2px;
+ border-bottom-left-radius: 2px; }
progressbar progress.right {
- border-top-right-radius: 3px;
- border-bottom-right-radius: 3px; }
+ border-top-right-radius: 2px;
+ border-bottom-right-radius: 2px; }
progressbar progress.top {
- border-top-right-radius: 3px;
- border-top-left-radius: 3px; }
+ border-top-right-radius: 2px;
+ border-top-left-radius: 2px; }
progressbar progress.bottom {
- border-bottom-right-radius: 3px;
- border-bottom-left-radius: 3px; }
+ border-bottom-right-radius: 2px;
+ border-bottom-left-radius: 2px; }
progressbar.osd {
min-width: 3px;
min-height: 3px; }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 7e1141a..7d2c605 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -3245,7 +3245,7 @@ scale {
border-radius: 4px; }
scale trough {
margin: 13px; }
- scale:not(.vertical) slider {
+ scale.horizontal slider {
margin: 3px 0; }
scale.vertical slider {
margin: 0 3px; }
@@ -3586,10 +3586,10 @@ progressbar {
box-shadow: 0 1px rgba(255, 255, 255, 0); }
progressbar.horizontal trough,
progressbar.horizontal progress {
- min-height: 4px; }
+ min-height: 2px; }
progressbar.vertical trough,
progressbar.vertical progress {
- min-width: 4px; }
+ min-width: 2px; }
progressbar.horizontal progress {
margin: 0 -1px; }
progressbar.vertical progress {
@@ -3599,17 +3599,17 @@ progressbar {
progressbar progress {
border-radius: 1.5px; }
progressbar progress.left {
- border-top-left-radius: 3px;
- border-bottom-left-radius: 3px; }
+ border-top-left-radius: 2px;
+ border-bottom-left-radius: 2px; }
progressbar progress.right {
- border-top-right-radius: 3px;
- border-bottom-right-radius: 3px; }
+ border-top-right-radius: 2px;
+ border-bottom-right-radius: 2px; }
progressbar progress.top {
- border-top-right-radius: 3px;
- border-top-left-radius: 3px; }
+ border-top-right-radius: 2px;
+ border-top-left-radius: 2px; }
progressbar progress.bottom {
- border-bottom-right-radius: 3px;
- border-bottom-left-radius: 3px; }
+ border-bottom-right-radius: 2px;
+ border-bottom-left-radius: 2px; }
progressbar.osd {
min-width: 3px;
min-height: 3px; }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]