From a19465c63bc4905abaadd80c98fdf044f81f5070 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Fri, 12 Sep 2014 22:47:56 +0200 Subject: TraditionalOk, GTK3-3.14: adjust to GTK3-3.13 changes https://git.gnome.org/browse/gtk+/commit/?id=4e077d4638b4ecfaf67afbab5082b9d47499af4f https://bugzilla.redhat.com/show_bug.cgi?id=1136994 - GtkCheckButton - GtkRadioButton --- .../TraditionalOk/gtk-3.0/gtk-widgets-img.css | 32 ++++--- .../TraditionalOk/gtk-3.0/gtk-widgets.css | 105 ++++++++++++++++----- 2 files changed, 99 insertions(+), 38 deletions(-) diff --git a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets-img.css b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets-img.css index eeff8574..6292fc81 100644 --- a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets-img.css +++ b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets-img.css @@ -94,7 +94,8 @@ GtkSwitch.slider:insensitive { .check, .check row:selected, .check row:selected:focus { - background-image: url("img/checkbox-unchecked.png"); + background-image: none; + -gtk-icon-source: -gtk-scaled(url("img/checkbox-unchecked.png")); } .check:hover, @@ -106,13 +107,15 @@ GtkSwitch.slider:insensitive { .check:insensitive, .check row:selected:insensitive, .check row:selected:focus:insensitive { - background-image: url("img/checkbox-unchecked-insensitive.png"); + -gtk-icon-source: -gtk-scaled(url("img/checkbox-unchecked-insensitive.png")); } +.check:checked, .check:active, +.check row:selected:checked, .check row:selected:active, .check row:selected:focus:active { - background-image: url("img/checkbox-checked.png"); + -gtk-icon-source: -gtk-scaled(url("img/checkbox-checked.png")); } .check:active:hover, @@ -121,16 +124,17 @@ GtkSwitch.slider:insensitive { background-image: url("img/checkbox-checked-hover.png"); } +.check:checked:insensitive, .check:active:insensitive, .check row:selected:active:insensitive, .check row:selected:focus:active:insensitive { - background-image: url("img/checkbox-checked-insensitive.png"); + -gtk-icon-source: -gtk-scaled(url("img/checkbox-checked-insensitive.png")); } .check:inconsistent, .check row:selected:inconsistent, .check row:selected:focus:inconsistent { - background-image: url("img/checkbox-mixed.png"); + -gtk-icon-source: -gtk-scaled(url("img/checkbox-mixed.png")); } .check:inconsistent:hover, @@ -142,13 +146,14 @@ GtkSwitch.slider:insensitive { .check:inconsistent:insensitive, .check row:selected:inconsistent:insensitive, .check row:selected:focus:inconsistent:insensitive { - background-image: url("img/checkbox-mixed-insensitive.png"); + -gtk-icon-source: -gtk-scaled(url("img/checkbox-mixed-insensitive.png")); } .radio, .radio row:selected, .radio row:selected:focus { - background-image: url("img/radio-unchecked.png"); + background-image: none; + -gtk-icon-source: -gtk-scaled(url("img/radio-unchecked.png")); } .radio:hover, @@ -160,13 +165,15 @@ GtkSwitch.slider:insensitive { .radio:insensitive, .radio row:selected:insensitive, .radio row:selected:focus:insensitive { - background-image: url("img/radio-unchecked-insensitive.png"); + -gtk-icon-source: -gtk-scaled(url("img/radio-unchecked-insensitive.png")); } +.radio:checked, .radio:active, +.radio row:selected:checked, .radio row:selected:active, .radio row:selected:focus:active { - background-image: url("img/radio-checked.png"); + -gtk-icon-source: -gtk-scaled(url("img/radio-checked.png")); } .radio:active:hover, @@ -175,16 +182,17 @@ GtkSwitch.slider:insensitive { background-image: url("img/radio-checked-hover.png"); } +.radio:checked:insensitive, .radio:active:insensitive, .radio row:selected:active:insensitive, .radio row:selected:focus:active:insensitive { - background-image: url("img/radio-checked-insensitive.png"); + -gtk-icon-source: -gtk-scaled(url("img/radio-checked-insensitive.png")); } .radio:inconsistent, .radio row:selected:inconsistent, .radio row:selected:focus:inconsistent { - background-image: url("img/radio-mixed.png"); + -gtk-icon-source: -gtk-scaled(url("img/radio-mixed.png")); } .radio:inconsistent:hover, @@ -196,7 +204,7 @@ GtkSwitch.slider:insensitive { .radio:inconsistent:insensitive, .radio row:selected:inconsistent:insensitive, .radio row:selected:focus:inconsistent:insensitive { - background-image: url("img/radio-mixed-insensitive.png"); + -gtk-icon-source: -gtk-scaled(url("img/radio-mixed-insensitive.png")); } /********************* diff --git a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css index a2bad583..2406d77e 100644 --- a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css @@ -1240,29 +1240,75 @@ GtkTreeMenu .menuitem *:hover, border-style: solid; } -/**************** - * Radiobuttons * - ****************/ - -.check, -.radio, -.check:insensitive, -.radio:insensitive { - background-color: transparent; - border-style: none; -} - -.check row:selected:insensitive, -.check row:selected:focus:insensitive { - background-color: transparent; -} - -GtkCheckButton:hover, -GtkCheckButton:active:hover, -GtkCheckButton:selected, -GtkCheckButton:selected:focus { - background-color: transparent; -} +/***************************************************************************************************** + * Check and Radio items * + * Related to recent gtk3 development, to reveal checkboxes as part of the dialogue * + * of some of the applications whose notification icons appear in the system tray * + * the reference section of the HighContrast theme is used. * + * https://git.gnome.org/browse/gnome-themes-standard/tree/themes/HighContrast/gtk-3.0/gtk.css#n1398 * + *****************************************************************************************************/ + +GtkCheckButton.text-button, GtkRadioButton.text-button { + padding: 1px; + outline-offset: 0; } + +.check { + color: rgba(0, 0, 0, 0.1); + background-image: none; + -gtk-icon-source: -gtk-scaled(url("img/checkbox-unchecked.png")); } + .check:hover { + color: #7f7f7f; } + .check:checked, .check:active { + -gtk-icon-source: -gtk-scaled(url("img/checkbox-checked.png")); + color: #000; } + .check:checked:hover, .check:active:hover { + color: #7f7f7f; } + .check:checked:insensitive, .check:active:insensitive { + -gtk-icon-source: -gtk-scaled(url("img/checkbox-checked-insensitive.png")); + color: #7f7f7f; } + .check:checked:insensitive:backdrop, .check:active:insensitive:backdrop { + color: #7f7f7f; } + .check:checked:backdrop, .check:active:backdrop { + color: #000; } + .check:insensitive { + color: rgba(127, 127, 127, 0.1); } + .check:insensitive:backdrop { + color: transparent; } + .check:inconsistent { + -gtk-icon-source: -gtk-scaled(url("img/checkbox-mixed.png")); } + .check:backdrop { + color: rgba(0, 0, 0, 0.1); } + .check:backdrop:selected { + color: rgba(255, 255, 255, 0.1); } + +.radio { + color: rgba(0, 0, 0, 0.1); + background-image: none; + -gtk-icon-source: -gtk-scaled(url("img/radio-unchecked.png")); } + .radio:hover { + color: #7f7f7f; } + .radio:checked, .radio:active { + -gtk-icon-source: -gtk-scaled(url("img/radio-checked.png")); + color: #000; } + .radio:checked:hover, .radio:active:hover { + color: #7f7f7f; } + .radio:checked:insensitive, .radio:active:insensitive { + -gtk-icon-source: -gtk-scaled(url("img/radio-checked-insensitive.png")); + color: #7f7f7f; } + .radio:checked:insensitive:backdrop, .radio:active:insensitive:backdrop { + color: #7f7f7f; } + .radio:checked:backdrop, .radio:active:backdrop { + color: #000; } + .radio:insensitive { + color: rgba(127, 127, 127, 0.1); } + .radio:insensitive:backdrop { + color: transparent; } + .radio:inconsistent { + -gtk-icon-source: -gtk-scaled(url("img/radio-mixed.png")); } + .radio:backdrop { + color: rgba(0, 0, 0, 0.1); } + .radio:backdrop:selected { + color: rgba(255, 255, 255, 0.1); } /************ * Toolbars * @@ -1788,7 +1834,7 @@ GtkInfoBar:last-child, border-color: shade(@border_color, 1.30); color: @theme_selected_fg_color; font: Bold 10; - text-shadow: 1px 1px 1px 1px @theme_fg_color; + text-shadow: 1px 1px @theme_fg_color; } /* Colour when unfocused? */ @@ -1848,20 +1894,27 @@ GtkInfoBar:last-child, icon-shadow: none; } +/**************************************************************************************** + * Give and take related to recent gtk3 development, * + * to achieve full size of the icon menu of some of the applications whose notification * + * icons appear in the system tray, the "shadow" is disabled. * + ****************************************************************************************/ +/* .window-frame { border-width: 1px; border-radius: 7px 7px 0 0; border-style: solid; background-color: @theme_bg_color; -/* dummy to avoid resizing mate-appearence-properties if theme changed */ + * dummy to avoid resizing mate-appearence-properties if theme changed box-shadow: 0px 0px 0px 0px; margin: 10px; } .window-frame:backdrop { -/* dummy to avoid resizing mate-appearence-properties if theme changed */ + * dummy to avoid resizing mate-appearence-properties if theme changed box-shadow: 0 0 0 2px @insensitive_text_shadow_color, 0 2px 5px 1px @insensitive_text_shadow_color; } +*/ /************ * Popovers * -- cgit v1.2.1