From f93b031a8afc2ad06acaeb5b59b48f855b2032cf Mon Sep 17 00:00:00 2001 From: raveit65 Date: Tue, 8 Mar 2016 23:03:29 +0100 Subject: GTK+-3.20 Traditional themes: fix GtkScale after gtk+-3.19.11 breakage --- .../TraditionalGreen/gtk-3.0/gtk-widgets.css | 140 +++++++++++++++++---- .../TraditionalOk/gtk-3.0/gtk-widgets.css | 140 +++++++++++++++++---- 2 files changed, 232 insertions(+), 48 deletions(-) diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css index a9b6890d..255a46e0 100644 --- a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css @@ -644,18 +644,28 @@ row:selected:focus progressbar trough { * GtkScale * ************/ -scale { -/* -GtkScale-slider-length: 21; - -GtkRange-slider-width: 13; - -GtkRange-trough-border: 4; */ +scale.vertical { + min-width: 10px; } -scale slider, -scale slider:hover, -scale slider:disabled { - border-radius: 0; - border-style: none; - background-color: transparent; +scale.horizontal { + min-height: 10px; +} + +scale.horizontal trough { + min-height: 4px; + margin: 8px 0; +} + +scale trough, +scale.vertical trough { + min-width: 4px; + margin: 0 6px; +} + +scale trough { + border-color: @scale_trough_border_color; + background-color: @scale_trough_bg_color; } scale trough, @@ -669,16 +679,6 @@ scale trough:disabled { background-image: none; } -scale trough { - margin: 8px 0; - border-color: @scale_trough_border_color; - background-color: @scale_trough_bg_color; -} - -scale.vertical trough { - margin: 0 8px; -} - scale trough highlight { border-color: @scale_trough_highlight_border_color; background-color: @scale_trough_highlight_bg_color; @@ -694,12 +694,104 @@ scale trough highlight:disabled { background-color: @scale_trough_highlight_insensitive_bg_color; } -scale progressbar { - background-color: @scale_progressbar_bg_color; +scale marks indicator { + color: @scale_mark_color; } -scale marks { - color: @scale_mark_color; +/* this makes marks visible */ +scale.horizontal indicator, +scale.horizontal.fine-tune indicator { + min-height: 8px; + min-width: 1px; +} + +scale.vertical indicator, +scale.vertical.fine-tune indicator { + min-height: 1px; + min-width: 8px; +} + +scale slider, +scale slider:hover, +scale slider:disabled { + border-radius: 0; + border-style: none; + background-color: transparent; +} + +scale.vertical slider, +scale.horizontal slider { + background-size: 80%; + background-repeat: no-repeat; + background-position: center; +} + +scale.horizontal slider { + min-width: 28px; + margin: -9px 0px -9px 0px; +} + +scale.vertical slider { + min-height: 30px; + margin: 0px -9px 0px -9px; +} + +scale.vertical.fine-tune slider:active, +scale.vertical.fine-tune slider:active:hover, +scale.horizontal.fine-tune slider:active, +scale.horizontal.fine-tune slider:hover:active { + background-size: 70%; +} + +scale.horizontal.scale-has-marks-above.color trough { + min-height: 10px; + margin: -5px 0px 0px 0px; + padding: 1px; +} + +scale.horizontal.scale-has-marks-above.color slider { + min-height: 30px; + min-width: 30px; + margin: -5px 0px -5px 0px; + padding: 5px 0px; + background-size: 105%; +} + +scale.vertical.scale-has-marks-below.color trough { + min-width: 0px; + padding: 5px; +} + +scale.vertical.scale-has-marks-below.color slider { + min-width: 18px; + padding: 3px; +} + +scale.horizontal contents:first-child:not(:only-child) slider { + background-repeat: no-repeat; + min-height: 22px; + background-size: 80%; +} + +scale.vertical.scale-has-marks-below.color slider:hover { + background-size: 85%; +} + +scale.vertical.fine-tune.scale-has-marks-below.color slider { + background-size: 75%; +} + +scale.horizontal.scale-has-marks-above.color slider:hover { + background-size: 110%; +} + +scale.horizontal.fine-tune.scale-has-marks-above.color slider { + background-size: 95%; +} + + +scale progressbar { + background-color: @scale_progressbar_bg_color; } /********** diff --git a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css index 8d251fce..b159fe56 100644 --- a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css @@ -645,18 +645,28 @@ row:selected:focus progressbar trough { * GtkScale * ************/ -scale { -/* -GtkScale-slider-length: 21; - -GtkRange-slider-width: 13; - -GtkRange-trough-border: 4; */ +scale.vertical { + min-width: 10px; } -scale slider, -scale slider:hover, -scale slider:disabled { - border-radius: 0; - border-style: none; - background-color: transparent; +scale.horizontal { + min-height: 10px; +} + +scale.horizontal trough { + min-height: 4px; + margin: 8px 0; +} + +scale trough, +scale.vertical trough { + min-width: 4px; + margin: 0 6px; +} + +scale trough { + border-color: @scale_trough_border_color; + background-color: @scale_trough_bg_color; } scale trough, @@ -670,16 +680,6 @@ scale trough:disabled { background-image: none; } -scale trough { - margin: 8px 0; - border-color: @scale_trough_border_color; - background-color: @scale_trough_bg_color; -} - -scale.vertical trough { - margin: 0 8px; -} - scale trough highlight { border-color: @scale_trough_highlight_border_color; background-color: @scale_trough_highlight_bg_color; @@ -695,12 +695,104 @@ scale trough highlight:disabled { background-color: @scale_trough_highlight_insensitive_bg_color; } -scale progressbar { - background-color: @scale_progressbar_bg_color; +scale marks indicator { + color: @scale_mark_color; } -scale marks { - color: @scale_mark_color; +/* this makes marks visible */ +scale.horizontal indicator, +scale.horizontal.fine-tune indicator { + min-height: 8px; + min-width: 1px; +} + +scale.vertical indicator, +scale.vertical.fine-tune indicator { + min-height: 1px; + min-width: 8px; +} + +scale slider, +scale slider:hover, +scale slider:disabled { + border-radius: 0; + border-style: none; + background-color: transparent; +} + +scale.vertical slider, +scale.horizontal slider { + background-size: 80%; + background-repeat: no-repeat; + background-position: center; +} + +scale.horizontal slider { + min-width: 28px; + margin: -9px 0px -9px 0px; +} + +scale.vertical slider { + min-height: 30px; + margin: 0px -9px 0px -9px; +} + +scale.vertical.fine-tune slider:active, +scale.vertical.fine-tune slider:active:hover, +scale.horizontal.fine-tune slider:active, +scale.horizontal.fine-tune slider:hover:active { + background-size: 70%; +} + +scale.horizontal.scale-has-marks-above.color trough { + min-height: 10px; + margin: -5px 0px 0px 0px; + padding: 1px; +} + +scale.horizontal.scale-has-marks-above.color slider { + min-height: 30px; + min-width: 30px; + margin: -5px 0px -5px 0px; + padding: 5px 0px; + background-size: 105%; +} + +scale.vertical.scale-has-marks-below.color trough { + min-width: 0px; + padding: 5px; +} + +scale.vertical.scale-has-marks-below.color slider { + min-width: 18px; + padding: 3px; +} + +scale.horizontal contents:first-child:not(:only-child) slider { + background-repeat: no-repeat; + min-height: 22px; + background-size: 80%; +} + +scale.vertical.scale-has-marks-below.color slider:hover { + background-size: 85%; +} + +scale.vertical.fine-tune.scale-has-marks-below.color slider { + background-size: 75%; +} + +scale.horizontal.scale-has-marks-above.color slider:hover { + background-size: 110%; +} + +scale.horizontal.fine-tune.scale-has-marks-above.color slider { + background-size: 95%; +} + + +scale progressbar { + background-color: @scale_progressbar_bg_color; } /********** -- cgit v1.2.1