From 15b272dfeaf7b44e80f61f6de95eeb7cfdea0248 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Mon, 12 Oct 2015 20:30:15 +0200 Subject: GTK3 Submarine themes: adjust GtkScale --- .../Blue-Submarine/gtk-3.0/gtk-widgets.css | 58 +++++++++++++++------- desktop-themes/Blue-Submarine/gtk-3.0/gtk.css | 1 + .../Green-Submarine/gtk-3.0/gtk-widgets.css | 40 ++++++++++++--- desktop-themes/Green-Submarine/gtk-3.0/gtk.css | 1 + 4 files changed, 75 insertions(+), 25 deletions(-) diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css index 82ed58e0..fddc161f 100644 --- a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css @@ -586,9 +586,9 @@ GtkLevelBar.vertical { ************/ .scale { - -GtkScale-slider-length: 14; - -GtkRange-slider-width: 14; - -GtkRange-trough-border: 1; + -GtkScale-slider-length: 16; + -GtkRange-slider-width: 16; + -GtkRange-trough-border: 0; -GtkWidget-focus-line-width: 0; } @@ -601,34 +601,58 @@ GtkLevelBar.vertical { color: alpha(@theme_base_color, 0.0); background-color: alpha(@theme_base_color, 0.0); /* background-image in -assets variant */ + background-position: center; +} + +.scale.slider.fine-tune:active, +.scale.slider.fine-tune:active:hover, +.scale.slider.fine-tune.horizontal:active, +.scale.slider.fine-tune.horizontal:active:hover { + background-size: 98%; + background-repeat: no-repeat; + background-position: center; } .toolbar .scale.trough, .scale.trough { - margin: 7px 0; - background-image: -gtk-gradient (linear, - left top, - left bottom, - from (alpha (#000, 0.20)), - color-stop (0.20, alpha (#000, 0.16)), - to (alpha (#000, 0.06))); - border-style: none; - border-width: 0px; border-radius: 8px; + border-style: solid; + border-width: 1px; + background-image: -gtk-gradient (linear, + left top, + left bottom, + from (alpha (#000, 0.20)), + color-stop (0.20, alpha (#000, 0.16)), + to (alpha (#000, 0.06))); box-shadow: inset 1px 1px alpha(#000, 0.08), inset -1px -1px alpha(#000, 0.08); } +.scale.trough { + margin: 6px 0; +} + +.scale.trough.vertical { + margin: 0 6px; +} + +.scale.trough, .scale.trough.vertical { - margin: 0 7px; + border-color: @scale_border_b; +} + +.scale.trough.highlight, +.scale.trough.highlight.vertical { + border-style: none; } .scale.trough:insensitive { background-image: -gtk-gradient (linear, - left top, - left bottom, - from (alpha (#000, 0.03)), - to (alpha (#000, 0.03))); + left top, + left bottom, + from (alpha (#000, 0.03)), + to (alpha (#000, 0.03))); + border-style: none; } .scale.progressbar { diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/gtk.css b/desktop-themes/Blue-Submarine/gtk-3.0/gtk.css index d4a2a85c..8f9864d8 100644 --- a/desktop-themes/Blue-Submarine/gtk-3.0/gtk.css +++ b/desktop-themes/Blue-Submarine/gtk-3.0/gtk.css @@ -114,6 +114,7 @@ @define-color scale_fill shade(@button_bg_active, 1.00); @define-color scale_border_a @internal_element_color; @define-color scale_border_b shade (@internal_element_color, 1.25); +@define-color scale_highlight_border shade (@scale_border_b, 1.25); @define-color progressbar_fill_a @button_bg_active; @define-color progressbar_fill_b shade(mix(@button_bg_active, blue, 0.10), 1.10); diff --git a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css index 6476f32a..f4376b98 100644 --- a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css @@ -586,9 +586,9 @@ GtkLevelBar.vertical { ************/ .scale { - -GtkScale-slider-length: 14; - -GtkRange-slider-width: 14; - -GtkRange-trough-border: 1; + -GtkScale-slider-length: 16; + -GtkRange-slider-width: 16; + -GtkRange-trough-border: 0; -GtkWidget-focus-line-width: 0; } @@ -601,26 +601,49 @@ GtkLevelBar.vertical { color: alpha(@theme_base_color, 0.0); background-color: alpha(@theme_base_color, 0.0); /* background-image in -assets variant */ + background-position: center; +} + +.scale.slider.fine-tune:active, +.scale.slider.fine-tune:active:hover, +.scale.slider.fine-tune.horizontal:active, +.scale.slider.fine-tune.horizontal:active:hover { + background-size: 98%; + background-repeat: no-repeat; + background-position: center; } .toolbar .scale.trough, .scale.trough { - margin: 7px 0; + border-radius: 8px; + border-style: solid; + border-width: 1px; background-image: -gtk-gradient (linear, left top, left bottom, from (alpha (#000, 0.20)), color-stop (0.20, alpha (#000, 0.16)), to (alpha (#000, 0.06))); - border-style: none; - border-width: 0px; - border-radius: 8px; box-shadow: inset 1px 1px alpha(#000, 0.08), inset -1px -1px alpha(#000, 0.08); } +.scale.trough { + margin: 6px 0; +} + +.scale.trough.vertical { + margin: 0 6px; +} + +.scale.trough, .scale.trough.vertical { - margin: 0 7px; + border-color: @scale_border_b; +} + +.scale.trough.highlight, +.scale.trough.highlight.vertical { + border-style: none; } .scale.trough:insensitive { @@ -629,6 +652,7 @@ GtkLevelBar.vertical { left bottom, from (alpha (#000, 0.03)), to (alpha (#000, 0.03))); + border-style: none; } .scale.progressbar { diff --git a/desktop-themes/Green-Submarine/gtk-3.0/gtk.css b/desktop-themes/Green-Submarine/gtk-3.0/gtk.css index 1548b339..1d81786d 100644 --- a/desktop-themes/Green-Submarine/gtk-3.0/gtk.css +++ b/desktop-themes/Green-Submarine/gtk-3.0/gtk.css @@ -114,6 +114,7 @@ @define-color scale_fill shade(@button_bg_active, 1.00); @define-color scale_border_a @internal_element_color; @define-color scale_border_b shade (@internal_element_color, 1.25); +@define-color scale_highlight_border shade (@scale_border_b, 1.25); @define-color progressbar_fill_a @button_bg_active; @define-color progressbar_fill_b shade(mix(@button_bg_active, green, 0.10), 1.10); -- cgit v1.2.1