From 805750cba723b9fa8a884dc036b448a196121334 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sat, 19 Mar 2016 15:59:29 +0100 Subject: GTK+-3.20 Submarine themes: adjust GtkColorScale --- .../Blue-Submarine/gtk-3.0/gtk-widgets-assets.css | 3 + .../Blue-Submarine/gtk-3.0/gtk-widgets.css | 71 +++++++++------------ .../Green-Submarine/gtk-3.0/gtk-widgets-assets.css | 3 + .../Green-Submarine/gtk-3.0/gtk-widgets.css | 73 +++++++++------------- 4 files changed, 63 insertions(+), 87 deletions(-) diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets-assets.css b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets-assets.css index 52a3c883..81b5a417 100644 --- a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets-assets.css +++ b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets-assets.css @@ -221,11 +221,14 @@ scale.vertical.scale-has-marks-above slider:disabled { background-image: -gtk-scaled(url("assets/scale-slider-marks-above-vertical-insensitive.png")); } +scale.horizontal contents:first-child:not(:only-child) slider, +scale.horizontal contents:first-child:not(:only-child) slider:hover, scale.horizontal.scale-has-marks-below slider, scale.horizontal.scale-has-marks-below slider:hover { background-image: -gtk-scaled(url("assets/scale-slider-marks-below-horizontal.png")); } +scale.horizontal contents:first-child:not(:only-child) slider:disabled, scale.horizontal.scale-has-marks-below slider:disabled { background-image: -gtk-scaled(url("assets/scale-slider-marks-below-horizontal-insensitive.png")); } 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 625b832d..4826a374 100644 --- a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css @@ -584,11 +584,11 @@ scale.horizontal { } scale.horizontal trough { - min-height: 4px; + min-height: 3px; } scale.vertical trough { - min-width: 4px; + min-width: 3px; } scale trough { @@ -605,8 +605,8 @@ scale trough { inset -1px -1px alpha(#000, 0.08); } -scale trough, -scale.horizontal trough, +scale trough, +scale.horizontal trough, scale.vertical trough { border-color: @scale_border_b; } @@ -727,6 +727,11 @@ scale.horizontal slider { margin: -9px 0px -9px 0px; } +/* scale.horizontal.scale-has-marks-below */ +scale.horizontal contents:first-child:not(:only-child) slider{ + min-height: 22px +} + scale.horizontal.fine-tune slider:active, scale.horizontal.fine-tune slider:hover:active { background-size: 90%; @@ -752,45 +757,17 @@ scale.vertical.fine-tune slider:hover:active { background-position: center; } -scale.horizontal.scale-has-marks-above.color { - min-height: 10px; - margin: 0px 0px 5px 0px; - padding: 0px; -} - -scale.horizontal.scale-has-marks-above.color trough { - min-height: 0px; - margin: -9px 0px 0px 0px; - padding: 5px; -} - -scale.horizontal.scale-has-marks-above.color slider { - min-height: 10px; - min-width: 20px; - margin: 0px 0px -10px 0px; - padding: 10px 0px; - background-size: 100%; - background-repeat: no-repeat; - background-position: center; -} - -scale.horizontal.scale-has-marks-above.color slider:hover { - background-size: 105%; -} - -scale.horizontal.fine-tune.scale-has-marks-above.color slider { - background-size: 90%; -} - +scale.horizontal.scale-has-marks-above.color, scale.vertical.scale-has-marks-below.color { - min-width: 0px; - margin: 0px 0px 0px 5px; + margin: 0px 0px 0px 0px; padding: 0px; } -scale.vertical.scale-has-marks-below.color trough { - min-width: 0px; - padding: 10px; +scale.scale-has-marks-above.color trough, +scale.scale-has-marks-below.color trough { + border-color: @notebook_border; + border-radius: 5px; + background-repeat: no-repeat; } scale.vertical.scale-has-marks-below.color slider { @@ -800,14 +777,22 @@ scale.vertical.scale-has-marks-below.color slider { background-size: 100%; background-repeat: no-repeat; background-position: center; + margin: 0px 0px 0px 0px; } -scale.vertical.scale-has-marks-below.color slider:hover { - background-size: 105%; +scale.horizontal.scale-has-marks-above.color slider { + min-height: 14px; + min-width: 20px; + margin: 0px 0px 0px 0px; + padding: 5px 0px; + background-size: 100%; + background-repeat: no-repeat; + background-position: center; } -scale.vertical.fine-tune.scale-has-marks-below.color slider { - background-size: 90%; +scale.horizontal.scale-has-marks-above.color slider:hover, +scale.vertical.scale-has-marks-below.color slider:hover { + background-size: 105%; } /********** diff --git a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets-assets.css b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets-assets.css index 52a3c883..81b5a417 100644 --- a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets-assets.css +++ b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets-assets.css @@ -221,11 +221,14 @@ scale.vertical.scale-has-marks-above slider:disabled { background-image: -gtk-scaled(url("assets/scale-slider-marks-above-vertical-insensitive.png")); } +scale.horizontal contents:first-child:not(:only-child) slider, +scale.horizontal contents:first-child:not(:only-child) slider:hover, scale.horizontal.scale-has-marks-below slider, scale.horizontal.scale-has-marks-below slider:hover { background-image: -gtk-scaled(url("assets/scale-slider-marks-below-horizontal.png")); } +scale.horizontal contents:first-child:not(:only-child) slider:disabled, scale.horizontal.scale-has-marks-below slider:disabled { background-image: -gtk-scaled(url("assets/scale-slider-marks-below-horizontal-insensitive.png")); } 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 ec97ffdb..055582de 100644 --- a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css @@ -584,11 +584,11 @@ scale.horizontal { } scale.horizontal trough { - min-height: 4px; + min-height: 3px; } scale.vertical trough { - min-width: 4px; + min-width: 3px; } scale trough { @@ -605,8 +605,8 @@ scale trough { inset -1px -1px alpha(#000, 0.08); } -scale trough, -scale.horizontal trough, +scale trough, +scale.horizontal trough, scale.vertical trough { border-color: @scale_border_b; } @@ -727,6 +727,11 @@ scale.horizontal slider { margin: -9px 0px -9px 0px; } +/* scale.horizontal.scale-has-marks-below */ +scale.horizontal contents:first-child:not(:only-child) slider{ + min-height: 22px +} + scale.horizontal.fine-tune slider:active, scale.horizontal.fine-tune slider:hover:active { background-size: 90%; @@ -752,45 +757,17 @@ scale.vertical.fine-tune slider:hover:active { background-position: center; } -scale.horizontal.scale-has-marks-above.color { - min-height: 10px; - margin: 0px 0px 5px 0px; - padding: 0px; -} - -scale.horizontal.scale-has-marks-above.color trough { - min-height: 0px; - margin: -9px 0px 0px 0px; - padding: 5px; -} - -scale.horizontal.scale-has-marks-above.color slider { - min-height: 10px; - min-width: 20px; - margin: 0px 0px -10px 0px; - padding: 10px 0px; - background-size: 100%; - background-repeat: no-repeat; - background-position: center; -} - -scale.horizontal.scale-has-marks-above.color slider:hover { - background-size: 105%; -} - -scale.horizontal.fine-tune.scale-has-marks-above.color slider { - background-size: 90%; -} - +scale.horizontal.scale-has-marks-above.color, scale.vertical.scale-has-marks-below.color { - min-width: 0px; - margin: 0px 0px 0px 5px; + margin: 0px 0px 0px 0px; padding: 0px; } -scale.vertical.scale-has-marks-below.color trough { - min-width: 0px; - padding: 10px; +scale.scale-has-marks-above.color trough, +scale.scale-has-marks-below.color trough { + border-color: @notebook_border; + border-radius: 5px; + background-repeat: no-repeat; } scale.vertical.scale-has-marks-below.color slider { @@ -800,14 +777,22 @@ scale.vertical.scale-has-marks-below.color slider { background-size: 100%; background-repeat: no-repeat; background-position: center; + margin: 0px 0px 0px 0px; } -scale.vertical.scale-has-marks-below.color slider:hover { - background-size: 105%; +scale.horizontal.scale-has-marks-above.color slider { + min-height: 14px; + min-width: 20px; + margin: 0px 0px 0px 0px; + padding: 5px 0px; + background-size: 100%; + background-repeat: no-repeat; + background-position: center; } -scale.vertical.fine-tune.scale-has-marks-below.color slider { - background-size: 90%; +scale.horizontal.scale-has-marks-above.color slider:hover, +scale.vertical.scale-has-marks-below.color slider:hover { + background-size: 105%; } /********** @@ -2067,7 +2052,7 @@ combobox entry.combo:nth-child(first) { inset 0px -1px shade(@button_border, 1.10); } - +combobox entry.combo:focus { box-shadow: inset 0px 3px alpha(#000, 0.03), inset 0px 2px alpha(#000, 0.05), inset 2px 0px alpha(#000, 0.04), -- cgit v1.2.1