From fd3221e4cd018c3c58ed5297d7d8fb729a98e1e2 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Mon, 7 Mar 2016 22:50:11 +0100 Subject: scale updates --- common/gtk-3.0/3.20/gtk-dark.css | 22 +++++++++++++++++++--- common/gtk-3.0/3.20/gtk-darker.css | 22 +++++++++++++++++++--- common/gtk-3.0/3.20/gtk-solid-dark.css | 22 +++++++++++++++++++--- common/gtk-3.0/3.20/gtk-solid-darker.css | 22 +++++++++++++++++++--- common/gtk-3.0/3.20/gtk-solid.css | 22 +++++++++++++++++++--- common/gtk-3.0/3.20/gtk.css | 22 +++++++++++++++++++--- common/gtk-3.0/3.20/sass/_common.scss | 28 ++++++++++++++++++++++------ 7 files changed, 136 insertions(+), 24 deletions(-) diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css index 91d7c19..8a908f0 100644 --- a/common/gtk-3.0/3.20/gtk-dark.css +++ b/common/gtk-3.0/3.20/gtk-dark.css @@ -1921,18 +1921,34 @@ scale { min-height: 9px; min-width: 9px; padding: 5px; } + scale value { + color: alpha(currentColor,0.4); } scale marks { color: alpha(currentColor,0.4); } scale marks.top { + margin-bottom: -2px; + margin-top: 2px; } + scale marks.bottom { + margin-top: -2px; + margin-bottom: 2px; } + scale marks.top { + margin-right: -2px; + margin-left: 2px; } + scale marks.bottom { + margin-left: -2px; + margin-right: 2px; } + scale.fine-tune marks { + color: alpha(currentColor,0.4); } + scale.fine-tune marks.top { margin-bottom: -4px; margin-top: 4px; } - scale marks.bottom { + scale.fine-tune marks.bottom { margin-top: -4px; margin-bottom: 4px; } - scale marks.left { + scale.fine-tune marks.top { margin-right: -4px; margin-left: 4px; } - scale marks.right { + scale.fine-tune marks.bottom { margin-left: -4px; margin-right: 4px; } scale.horizontal indicator { diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css index d066153..35b3ade 100644 --- a/common/gtk-3.0/3.20/gtk-darker.css +++ b/common/gtk-3.0/3.20/gtk-darker.css @@ -1920,18 +1920,34 @@ scale { min-height: 9px; min-width: 9px; padding: 5px; } + scale value { + color: alpha(currentColor,0.4); } scale marks { color: alpha(currentColor,0.4); } scale marks.top { + margin-bottom: -2px; + margin-top: 2px; } + scale marks.bottom { + margin-top: -2px; + margin-bottom: 2px; } + scale marks.top { + margin-right: -2px; + margin-left: 2px; } + scale marks.bottom { + margin-left: -2px; + margin-right: 2px; } + scale.fine-tune marks { + color: alpha(currentColor,0.4); } + scale.fine-tune marks.top { margin-bottom: -4px; margin-top: 4px; } - scale marks.bottom { + scale.fine-tune marks.bottom { margin-top: -4px; margin-bottom: 4px; } - scale marks.left { + scale.fine-tune marks.top { margin-right: -4px; margin-left: 4px; } - scale marks.right { + scale.fine-tune marks.bottom { margin-left: -4px; margin-right: 4px; } scale.horizontal indicator { 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 3e1e5db..7c43343 100644 --- a/common/gtk-3.0/3.20/gtk-solid-dark.css +++ b/common/gtk-3.0/3.20/gtk-solid-dark.css @@ -1921,18 +1921,34 @@ scale { min-height: 9px; min-width: 9px; padding: 5px; } + scale value { + color: alpha(currentColor,0.4); } scale marks { color: alpha(currentColor,0.4); } scale marks.top { + margin-bottom: -2px; + margin-top: 2px; } + scale marks.bottom { + margin-top: -2px; + margin-bottom: 2px; } + scale marks.top { + margin-right: -2px; + margin-left: 2px; } + scale marks.bottom { + margin-left: -2px; + margin-right: 2px; } + scale.fine-tune marks { + color: alpha(currentColor,0.4); } + scale.fine-tune marks.top { margin-bottom: -4px; margin-top: 4px; } - scale marks.bottom { + scale.fine-tune marks.bottom { margin-top: -4px; margin-bottom: 4px; } - scale marks.left { + scale.fine-tune marks.top { margin-right: -4px; margin-left: 4px; } - scale marks.right { + scale.fine-tune marks.bottom { margin-left: -4px; margin-right: 4px; } scale.horizontal indicator { 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 f6f4982..31b31be 100644 --- a/common/gtk-3.0/3.20/gtk-solid-darker.css +++ b/common/gtk-3.0/3.20/gtk-solid-darker.css @@ -1920,18 +1920,34 @@ scale { min-height: 9px; min-width: 9px; padding: 5px; } + scale value { + color: alpha(currentColor,0.4); } scale marks { color: alpha(currentColor,0.4); } scale marks.top { + margin-bottom: -2px; + margin-top: 2px; } + scale marks.bottom { + margin-top: -2px; + margin-bottom: 2px; } + scale marks.top { + margin-right: -2px; + margin-left: 2px; } + scale marks.bottom { + margin-left: -2px; + margin-right: 2px; } + scale.fine-tune marks { + color: alpha(currentColor,0.4); } + scale.fine-tune marks.top { margin-bottom: -4px; margin-top: 4px; } - scale marks.bottom { + scale.fine-tune marks.bottom { margin-top: -4px; margin-bottom: 4px; } - scale marks.left { + scale.fine-tune marks.top { margin-right: -4px; margin-left: 4px; } - scale marks.right { + scale.fine-tune marks.bottom { margin-left: -4px; margin-right: 4px; } scale.horizontal indicator { diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css index e353723..c75778b 100644 --- a/common/gtk-3.0/3.20/gtk-solid.css +++ b/common/gtk-3.0/3.20/gtk-solid.css @@ -1924,18 +1924,34 @@ scale { min-height: 9px; min-width: 9px; padding: 5px; } + scale value { + color: alpha(currentColor,0.4); } scale marks { color: alpha(currentColor,0.4); } scale marks.top { + margin-bottom: -2px; + margin-top: 2px; } + scale marks.bottom { + margin-top: -2px; + margin-bottom: 2px; } + scale marks.top { + margin-right: -2px; + margin-left: 2px; } + scale marks.bottom { + margin-left: -2px; + margin-right: 2px; } + scale.fine-tune marks { + color: alpha(currentColor,0.4); } + scale.fine-tune marks.top { margin-bottom: -4px; margin-top: 4px; } - scale marks.bottom { + scale.fine-tune marks.bottom { margin-top: -4px; margin-bottom: 4px; } - scale marks.left { + scale.fine-tune marks.top { margin-right: -4px; margin-left: 4px; } - scale marks.right { + scale.fine-tune marks.bottom { margin-left: -4px; margin-right: 4px; } scale.horizontal indicator { diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css index d7fc7d0..1602115 100644 --- a/common/gtk-3.0/3.20/gtk.css +++ b/common/gtk-3.0/3.20/gtk.css @@ -1924,18 +1924,34 @@ scale { min-height: 9px; min-width: 9px; padding: 5px; } + scale value { + color: alpha(currentColor,0.4); } scale marks { color: alpha(currentColor,0.4); } scale marks.top { + margin-bottom: -2px; + margin-top: 2px; } + scale marks.bottom { + margin-top: -2px; + margin-bottom: 2px; } + scale marks.top { + margin-right: -2px; + margin-left: 2px; } + scale marks.bottom { + margin-left: -2px; + margin-right: 2px; } + scale.fine-tune marks { + color: alpha(currentColor,0.4); } + scale.fine-tune marks.top { margin-bottom: -4px; margin-top: 4px; } - scale marks.bottom { + scale.fine-tune marks.bottom { margin-top: -4px; margin-bottom: 4px; } - scale marks.left { + scale.fine-tune marks.top { margin-right: -4px; margin-left: 4px; } - scale marks.right { + scale.fine-tune marks.bottom { margin-left: -4px; margin-right: 4px; } scale.horizontal indicator { diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss index 980ccfc..a889726 100644 --- a/common/gtk-3.0/3.20/sass/_common.scss +++ b/common/gtk-3.0/3.20/sass/_common.scss @@ -1966,26 +1966,42 @@ checkbutton check { // scale { $_marks_length: 3px; - $_marks_margin: -4px; + $_marks_margin: -2px; min-height: 9px; min-width: 9px; padding: 5px; + value { color: gtkalpha(currentColor, 0.4); } + marks { color: gtkalpha(currentColor, 0.4); - @each $marks_pos, $marks_margin in (top, bottom), - (bottom, top), - (left, right), - (right, left) { - &.#{$marks_pos} { + @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_margin; margin-#{$marks_pos}: -$_marks_margin; } } } + &.fine-tune marks { + color: gtkalpha(currentColor, 0.4); + + @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_margin - 2px; + margin-#{$marks_pos}: -$_marks_margin + 2px; + } + } + } + &.horizontal indicator { min-height: $_marks_length; min-width: 1px; -- cgit v1.2.3