From 58bf6bb81bae5ff75560e03a66f634238476d618 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Thu, 3 Mar 2016 12:04:24 +0100 Subject: [PATCH] fix scales with marks --- common/gtk-3.0/3.20/gtk-dark.css | 18 +++++++++------- common/gtk-3.0/3.20/gtk-darker.css | 18 +++++++++------- common/gtk-3.0/3.20/gtk-solid-dark.css | 18 +++++++++------- common/gtk-3.0/3.20/gtk-solid-darker.css | 18 +++++++++------- common/gtk-3.0/3.20/gtk-solid.css | 18 +++++++++------- common/gtk-3.0/3.20/gtk.css | 18 +++++++++------- common/gtk-3.0/3.20/sass/_common.scss | 26 ++++++++++++++++-------- 7 files changed, 83 insertions(+), 51 deletions(-) diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index 2993e4b..6dad8b9 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -1923,19 +1923,23 @@ scale { min-width: 9px; padding: 5px; } scale marks { - color: alpha(currentColor,0.3); } + color: alpha(currentColor,0.4); } scale marks.top { - margin-bottom: -4px; } + margin-bottom: -4px; + margin-top: 4px; } scale marks.bottom { - margin-top: -4px; } + margin-top: -4px; + margin-bottom: 4px; } scale marks.left { - margin-right: -4px; } + margin-right: -4px; + margin-left: 4px; } scale marks.right { - margin-left: -4px; } - scale.horizontal mark indicator { + margin-left: -4px; + margin-right: 4px; } + scale.horizontal indicator { min-height: 3px; min-width: 1px; } - scale.vertical mark indicator { + scale.vertical indicator { min-height: 1px; min-width: 3px; } scale.fine-tune { diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index 2ef09e5..fb7ac6a 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -1922,19 +1922,23 @@ scale { min-width: 9px; padding: 5px; } scale marks { - color: alpha(currentColor,0.3); } + color: alpha(currentColor,0.4); } scale marks.top { - margin-bottom: -4px; } + margin-bottom: -4px; + margin-top: 4px; } scale marks.bottom { - margin-top: -4px; } + margin-top: -4px; + margin-bottom: 4px; } scale marks.left { - margin-right: -4px; } + margin-right: -4px; + margin-left: 4px; } scale marks.right { - margin-left: -4px; } - scale.horizontal mark indicator { + margin-left: -4px; + margin-right: 4px; } + scale.horizontal indicator { min-height: 3px; min-width: 1px; } - scale.vertical mark indicator { + scale.vertical indicator { min-height: 1px; min-width: 3px; } scale.fine-tune { diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css index 687e278..ea9792e 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -1923,19 +1923,23 @@ scale { min-width: 9px; padding: 5px; } scale marks { - color: alpha(currentColor,0.3); } + color: alpha(currentColor,0.4); } scale marks.top { - margin-bottom: -4px; } + margin-bottom: -4px; + margin-top: 4px; } scale marks.bottom { - margin-top: -4px; } + margin-top: -4px; + margin-bottom: 4px; } scale marks.left { - margin-right: -4px; } + margin-right: -4px; + margin-left: 4px; } scale marks.right { - margin-left: -4px; } - scale.horizontal mark indicator { + margin-left: -4px; + margin-right: 4px; } + scale.horizontal indicator { min-height: 3px; min-width: 1px; } - scale.vertical mark indicator { + scale.vertical indicator { min-height: 1px; min-width: 3px; } scale.fine-tune { diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css index 22c3bb1..aa43e25 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -1922,19 +1922,23 @@ scale { min-width: 9px; padding: 5px; } scale marks { - color: alpha(currentColor,0.3); } + color: alpha(currentColor,0.4); } scale marks.top { - margin-bottom: -4px; } + margin-bottom: -4px; + margin-top: 4px; } scale marks.bottom { - margin-top: -4px; } + margin-top: -4px; + margin-bottom: 4px; } scale marks.left { - margin-right: -4px; } + margin-right: -4px; + margin-left: 4px; } scale marks.right { - margin-left: -4px; } - scale.horizontal mark indicator { + margin-left: -4px; + margin-right: 4px; } + scale.horizontal indicator { min-height: 3px; min-width: 1px; } - scale.vertical mark indicator { + scale.vertical indicator { min-height: 1px; min-width: 3px; } scale.fine-tune { diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index 0f1d088..e9480dd 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -1926,19 +1926,23 @@ scale { min-width: 9px; padding: 5px; } scale marks { - color: alpha(currentColor,0.3); } + color: alpha(currentColor,0.4); } scale marks.top { - margin-bottom: -4px; } + margin-bottom: -4px; + margin-top: 4px; } scale marks.bottom { - margin-top: -4px; } + margin-top: -4px; + margin-bottom: 4px; } scale marks.left { - margin-right: -4px; } + margin-right: -4px; + margin-left: 4px; } scale marks.right { - margin-left: -4px; } - scale.horizontal mark indicator { + margin-left: -4px; + margin-right: 4px; } + scale.horizontal indicator { min-height: 3px; min-width: 1px; } - scale.vertical mark indicator { + scale.vertical indicator { min-height: 1px; min-width: 3px; } scale.fine-tune { diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index 66729c4..0f61890 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -1926,19 +1926,23 @@ scale { min-width: 9px; padding: 5px; } scale marks { - color: alpha(currentColor,0.3); } + color: alpha(currentColor,0.4); } scale marks.top { - margin-bottom: -4px; } + margin-bottom: -4px; + margin-top: 4px; } scale marks.bottom { - margin-top: -4px; } + margin-top: -4px; + margin-bottom: 4px; } scale marks.left { - margin-right: -4px; } + margin-right: -4px; + margin-left: 4px; } scale marks.right { - margin-left: -4px; } - scale.horizontal mark indicator { + margin-left: -4px; + margin-right: 4px; } + scale.horizontal indicator { min-height: 3px; min-width: 1px; } - scale.vertical mark indicator { + scale.vertical indicator { min-height: 1px; min-width: 3px; } scale.fine-tune { diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss index f404cb3..3eac8c2 100644 --- a/common/gtk-3.0/3.20/sass/_common.scss +++ b/common/gtk-3.0/3.20/sass/_common.scss @@ -1968,26 +1968,34 @@ checkbutton check { // GtkScale // scale { + $_marks_length: 3px; + $_marks_margin: -4px; + min-height: 9px; min-width: 9px; padding: 5px; marks { - color: gtkalpha(currentColor, 0.3); + color: gtkalpha(currentColor, 0.4); - &.top { margin-bottom: -4px; } - &.bottom { margin-top: -4px; } - &.left { margin-right: -4px; } - &.right { margin-left: -4px; } + @each $marks_pos, $marks_margin in (top, bottom), + (bottom, top), + (left, right), + (right, left) { + &.#{$marks_pos} { + margin-#{$marks_margin}: $_marks_margin; + margin-#{$marks_pos}: -$_marks_margin; + } + } } - &.horizontal mark indicator { - min-height: 3px; + &.horizontal indicator { + min-height: $_marks_length; min-width: 1px; } - &.vertical mark indicator { + &.vertical indicator { min-height: 1px; - min-width: 3px; + min-width: $_marks_length; } &.fine-tune {