[gtk+] adwaita: Fix scale styling for latest changes
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] adwaita: Fix scale styling for latest changes
- Date: Wed, 10 Jan 2018 08:27:46 +0000 (UTC)
commit 15b3f33965aa4a85e2b34c616781587b026354c7
Author: Timm Bäder <mail baedert org>
Date: Wed Jan 10 09:29:45 2018 +0100
adwaita: Fix scale styling for latest changes
gtk/theme/Adwaita/_common.scss | 42 ++++++++++++++---------------
gtk/theme/Adwaita/gtk-contained-dark.css | 26 ++++++++++--------
gtk/theme/Adwaita/gtk-contained.css | 26 ++++++++++--------
3 files changed, 48 insertions(+), 46 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 92541d0..db730b7 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3030,20 +3030,6 @@ scale {
value { color: gtkalpha(currentColor, 0.55); }
- marks {
- color: gtkalpha(currentColor, 0.55);
-
- @each $marks_class, $marks_pos, $marks_margin in (top, top, bottom),
- (bottom, bottom, top),
- (top, left, right),
- (bottom, right, left) {
- &.#{$marks_class} {
- margin-#{$marks_margin}: $_marks_distance;
- margin-#{$marks_pos}: -($_marks_distance + $_marks_length);
- }
- }
- }
-
&.fine-tune marks {
@each $marks_class, $marks_pos, $marks_margin in (top, top, bottom),
(bottom, bottom, top),
@@ -3057,20 +3043,32 @@ scale {
}
&.horizontal {
- indicator {
- background-color: currentColor;
- min-height: $_marks_length;
- min-width: 1px;
+ >marks {
+ color: gtkalpha(currentColor, 0.55);
+ &.top { margin-bottom: $_marks_distance; }
+ &.bottom { margin-top: $_marks_distance; }
+
+ indicator {
+ background-color: currentColor;
+ min-height: $_marks_length;
+ min-width: 1px;
+ }
}
&.fine-tune indicator { min-height: ($_marks_length - 3px); }
}
&.vertical {
- indicator {
- background-color: currentColor;
- min-height: 1px;
- min-width: $_marks_length;
+ >marks {
+ color: gtkalpha(currentColor, 0.55);
+ &.top { margin-right: $_marks_distance; }
+ &.bottom { margin-left: $_marks_distance; }
+
+ indicator {
+ background-color: currentColor;
+ min-height: 1px;
+ min-width: $_marks_length;
+ }
}
&.fine-tune indicator { min-width: ($_marks_length - 3px); }
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index ddb023f..f69cf9f 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1265,16 +1265,6 @@ row:selected scale slider:disabled, row:selected scale slider { border-color: #0
scale value { color: alpha(currentColor,0.55); }
-scale marks { color: alpha(currentColor,0.55); }
-
-scale marks.top { margin-bottom: 6px; margin-top: -12px; }
-
-scale marks.bottom { margin-top: 6px; margin-bottom: -12px; }
-
-scale marks.top { margin-right: 6px; margin-left: -12px; }
-
-scale marks.bottom { margin-left: 6px; margin-right: -12px; }
-
scale.fine-tune marks.top { margin-bottom: 6px; margin-top: -9px; }
scale.fine-tune marks.bottom { margin-top: 6px; margin-bottom: -9px; }
@@ -1283,11 +1273,23 @@ scale.fine-tune marks.top { margin-right: 6px; margin-left: -9px; }
scale.fine-tune marks.bottom { margin-left: 6px; margin-right: -9px; }
-scale.horizontal indicator { background-color: currentColor; min-height: 6px; min-width: 1px; }
+scale.horizontal > marks { color: alpha(currentColor,0.55); }
+
+scale.horizontal > marks.top { margin-bottom: 6px; }
+
+scale.horizontal > marks.bottom { margin-top: 6px; }
+
+scale.horizontal > marks indicator { background-color: currentColor; min-height: 6px; min-width: 1px; }
scale.horizontal.fine-tune indicator { min-height: 3px; }
-scale.vertical indicator { background-color: currentColor; min-height: 1px; min-width: 6px; }
+scale.vertical > marks { color: alpha(currentColor,0.55); }
+
+scale.vertical > marks.top { margin-right: 6px; }
+
+scale.vertical > marks.bottom { margin-left: 6px; }
+
+scale.vertical > marks indicator { background-color: currentColor; min-height: 1px; min-width: 6px; }
scale.vertical.fine-tune indicator { min-width: 3px; }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index b8dc1b3..f183493 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1285,16 +1285,6 @@ row:selected scale slider:disabled, row:selected scale slider { border-color: #1
scale value { color: alpha(currentColor,0.55); }
-scale marks { color: alpha(currentColor,0.55); }
-
-scale marks.top { margin-bottom: 6px; margin-top: -12px; }
-
-scale marks.bottom { margin-top: 6px; margin-bottom: -12px; }
-
-scale marks.top { margin-right: 6px; margin-left: -12px; }
-
-scale marks.bottom { margin-left: 6px; margin-right: -12px; }
-
scale.fine-tune marks.top { margin-bottom: 6px; margin-top: -9px; }
scale.fine-tune marks.bottom { margin-top: 6px; margin-bottom: -9px; }
@@ -1303,11 +1293,23 @@ scale.fine-tune marks.top { margin-right: 6px; margin-left: -9px; }
scale.fine-tune marks.bottom { margin-left: 6px; margin-right: -9px; }
-scale.horizontal indicator { background-color: currentColor; min-height: 6px; min-width: 1px; }
+scale.horizontal > marks { color: alpha(currentColor,0.55); }
+
+scale.horizontal > marks.top { margin-bottom: 6px; }
+
+scale.horizontal > marks.bottom { margin-top: 6px; }
+
+scale.horizontal > marks indicator { background-color: currentColor; min-height: 6px; min-width: 1px; }
scale.horizontal.fine-tune indicator { min-height: 3px; }
-scale.vertical indicator { background-color: currentColor; min-height: 1px; min-width: 6px; }
+scale.vertical > marks { color: alpha(currentColor,0.55); }
+
+scale.vertical > marks.top { margin-right: 6px; }
+
+scale.vertical > marks.bottom { margin-left: 6px; }
+
+scale.vertical > marks indicator { background-color: currentColor; min-height: 1px; min-width: 6px; }
scale.vertical.fine-tune indicator { min-width: 3px; }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]