From 92c0d9c434db3f69b1dbea17603592d65afcf038 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Tue, 15 Mar 2016 14:27:22 +0100 Subject: GTK+-3.20 Menta themes: fix combobox, spinbutton and switch in list rows - this make elements in cinnamon-setting visible - remove more obsoletes settings in Menta theme --- .../BlueMenta/gtk-3.0/gtk-widgets-backgrounds.css | 15 +- .../BlueMenta/gtk-3.0/gtk-widgets-borders.css | 31 ++-- desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css | 191 ++++++++++----------- .../BlueMenta/gtk-3.0/other-applications.css | 24 +++ 4 files changed, 132 insertions(+), 129 deletions(-) (limited to 'desktop-themes/BlueMenta') diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-backgrounds.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-backgrounds.css index e1fdfbc2..ee1409a2 100644 --- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-backgrounds.css +++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-backgrounds.css @@ -1,5 +1,7 @@ /* Button background */ button, +combobox button.combo, +combobox button.combo:backdrop, toolbar .raised button, toolbar combobox button.combo, toolbar.primary-toolbar .linked button, @@ -161,10 +163,9 @@ toolbar combobox button.combo:checked:disabled, /* Entry background */ entry, -combobox entry button, -combobox entry button:hover, -toolbar.primary-toolbar combobox entry button, -toolbar.primary-toolbar combobox entry button:hover, +combobox button.combo:hover, +toolbar.primary-toolbar combobox entry.combo, +toolbar.primary-toolbar combobox button.combo:hover, levelbar trough, .entry, GtkComboBox.combobox-entry .button, @@ -180,8 +181,8 @@ GtkComboBox.combobox-entry .button:hover, } /* Entry pushed button background */ -toolbar.primary-toolbar combobox entry button:checked, -combobox entry button:checked, +toolbar.primary-toolbar combobox button.combo:checked, +combobox button.combo:checked, .primary-toolbar GtkComboBox.combobox-entry .button:active, .primary-toolbar GtkComboBox.combobox-entry .button:checked, /* .primary-toolbar GtkComboBox.combobox-entry .button:hover:active,*/ @@ -245,7 +246,7 @@ column-header .button:active:hover { /* Insensitive entry background */ entry:disabled, -combobox entry button:disabled, +combobox button.combo:disabled, levelbar trough:disabled, .entry:disabled, GtkComboBox.combobox-entry .button:disabled, diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css index 887fbe88..c1f5a0a4 100644 --- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css +++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css @@ -3,8 +3,6 @@ /* generic element borders (checked)*/ entry, button:checked, -combobox entry entry, -combobox entry button, toolbar.inline-toolbar.vertical button:checked, .entry, .button:active, @@ -13,7 +11,7 @@ GtkComboBox.combobox-entry .entry, GtkComboBox.combobox-entry .button, .inline-toolbar.toolbar.vertical .button:active, .inline-toolbar.toolbar.vertical .button:checked { - border-image: url("borders/button-active.png") 3 4 4 4 / 3px 4px 4px 4px stretch; + border-image: url("borders/button-active.png") 3 4 5 4 / 3px 4px 5px 4px stretch; border-radius: 4px; border-width: 2px; border-style: solid; @@ -29,8 +27,8 @@ trough highlight, entry:disabled, button:checked:disabled, -combobox entry entry:disabled, -combobox entry button:disabled, +combobox entry.combo:disabled, +combobox button.combo:disabled, toolbar.inline-toolbar.vertical button:disabled, toolbar.inline-toolbar.vertical button.default:disabled, .entry:disabled, @@ -39,7 +37,7 @@ GtkComboBox.combobox-entry .entry:disabled, GtkComboBox.combobox-entry .button:disabled, .inline-toolbar.toolbar.vertical .button:disabled, .inline-toolbar.toolbar.vertical .button.default:disabled { - border-image: url("borders/button-active-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch; + border-image: url("borders/button-active-ins.png") 3 4 5 4 / 3px 4px 5px 4px stretch; border-radius: 4px; border-width: 2px; border-style: solid; @@ -58,7 +56,7 @@ toolbar.inline-toolbar.vertical button.default:disabled, .inline-toolbar.toolbar .button.default:disabled, .inline-toolbar.toolbar.vertical .button:disabled, .inline-toolbar.toolbar.vertical .button.default:disabled { - border-image: url("borders/button-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch; + border-image: url("borders/button-ins.png") 3 4 5 4 / 3px 4px 5px 4px stretch; border-radius: 4px; border-width: 2px; border-style: solid; @@ -78,7 +76,7 @@ row trough, entry:focus, button:checked:focus, button.default:checked, -combobox entry button:focus, +combobox button.combo:focus, toolbar.inline-toolbar.vertical button:focus:checked, toolbar.inline-toolbar.vertical button.default:checked, .entry:focus, @@ -91,7 +89,7 @@ GtkComboBox.combobox-entry .button:focus, .inline-toolbar.toolbar.vertical .button:checked:focus .inline-toolbar.toolbar.vertical .button.default:active, .inline-toolbar.toolbar.vertical .button.default:checked { - border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch; + border-image: url("borders/button-active-focus.png") 3 4 5 4 / 3px 4px 5px 4px stretch; border-radius: 4px; border-width: 2px; border-style: solid; @@ -106,7 +104,7 @@ GtkComboBox.combobox-entry .button:focus, .titlebar .titlebutton:hover, .titlebar .titlebutton:active, .titlebar .button:checked:checked { - border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch; + border-image: url("borders/button-active-focus.png") 3 4 5 4 / 3px 4px 5px 4px stretch; border-radius: 4px; border-width: 2px; border-style: solid; @@ -114,6 +112,8 @@ GtkComboBox.combobox-entry .button:focus, } button, +combobox entry.combo, +combobox button.combo, .button { border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch; border-radius: 4px; @@ -135,7 +135,7 @@ toolbar.inline-toolbar.vertical button, button.default, button:focus, .button.default, -.button:focus { +.button:focus { border-image: url("borders/button-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch; border-radius: 4px; border-width: 2px; @@ -227,7 +227,7 @@ toolbar.primary-toolbar .raised button:disabled, toolbar.primary-toolbar .raised button.default:disabled, toolbar.primary-toolbar switch trough:disabled, toolbar.primary-toolbar switch trough:checked:disabled, -toolbar.primary-toolbar combobox button:disabled, +toolbar.primary-toolbar combobox button.combo:disabled, .primary-toolbar .button.raised:disabled, .primary-toolbar .raised .button:disabled, .primary-toolbar .button.raised.default:disabled, @@ -257,7 +257,6 @@ toolbar.inline-toolbar button.default:checked, .primary-toolbar .button.raised.default:active, .primary-toolbar .raised .button.default:active, .inline-toolbar.toolbar .button.default:active { - /*border-image: url("borders/primary-toolbar-generic-border-focused.png") 4 / 4px stretch;*/ border-image: url("borders/button-active-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch; border-radius: 3px; border-width: 2px; @@ -379,7 +378,7 @@ column-header:last-child .button:checked:hover { border-right-width: 0; } -treeview header button:focus +treeview header button:focus, column-header.button:focus, column-header .button:focus { border-image: linear-gradient(to top, @@ -391,7 +390,7 @@ column-header .button:focus { /* pushed colored buttons borders */ toolbar.selection-mode button.suggested-action, -toolbar.selection-mode GtkToolButton.suggested-action button, +toolbar.selection-mode toolbutton button.suggested-action, .selection-mode.toolbar .suggested-action.button, .selection-mode.toolbar GtkToolButton.suggested-action .button { border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch; @@ -405,7 +404,6 @@ toolbar.selection-mode GtkToolButton.suggested-action button, /* suggested action buttons borders */ button.suggested-action, button.suggested-action:checked, -button.suggested-action:active, .suggested-action.button, .suggested-action.button:checked, .suggested-action.button:active { @@ -420,7 +418,6 @@ button.suggested-action:active, /* destructive action buttons borders */ button.destructive-action, button.destructive-action:checked, -button.destructive-action:active, .destructive-action.button, .destructive-action.button:checked, .destructive-action.button:active { diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css index a2aa7448..45805457 100644 --- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css @@ -137,7 +137,8 @@ tooltip.background { } tooltip decoration { - background-color: transparent; + background-color: alpha(shade(@theme_selected_bg_color, 1.0), 0.4); + border-radius: 4px; } tooltip * { @@ -549,7 +550,12 @@ spinbutton button, spinbutton button:focus, spinbutton button:active, spinbutton button:focus:active, -spinbutton button:disabled { +spinbutton button:disabled, +row.activatable spinbutton button, +row.activatable spinbutton button:focus, +row.activatable spinbutton button:active, +row.activatable spinbutton button:focus:active, +row.activatable spinbutton button:disabled { border-style: none; border-image: none; padding: 5px; @@ -558,7 +564,9 @@ spinbutton button:disabled { } spinbutton button, -spinbutton button:focus { +spinbutton button:focus, +row.activatable spinbutton button, +row.activatable spinbutton button:focus { background-image: linear-gradient(to bottom, @button_gradient_color_a, @button_gradient_color_b); @@ -566,7 +574,8 @@ spinbutton button:focus { color: @internal_element_color; } -spinbutton button:hover { +spinbutton button:hover, +row.activatable spinbutton button:hover { background-color: transparent; background-image: linear-gradient(to bottom, @button_hover_gradient_color_a, @@ -574,8 +583,9 @@ spinbutton button:hover { color: @internal_element_prelight; } -spinbutton button:active, -spinbutton button:hover:active { +spinbutton button:checked, +spinbutton button:hover:active, +row.activatable spinbutton button:checked { background-image: linear-gradient(to bottom, @button_active_gradient_color_a, @button_active_gradient_color_b); @@ -587,11 +597,13 @@ spinbutton button:disabled { color: @internal_element_insensitive; } -spinbutton button:first-child { +spinbutton button:first-child, +row.activatable spinbutton button { border-radius: 0px; } -spinbutton button:last-child { +spinbutton button:last-child, +row.activatable spinbutton button { border-radius: 0 3px 3px 0; } @@ -601,6 +613,8 @@ spinbutton button:dir(rtl) { spinbutton.horizontal entry, spinbutton.horizontal entry:focus, +row.activatable spinbutton.horizontal entry, +row.activatable spinbutton.horizontal entry:focus, stack box.vertical.linked spinbutton.horizontal entry, stack box.vertical.linked spinbutton.horizontal entry:focus { padding: 5px 10px 5px 4px; @@ -611,6 +625,8 @@ stack box.vertical.linked spinbutton.horizontal entry:focus { spinbutton.horizontal button, spinbutton.horizontal button:focus, +row.activatable spinbutton.horizontal button, +row.activatable spinbutton.horizontal button:focus, stack box.vertical.linked spinbutton.horizontal button, stack box.vertical.linked spinbutton.horizontal button:focus { padding: 0px 6px 0px 6px; @@ -1340,6 +1356,7 @@ toolbar.inline-toolbar button:disabled, /* Set up shadows and hilights for button visual separation */ .linked entry, +.linked entry:backdrop, .linked .entry { box-shadow: inset -1px 0 @inset_dark_color; } @@ -1374,7 +1391,7 @@ toolbar.inline-toolbar button:disabled, /* Set up shadows and hilights for button visual separation */ .linked button, -.linked combobox button.combo, +.linked > combobox button.combo, toolbar .raised.linked button, toolbar.inline-toolbar button, toolbar.inline-toolbar toolbutton > button, @@ -1387,7 +1404,7 @@ toolbar.inline-toolbar toolbutton > button, } .linked button:first-child, -.linked combobox:first-child button.combo:first-child, +.linked > combobox:first-child button.combo:first-child, toolbar .raised.linked button:first-child, toolbar.inline-toolbar button:first-child, toolbar.inline-toolbar toolbutton > button:first-child, @@ -1400,7 +1417,7 @@ toolbar.inline-toolbar toolbutton > button:first-child, } .linked button:last-child, -.linked combobox:last-child button.combo:last-child, +.linked > combobox:last-child button.combo:last-child, toolbar .raised.linked button:last-child, toolbar.inline-toolbar button:last-child, toolbar.inline-toolbar toolbutton > button:last-child, @@ -1413,7 +1430,7 @@ toolbar.inline-toolbar toolbutton > button:last-child, } .linked button:checked, -.linked combobox button.combo:checked, +.linked > combobox button.combo:checked, toolbar .raised.linked button:checked, toolbar.inline-toolbar button:checked, toolbar.inline-toolbar toolbutton > button:checked, @@ -1431,7 +1448,7 @@ toolbar.inline-toolbar toolbutton > button:checked, } .linked button:disabled, -.linked combobox button.combo:disabled, +.linked > combobox button.combo:disabled, toolbar .raised.linked button:disabled, toolbar.inline-toolbar button:disabled, toolbar.inline-toolbar toolbutton > button:disabled, @@ -1496,9 +1513,11 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked, /* Middle button */ .linked entry, +.linked entry:backdrop, .linked > combobox > button.combo, .linked > combobox > button.combo:focus, .linked > combobox > button.combo:disabled, +.linked > combobox > button.combo:backdrop, .linked > combobox > button.combo:focus:active, .linked > combobox > button.combo:checked, .linked > combobox > button.combo:focus:active, @@ -1539,9 +1558,11 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked, /* Leftmost button */ .linked entry:first-child, +.linked entry:backdrop:first-child, .linked > combobox:first-child > button.combo:first-child, .linked > combobox:first-child > button.combo:focus:first-child, .linked > combobox:first-child > button.combo:disabled:first-child, +.linked > combobox:first-child > button.combo:backdrop:first-child, .linked > combobox:first-child > button.combo:focus:active:first-child, .linked > combobox:first-child > button.combo:checked:first-child, .linked > combobox:first-child > button.combo:focus:checked:first-child, @@ -1579,9 +1600,11 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked, /* Rightmost button */ .linked entry:last-child, -.linked > combobox:last-child > button.combo, +.linked entry:backdrop:last-child, .linked > combobox:last-child > button.combo:last-child, +.linked > combobox:last-child > button.combo:focus:last-child, .linked > combobox:last-child > button.combo:disabled:last-child, +.linked > combobox:last-child > button.combo:backdrop:last-child, .linked > combobox:last-child > button.combo:focus:active:last-child, .linked > combobox:last-child > button.combo:checked:last-child, .linked > combobox:last-child > button.combo:focus:checked:last-child, @@ -1619,9 +1642,11 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked, /* Linked single button */ .linked entry:only-child, -.linked > combobox:only-child > button.combo, +.linked entry:backdrop:only-child, .linked > combobox:only-child > button.combo:only-child, +.linked > combobox:only-child > button.combo:focus:only-child, .linked > combobox:only-child > button.combo:disabled:only-child, +.linked > combobox:only-child > button.combo:backdrop:only-child, .linked > combobox:only-child > button.combo:hover:only-child, .linked > combobox:only-child > button.combo:hover:active:only-child, .linked > combobox:only-child > button.combo:focus:active:only-child, @@ -1660,6 +1685,7 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked, .linked.vertical > combobox > button.combo, .linked.vertical > combobox > button.combo:focus, .linked.vertical > combobox > button.combo:disabled, +.linked.vertical > combobox > button.combo:backdrop, .linked.vertical > combobox > button.combo:focus:active, .linked.vertical > combobox > button.combo:checked, .linked.vertical > combobox > button.combo:focus:checked, @@ -1667,6 +1693,7 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked, .linked.vertical > combobox > button.combo:hover:active, .linked.vertical > combobox > button.combo:checked:hover, .linked.vertical entry, +.linked.vertical entry:backdrop, .linked.vertical button, .linked.vertical button:hover:active, .linked.vertical button:checked, @@ -1698,6 +1725,7 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked, .linked.vertical > combobox:first-child > button.combo:first-child, .linked.vertical > combobox:first-child > button.combo:focus:first-child, .linked.vertical > combobox:first-child > button.combo:disabled:first-child, +.linked.vertical > combobox:first-child > button.combo:backdrop:first-child, .linked.vertical > combobox:first-child > button.combo:focus:active:first-child, .linked.vertical > combobox:first-child > button.combo:checked:first-child, .linked.vertical > combobox:first-child > button.combo:focus:checked:first-child, @@ -1705,6 +1733,7 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked, .linked.vertical > combobox:first-child > button.combo:hover:active:first-child, .linked.vertical > combobox:first-child > button.combo:checked:hover:first-child, .linked.vertical entry:first-child, +.linked.vertical entry:backdrop:first-child, .linked.vertical button:first-child, .linked.vertical button:hover:active:first-child, .linked.vertical button:checked:first-child, @@ -1733,9 +1762,10 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked, } /* Bottom button (vertical) */ -.linked.vertical > combobox:last-child > button.combo, .linked.vertical > combobox:last-child > button.combo:last-child, +.linked.vertical > combobox:last-child > button.combo:focus:last-child, .linked.vertical > combobox:last-child > button.combo:disabled:last-child, +.linked.vertical > combobox:last-child > button.combo:backdrop:last-child, .linked.vertical > combobox:last-child > button.combo:focus:active:last-child, .linked.vertical > combobox:last-child > button.combo:checked:last-child, .linked.vertical > combobox:last-child > button.combo:focus:checked:last-child, @@ -1743,6 +1773,7 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked, .linked.vertical > combobox:last-child > button.combo:hover:active:last-child, .linked.vertical > combobox:last-child > button.combo:checked:hover:last-child, .linked.vertical entry:last-child, +.linked.vertical entry:backdrop:last-child, .linked.vertical button:last-child, .linked.vertical button:hover:active:last-child, .linked.vertical button:checked:last-child, @@ -1771,9 +1802,10 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked, } /* Linked single button (vertical) */ -.linked.vertical > combobox:only-child > button.combo, .linked.vertical > combobox:only-child > button.combo:only-child, +.linked.vertical > combobox:only-child > button.combo:focus:only-child, .linked.vertical > combobox:only-child > button.combo:disabled:only-child, +.linked.vertical > combobox:only-child > button.combo:backdrop:only-child, .linked.vertical > combobox:only-child > button.combo:hover:only-child, .linked.vertical > combobox:only-child > button.combo:hover:active:only-child, .linked.vertical > combobox:only-child > button.combo:focus:active:only-child, @@ -1781,6 +1813,7 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked, .linked.vertical > combobox:only-child > button.combo:checked:hover:only-child, .linked.vertical > combobox:only-child > button.combo:focus:checked:only-child, .linked.vertical entry:only-child, +.linked.vertical entry:backdrop:only-child, .linked.vertical button:only-child, .linked.vertical button:hover:active:only-child, .linked.vertical button:checked:only-child, @@ -2670,126 +2703,74 @@ notebook header tabs arrow:disabled { * ComboBoxes * **************/ -combobox, -GtkComboBox { +combobox { padding: 0; -/* -GtkComboBox-arrow-scaling: 0.5; deprecated */ -/* -GtkComboBox-shadow-type: none; deprecated */ text-shadow: 0 1px @button_text_shadow; } -combobox:disabled, -GtkComboBox:disabled { +combobox:disabled { text-shadow: none; color: @insensitive_fg_color; } -combobox separator, -GtkComboBox .separator { - /* always disable separators */ -/* -GtkWidget-wide-separators: true; deprecated */ +combobox separator { -GtkWidget-horizontal-separator: 0; -GtkWidget-vertical-separator: 0; } -combobox entry entry:first-child, -combobox entry button:first-child, -GtkComboBox.combobox-entry .entry:first-child, -GtkComboBox.combobox-entry .button:first-child { - border-image-width: 3px 0 4px 3px; - border-radius: 3px 0 0 3px; - border-right-width: 0; -} - -combobox entry entry:last-child, -combobox entry button:last-child, -GtkComboBox.combobox-entry .entry:last-child, -GtkComboBox.combobox-entry .button:last-child { - border-image-width: 3px 3px 4px 0; - border-radius: 0 3px 3px 0; - border-left-width: 0; +combobox > entry.combo, +combobox > button.combo, +combobox > entry.combo:backdrop, +combobox > button.combo:backdrop { + border-image-width: 3px 3px 4px 3px; + border-radius: 3px; + border-width: 2px; } -toolbar.primary-toolbar combobox entry entry:first-child, -toolbar.primary-toolbar combobox entry button:first-child, -.primary-toolbar GtkComboBox.combobox-entry .entry:first-child, -.primary-toolbar GtkComboBox.combobox-entry .button:first-child { +toolbar.primary-toolbar combobox entry.combo:first-child, +toolbar.primary-toolbar combobox button.combo:first-child { border-image-width: 4px 0 4px 4px; border-radius: 3px 0 0 3px; border-right-width: 0; } -toolbar.primary-toolbar combobox entry entry:last-child, -toolbar.primary-toolbar combobox entry button:last-child, -.primary-toolbar GtkComboBox.combobox-entry .entry:last-child, -.primary-toolbar GtkComboBox.combobox-entry .button:last-child { +toolbar.primary-toolbar combobox entry.combo:last-child, +toolbar.primary-toolbar combobox button.combo:last-child { border-image-width: 4px 4px 4px 0; border-radius: 0 3px 3px 0; border-left-width: 0; } -combobox entry entry:focus:first-child, -GtkComboBox.combobox-entry .entry:focus:first-child { +combobox entry.combo:focus { + box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1); +} + +combobox entry.combo:focus:first-child { box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1), inset 1px 1px alpha(@theme_selected_bg_color, 0.1), inset 0 -1px alpha(@theme_selected_bg_color, 0.2); } -combobox entry entry:focus:last-child, -GtkComboBox.combobox-entry .entry:focus:last-child { +combobox entry.combo:focus:last-child { box-shadow: inset -1px 2px alpha(@theme_selected_bg_color, 0.1), inset -1px 1px alpha(@theme_selected_bg_color, 0.1), inset 0 -1px alpha(@theme_selected_bg_color, 0.2); } -combobox entry button:last-child, -combobox entry button:hover:last-child, -combobox entry button:checked:last-child, -combobox entry button:hover:active:last-child, -GtkComboBox.combobox-entry .button:last-child, -GtkComboBox.combobox-entry .button:hover:last-child, -GtkComboBox.combobox-entry .button:active:last-child, -GtkComboBox.combobox-entry .button:hover:active:last-child { - box-shadow: inset 1px 0 @inset_dark_color, - inset 0 1px @entry_inset, - inset 0 2px alpha(@entry_inset, 0.4); -} - -combobox entry button:first-child, -combobox entry button:hover:first-child, -combobox entry button:checked:first-child, -combobox entry button:hover:active:first-child, -GtkComboBox.combobox-entry .button:first-child, -GtkComboBox.combobox-entry .button:hover:first-child, -GtkComboBox.combobox-entry .button:active:first-child, -GtkComboBox.combobox-entry .button:hover:active:first-child { - box-shadow: inset -1px 0 @inset_dark_color, - inset 0 1px @entry_inset, - inset 0 2px alpha(@entry_inset, 0.4); -} - -combobox entry button:disabled:first-child, -GtkComboBox.combobox-entry .button:disabled:first-child { - box-shadow: inset -1px 0 @inset_dark_color; -} - -combobox entry button:disabled:last-child, -GtkComboBox.combobox-entry .button:disabled:last-child { - box-shadow: inset 1px 0 @inset_dark_color; +combobox entry.combo:focus:only-child { + box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1), + inset 1px 1px alpha(@theme_selected_bg_color, 0.1), + inset -1px -1px alpha(@theme_selected_bg_color, 0.2); } -combobox entry button:hover, -combobox entry button:checked, -combobox entry button:hover:active, -GtkComboBox.combobox-entry .button:hover, -GtkComboBox.combobox-entry .button:active, -GtkComboBox.combobox-entry .button:active:hover { +combobox button.combo:hover, +combobox button.combo:checked, +combobox button.combo:hover:active { color: shade (@theme_selected_bg_color, 0.80); transition: all 200ms ease-in; } -combobox button.combo, -GtkComboBox .button { +combobox button.combo { color: @theme_fg_color; } @@ -4838,7 +4819,7 @@ GtkSwitch.trough:disabled { } /* don't display on/off */ -switch +switch, switch:hover, switch:disabled:hover, GtkSwitch.trough:hover, @@ -5493,7 +5474,7 @@ list row.activatable:selected:backdrop:hover, box-shadow: none; } -list row button, +list > row > button, .list-row.button { border-color: transparent; background-color: @theme_base_color; @@ -5506,11 +5487,11 @@ list row button, border: none; } -list row button:selected, -list row button:selected:hover, -list row button:checked, -list row button:hover:active, -list row button:checked:hover, +list > row > button:selected, +list > row > button:selected:hover, +list > row > button:checked, +list > row > button:hover:active, +list > row > button:checked:hover, .list-row.button:selected, .list-row.button:selected:hover, .list-row.button:active, @@ -5530,7 +5511,7 @@ list row button:checked:hover, border-width: 0px; } -list row button:hover, +list > row > button:hover, .list-row.button:hover { background-image: none; background-color: shade (@theme_selected_bg_color, 1.55); diff --git a/desktop-themes/BlueMenta/gtk-3.0/other-applications.css b/desktop-themes/BlueMenta/gtk-3.0/other-applications.css index 292d96d3..76e906b1 100644 --- a/desktop-themes/BlueMenta/gtk-3.0/other-applications.css +++ b/desktop-themes/BlueMenta/gtk-3.0/other-applications.css @@ -174,6 +174,30 @@ border-style: solid; } +/* cinnamon-settings */ + +button.gtkstyle-fallback, +button.gtkstyle-fallback:focus, +button.gtkstyle-fallback:backdrop { + border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch; + border-radius: 4px; + border-width: 2px; + border-style: solid; + border-color: transparent; +} + +button.gtkstyle-fallback:hover, +button.gtkstyle-fallback:hover:active, +button.gtkstyle-fallback:backdrop:hover, +button.gtkstyle-fallback:focus:hover, +button.gtkstyle-fallback:focus:hover:active { + border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch; + border-radius: 4px; + border-width: 2px; + border-style: solid; + border-color: transparent; +} + /* Parole media player needs more testing! hopefully do not set other stuff */ -- cgit v1.2.1