From edc15e150a897dc9118afa57454ee6cae3d514aa Mon Sep 17 00:00:00 2001 From: raveit65 Date: Fri, 31 Oct 2014 15:27:30 +0100 Subject: BlackMate GTK3-3.14: next round of adjustments to new new :checked state in GTK3-3.14 --- .../BlackMATE/gtk-3.0/gtk-widgets-assets-dark.css | 87 +++++++++---- desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css | 139 ++++++++++----------- 2 files changed, 130 insertions(+), 96 deletions(-) (limited to 'desktop-themes/BlackMATE/gtk-3.0') 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 0069a2b9..47f7fc9c 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 @@ -16,7 +16,7 @@ GtkTreeView.check, GtkTreeView.check row:selected, GtkTreeView.check row:selected:focus { - background-image: url("assets/checkbox-unchecked-lessdark.svg"); + -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-lessdark.svg")); } .check:insensitive, @@ -29,19 +29,29 @@ GtkTreeView.check row:selected:focus { .check:active, .check row:selected:checked, .check row:selected:active, +.check row:selected:focus:checked, .check row:selected:focus:active { -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.svg")); } +.notebook .check:checked, +.notebook .check row:selected:checked, +.notebook .check row:selected:focus:checked, +GtkTreeView.check:checked, +GtkTreeView.check row:selected:checked, +GtkTreeView.check row:selected:focus:checked, .notebook .check:active, .notebook .check row:selected:active, .notebook .check row:selected:focus:active, GtkTreeView.check:active, GtkTreeView.check row:selected:active, GtkTreeView.check row:selected:focus:active { - background-image: url("assets/checkbox-checked-lessdark.svg"); + -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-lessdark.svg")); } +.check:checked:insensitive, +.check row:selected:checked:insensitive, +.check row:selected:focus:checked:insensitive, .check:active:insensitive, .check row:selected:active:insensitive, .check row:selected:focus:active:insensitive @@ -61,7 +71,7 @@ GtkTreeView.check row:selected:focus:active { GtkTreeView.check:inconsistent, GtkTreeView.check row:selected:inconsistent, GtkTreeView.check row:selected:focus:inconsistent { - background-image: url("assets/checkbox-mixed-lessdark.svg"); + -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-lessdark.svg")); } .check:inconsistent:insensitive, @@ -82,7 +92,7 @@ GtkTreeView.check row:selected:focus:inconsistent { GtkTreeView.radio, GtkTreeView.radio row:selected, GtkTreeView.radio row:selected:focus { - background-image: -gtk-scaled(url("assets/radio-unselected-lessdark.svg")); + -gtk-icon-source: -gtk-scaled(url("assets/radio-unselected-lessdark.svg")); } .radio:insensitive, @@ -95,19 +105,29 @@ GtkTreeView.radio row:selected:focus { .radio:active, .radio row:selected:checked, .radio row:selected:active, +.radio row:selected:focus:checked, .radio row:selected:focus:active { -gtk-icon-source: -gtk-scaled(url("assets/radio-selected-dark.svg")); } +.notebook .radio:checked, +.notebook .radio row:selected:checked, +.notebook .radio row:selected:focus:checked, +GtkTreeView.radio:checked, +GtkTreeView.radio row:selected:checked, +GtkTreeView.radio row:selected:focus:checked, .notebook .radio:active, .notebook .radio row:selected:active, .notebook .radio row:selected:focus:active, GtkTreeView.radio:active, GtkTreeView.radio row:selected:active, GtkTreeView.radio row:selected:focus:active { - background-image: url("assets/radio-selected-lessdark.svg"); + -gtk-icon-source: -gtk-scaled(url("assets/radio-selected-lessdark.svg")); } +.radio:checked:insensitive, +.radio row:selected:checked:insensitive, +.radio row:selected:focus:checked:insensitive, .radio:active:insensitive, .radio row:selected:active:insensitive, .radio row:selected:focus:active:insensitive { @@ -126,7 +146,7 @@ GtkTreeView.radio row:selected:focus:active { GtkTreeView.radio:inconsistent, GtkTreeView.radio row:selected:inconsistent, GtkTreeView.radio row:selected:focus:inconsistent { - background-image: url("assets/radio-mixed-lessdark.svg"); + -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-lessdark.svg")); } .radio:inconsistent:insensitive, @@ -135,24 +155,29 @@ GtkTreeView.radio row:selected:focus:inconsistent { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.svg")); } +.sidebar .radio:checked, +.sidebar .radio:checked:focus, +.sidebar .radio:checked:prelight, .sidebar .radio:active, .sidebar .radio:active:focus, .sidebar .radio:active:prelight { - background-image: url("assets/sidebar-radio-checked-dark.svg"); + -gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-checked-dark.svg")); } .sidebar .radio:prelight { - background-image: url("assets/sidebar-radio-prelight.svg"); + -gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-prelight.svg")); } +.sidebar .radio:checked:selected, +.sidebar .radio:checked:selected:focus, .sidebar .radio:active:selected, .sidebar .radio:active:selected:focus { - background-image: url("assets/sidebar-radio-selected-dark.svg"); + -gtk-icon-source: -url("assets/sidebar-radio-selected-dark.svg")); } .sidebar .radio:selected:prelight, .sidebar .radio:selected:focus { - background-image: url("assets/sidebar-radio-selected-prelight.svg"); + -gtk-icon-source: -gtk-scaled(url("assets/sidebar-radio-selected-prelight.svg")); } /* Now draw menu check and radio items */ @@ -169,52 +194,58 @@ GtkTreeView.radio row:selected:focus:inconsistent { border-image: none; } +.menuitem.radio:checked, .menuitem.radio:active { - background-image: url("assets/radio-menuitem-checked.svg"); + -gtk-icon-source: -url("assets/radio-menuitem-checked.svg")); } +.menuitem.radio:checked:hover, .menuitem.radio:active:hover { - background-image: url("assets/radio-menuitem-checked-prelight.svg"); + -gtk-icon-source: -url("assets/radio-menuitem-checked-prelight.svg")); } +.menuitem.radio:checked:insensitive, .menuitem.radio:active:insensitive { - background-image: url("assets/radio-menuitem-checked-insensitive.svg"); + -gtk-icon-source: -url("assets/radio-menuitem-checked-insensitive.svg")); } .menuitem.radio:inconsistent { - background-image: url("assets/radio-menuitem-mixed.svg"); + -gtk-icon-source: -url("assets/radio-menuitem-mixed.svg")); } .menuitem.radio:inconsistent:hover { - background-image: url("assets/radio-menuitem-mixed-prelight.svg"); + -gtk-icon-source: -url("assets/radio-menuitem-mixed-prelight.svg")); } .menuitem.radio:inconsistent:insensitive { - background-image: url("assets/radio-menuitem-mixed-insensitive.svg"); + -gtk-icon-source: -url("assets/radio-menuitem-mixed-insensitive.svg")); } +.menuitem.check:checked, .menuitem.check:active { - background-image: url("assets/checkbox-menuitem-checked.svg"); + -gtk-icon-source: -url("assets/checkbox-menuitem-checked.svg")); } +.menuitem.check:checked:hover, .menuitem.check:active:hover { - background-image: url("assets/checkbox-menuitem-checked-prelight.svg"); + -gtk-icon-source: -url("assets/checkbox-menuitem-checked-prelight.svg")); } +.menuitem.check:checked:insensitive, .menuitem.check:active:insensitive { - background-image: url("assets/checkbox-menuitem-checked-insensitive.svg"); + -gtk-icon-source: -url("assets/checkbox-menuitem-checked-insensitive.svg")); } .menuitem.check:inconsistent { - background-image: url("assets/checkbox-menuitem-mixed.svg"); + -gtk-icon-source: -url("assets/checkbox-menuitem-mixed.svg")); } .menuitem.check:inconsistent:hover { - background-image: url("assets/checkbox-menuitem-mixed-prelight.svg"); + -gtk-icon-source: -url("assets/checkbox-menuitem-mixed-prelight.svg")); } .menuitem.check:inconsistent:insensitive { - background-image: url("assets/checkbox-menuitem-mixed-insensitive.svg"); + -gtk-icon-source: -url("assets/checkbox-menuitem-mixed-insensitive.svg")); } /*********** @@ -225,9 +256,13 @@ GtkTreeView.radio row:selected:focus:inconsistent { border-image: url("assets/entry-border-focused-dark.svg") 3 / 3px stretch; }*/ +.primary-toolbar GtkComboBox.combobox-entry .button:checked, +.primary-toolbar GtkComboBox.combobox-entry .button:hover:checked, .primary-toolbar GtkComboBox.combobox-entry .button:active, .primary-toolbar GtkComboBox.combobox-entry .button:hover:active, .primary-toolbar GtkComboBox.combobox-entry .button, +GtkComboBox.combobox-entry .button:checked, +GtkComboBox.combobox-entry .button:hover:checked, GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:hover:active, GtkComboBox.combobox-entry .button { @@ -311,6 +346,8 @@ background-image: url("assets/resize-grip.svg"); border-image: url("assets/button-border-dark.svg") 3 / 3px stretch; } +.button:checked, +.button:hover:checked, .button:active, .button:hover:active { border-image: url("assets/button-active-border-dark.svg") 3 / 3px stretch; @@ -321,11 +358,17 @@ background-image: url("assets/resize-grip.svg"); border-image: url("assets/button-default-border-dark.svg") 3 / 3px stretch; } +.button.default:checked, +.notebook .button.default:checked, .button.default:active, .notebook .button.default:active { border-image: url("assets/button-default-active-border-dark.svg") 3 / 3px stretch; } +.toolbar .button:checked, +.primary-toolbar .button:checked, +.primary-toolbar .toolbar .button:checked, +.primary-toolbar.toolbar .button:checked, .toolbar .button:active, .primary-toolbar .button:active, .primary-toolbar .toolbar .button:active, diff --git a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css index d1ff59cd..b6eee7d5 100644 --- a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css @@ -1619,6 +1619,10 @@ GtkMenuButton .menu { background-color: @theme_bg_color; } +.toolbar .button:checked, +.primary-toolbar .button:checked, +.primary-toolbar .toolbar .button:checked, +.primary-toolbar.toolbar .button:checked, .toolbar .button:active, .primary-toolbar .button:active, .primary-toolbar .toolbar .button:active, @@ -1637,6 +1641,10 @@ GtkMenuButton .menu { to (shade(@button_gradient_color_b, 0.7))); } +.toolbar .button:checked:hover, +.primary-toolbar .button:checked:hover, +.primary-toolbar .toolbar .button:checked:hover, +.primary-toolbar.toolbar .button:checked:hover, .toolbar .button:active:hover, .primary-toolbar .button:active:hover, .primary-toolbar .toolbar .button:active:hover, @@ -1652,6 +1660,10 @@ GtkMenuButton .menu { @button_hover_gradient_color_b); } +.toolbar .button:checked:insensitive, +.primary-toolbar .button:checked:insensitive, +.primary-toolbar .toolbar .button:checked:insensitive, +.primary-toolbar.toolbar .button:checked:insensitive, .toolbar .button:active:insensitive, .primary-toolbar .button:active:insensitive, .primary-toolbar .toolbar .button:active:insensitive, @@ -1743,8 +1755,10 @@ GtkOverlay.osd { } .osd.button, +.osd.button:checked, .osd.button:active, .osd .button, +.osd .button:checked, .osd .button:active { border-width: 1px; border-style: solid; @@ -1767,9 +1781,11 @@ GtkOverlay.osd { .osd.button, .osd.button:prelight, +.osd.button:checked, .osd.button:active, .osd .button, .osd .button:prelight, +.osd .button:checked, .osd .button:active { background-color: transparent; } @@ -1780,6 +1796,8 @@ GtkOverlay.osd { background-color: @osd_button_bg_insensitive; } +.osd.button:checked:insensitive, +.osd .button:checked:insensitive, .osd.button:active:insensitive, .osd .button:active:insensitive { background-image: none; @@ -1791,14 +1809,18 @@ GtkOverlay.osd { color: @osd_button_fg_hover; } +.osd .button:checked, +.osd .button:hover:checked, .osd .button:active, .osd .button:hover:active { color: @osd_button_fg_active; } .osd.button:insensitive, +.osd.button:insensitive:checked, .osd.button:insensitive:active, .osd .button:insensitive, +.osd .button:checked *:insensitive, .osd .button:active *:insensitive { color: @osd_button_fg_insensitive; } @@ -1811,6 +1833,11 @@ GtkOverlay.osd { @osd_button_bg_hover_c); } +.osd.button:checked, +.osd.button:checked:hover, +.osd .button:checked, +.osd .button:checked:hover, +.osd GtkMenuButton.button:checked, .osd.button:active, .osd.button:active:hover, .osd .button:active, @@ -1822,11 +1849,13 @@ GtkOverlay.osd { @osd_button_bg_active_c); } +.osd GtkMenuButton.button:checked, .osd GtkMenuButton.button:active { background-color: transparent; border-color: @osd_button_border; } +.osd GtkMenuButton.button:checked, .osd GtkMenuButton.button:active { color: @osd_button_fg_active; text-shadow: 0 -1px @osd_button_shadow; @@ -2056,11 +2085,13 @@ 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. * - ****************************************************************************************/ +/******************************************************** + * Give and take related to recent gtk3velopment, * + * 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. * + * same affect in mate-panel main menu GTK3 too !!!!! * + ********************************************************/ /* .window-frame { border-color: @theme_bg_color; @@ -2339,75 +2370,32 @@ GtkColorSwatch.color-dark:selected:hover { background-image: none; } -/***************************************************************************************************** - * 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); } +/*************************** + * 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; +} /***************** * GtkCheckButton * @@ -2592,16 +2580,19 @@ GtkInfoBar { .info .entry:focus, .info .button, .info .button:insensitive, +.info .button:checked, .info .button:active, .warning .entry, .warning .entry:focus, .warning .button, .warning .button:insensitive, +.warning .button:checked, .warning .button:active, .error .entry, .error .entry:focus, .error .button, .error .button:insensitive, +.error .button:checked, .error .button:active { border-image: none; border-style: none; -- cgit v1.2.1