From 12df321027dd4860350b6e63e99ac7efc0ff5467 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Fri, 12 Sep 2014 22:38:10 +0200 Subject: BlackMate, 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 --- .../BlackMATE/gtk-3.0/gtk-widgets-assets-dark.css | 30 +++--- desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css | 104 +++++++++++++++------ 2 files changed, 94 insertions(+), 40 deletions(-) diff --git a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets-assets-dark.css b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets-assets-dark.css index c0f9100e..72853c1c 100644 --- a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets-assets-dark.css +++ b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets-assets-dark.css @@ -7,7 +7,7 @@ .check, .check row:selected, .check row:selected:focus { - background-image: url("assets/checkbox-unchecked-dark.svg"); + -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.svg")); } .notebook .check, @@ -22,13 +22,15 @@ GtkTreeView.check row:selected:focus { .check:insensitive, .check row:selected:insensitive, .check row:selected:focus:insensitive { - background-image: url("assets/checkbox-unchecked-insensitive-dark.svg"); + -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.svg")); } +.check:checked, .check:active, +.check row:selected:checked, .check row:selected:active, .check row:selected:focus:active { - background-image: url("assets/checkbox-checked-dark.svg"); + -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.svg")); } .notebook .check:active, @@ -44,13 +46,13 @@ GtkTreeView.check row:selected:focus:active { .check row:selected:active:insensitive, .check row:selected:focus:active:insensitive { - background-image: url("assets/checkbox-checked-insensitive-dark.svg"); + -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.svg")); } .check:inconsistent, .check row:selected:inconsistent, .check row:selected:focus:inconsistent { - background-image: url("assets/checkbox-mixed-dark.svg"); + -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.svg")); } .notebook .check:inconsistent, @@ -65,13 +67,13 @@ GtkTreeView.check row:selected:focus:inconsistent { .check:inconsistent:insensitive, .check row:selected:inconsistent:insensitive, .check row:selected:focus:inconsistent:insensitive { - background-image: url("assets/checkbox-mixed-insensitive-dark.svg"); + -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.svg")); } .radio, .radio row:selected, .radio row:selected:focus { - background-image: url("assets/radio-unselected-dark.svg"); + -gtk-icon-source: -gtk-scaled(url("assets/radio-unselected-dark.svg")); } .notebook .radio, @@ -80,19 +82,21 @@ GtkTreeView.check row:selected:focus:inconsistent { GtkTreeView.radio, GtkTreeView.radio row:selected, GtkTreeView.radio row:selected:focus { - background-image: url("assets/radio-unselected-lessdark.svg"); + background-image: -gtk-scaled(url("assets/radio-unselected-lessdark.svg")); } .radio:insensitive, .radio row:selected:insensitive, .radio row:selected:focus:insensitive { - background-image: url("assets/radio-unselected-insensitive-dark.svg"); + -gtk-icon-source: -gtk-scaled(url("assets/radio-unselected-insensitive-dark.svg")); } +.radio:checked, .radio:active, +.radio row:selected:checked, .radio row:selected:active, .radio row:selected:focus:active { - background-image: url("assets/radio-selected-dark.svg"); + -gtk-icon-source: -gtk-scaled(url("assets/radio-selected-dark.svg")); } .notebook .radio:active, @@ -107,13 +111,13 @@ GtkTreeView.radio row:selected:focus:active { .radio:active:insensitive, .radio row:selected:active:insensitive, .radio row:selected:focus:active:insensitive { - background-image: url("assets/radio-selected-insensitive-dark.svg"); + -gtk-icon-source: -gtk-scaled(url("assets/radio-selected-insensitive-dark.svg")); } .radio:inconsistent, .radio row:selected:inconsistent, .radio row:selected:focus:inconsistent { - background-image: url("assets/radio-mixed-dark.svg"); + -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.svg")); } .notebook .radio:inconsistent, @@ -128,7 +132,7 @@ GtkTreeView.radio row:selected:focus:inconsistent { .radio:inconsistent:insensitive, .radio row:selected:inconsistent:insensitive, .radio row:selected:focus:inconsistent:insensitive { - background-image: url("assets/radio-mixed-insensitive-dark.svg"); + -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.svg")); } .sidebar .radio:active, diff --git a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css index fc839037..b19a87c1 100644 --- a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css @@ -2061,6 +2061,12 @@ GtkProgressBar.osd.progressbar { color: #747473; } +/**************************************************************************************** + * 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-color: @theme_bg_color; border-radius: 7px 7px 0 0; @@ -2069,9 +2075,10 @@ GtkProgressBar.osd.progressbar { background-color: @theme_bg_color; box-shadow: 0 0 0 2px @osd_button_shadow, 0 2px 8px 3px @osd_button_shadow; - /* this is used for the resize cursor area */ + * this is used for the resize cursor area margin: 10px; } +*/ /**************************** * Suggested action buttons * @@ -2337,32 +2344,75 @@ GtkColorSwatch.color-dark:selected:hover { background-image: none; } -/*************************** - * Radio and Check Buttons * - ***************************/ -.radio, -.check, -.radio:selected, -.check:selected, -.radio:selected:focus, -.check:selected:focus, -.cell.radio, -.cell.check, -.cell.radio:selected, -.cell.check:selected, -.cell.radio:selected:focus, -.cell.check:selected:focus { - background-color: transparent; - border-width: 0px; - border-style: none; -} - -.check:hover, -.check:selected:hover, -.radio:hover, -.radio:selected:hover { - 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("assets/checkbox-unchecked-dark.svg")); } + .check:hover { + color: #7f7f7f; } + .check:checked, .check:active { + -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.svg")); + color: #000; } + .check:checked:hover, .check:active:hover { + color: #7f7f7f; } + .check:checked:insensitive, .check:active:insensitive { + -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.svg")); + 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("assets/checkbox-mixed-dark.svg")); } + .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("assets/radio-unselected-dark.svg")); } + .radio:hover { + color: #7f7f7f; } + .radio:checked, .radio:active { + -gtk-icon-source: -gtk-scaled(url("assets/radio-selected-dark.svg")); + color: #000; } + .radio:checked:hover, .radio:active:hover { + color: #7f7f7f; } + .radio:checked:insensitive, .radio:active:insensitive { + -gtk-icon-source: -gtk-scaled(url("assets/radio-selected-insensitive-dark.svg")); + 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("assets/radio-mixed-dark.svg")); } + .radio:backdrop { + color: rgba(0, 0, 0, 0.1); } + .radio:backdrop:selected { + color: rgba(255, 255, 255, 0.1); } /***************** * GtkCheckButton * -- cgit v1.2.1