Menta themes GTK3: sync with zukitwo GTK-3.12 upstream version

10 files changed, 116 insertions, 28 deletions

diff --git a/desktop-themes/BlueMenta/gtk-3.0/gnome-applications.css b/desktop-themes/BlueMenta/gtk-3.0/gnome-applications.css
index d0502884..d3199dbc 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gnome-applications.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gnome-applications.css
@@ -76,6 +76,10 @@ TerminalWindow GtkNotebook.notebook {
 	text-shadow: none;
 }
 
+.nautilus-desktop.nautilus-canvas-item:selected:backdrop {
+	color: @theme_unfocused_selected_fg_color;
+}
+
 NautilusWindow .sidebar .frame {
 	border-style: none;
 }
@@ -169,6 +173,11 @@ GeditWindow .pane-separator:hover {
 	color: @borders;
 }
 
+.gedit-headerbar-paned:backdrop {
+	background-image: url("assets/null.png");
+}
+
+
 .gedit-document-panel {
 	background-color: @sidebar_bg;
 }
diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-assets.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-assets.css
index 76c2a67b..35ed4b04 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-assets.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-assets.css
@@ -103,11 +103,14 @@ GtkModelButton.button.radio:insensitive,
 	background-color: transparent;
 }
 
+GtkModelButton.button.radio:active,
+GtkModelButton.button.radio:active:hover,
 .radio:active,
 .view.cell.radio:active {
 	background-image: url("assets/radio-active.png");
 }
 
+GtkModelButton.button.radio:active:insensitive,
 .radio:active:insensitive {
 	background-image: url("assets/radio-active-ins.png");
 }
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 d329496f..15a2fc6e 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-backgrounds.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-backgrounds.css
@@ -10,6 +10,20 @@
 	background-color: transparent;
 }
 
+.button.default {
+	background-image: linear-gradient(to bottom, 
+		shade(@theme_selected_bg_color, 1.05),
+		shade(@theme_selected_bg_color, 1.0));
+	background-color: transparent;
+}
+
+.button.default:hover {
+	background-image: linear-gradient(to bottom, 
+		shade(@theme_selected_bg_color, 1.1),
+		shade(@theme_selected_bg_color, 1.05));
+	background-color: transparent;
+}
+
 /* Pushed button and progressbar through background */
 .button:active,
 .button:active:hover,
@@ -138,7 +152,7 @@ GtkComboBox.combobox-entry .button:active,
 column-header.button,
 column-header .button {
 	background-image: linear-gradient(to bottom,
-		shade(@entry_background_a, 1.0),
+		shade(@entry_background_b, 1.0),
 		@entry_background_b);
 	box-shadow: inset 0 2px 0 0 alpha(@borders, 0.3);
 }
@@ -146,7 +160,7 @@ column-header .button {
 column-header.button:hover,
 column-header .button:hover {
 	background-image: linear-gradient(to bottom,
-		shade(@entry_background_a, 0.96),
+		shade(@entry_background_b, 0.96),
 		@entry_background_b);
 	box-shadow: inset 0 2px 0 0 alpha(@theme_selected_bg_color, 0.3);
 }
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 699b058e..2498ef48 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css
@@ -21,7 +21,6 @@ GtkComboBox.combobox-entry .button,
 	border: 1px solid @borders;
 }
 
-
 .entry:insensitive,
 GtkComboBox.combobox-entry .entry:insensitive,
 GtkComboBox.combobox-entry .button:insensitive,
@@ -60,6 +59,7 @@ GtkComboBox.combobox-entry .button:insensitive,
 
 /* focused element borders */
 .entry:focus,
+GtkComboBox.combobox-entry .entry:focus,
 GtkComboBox.combobox-entry .button:focus,
 .button.default:active,
 .inline-toolbar.toolbar.vertical .button.default:active,
@@ -172,7 +172,6 @@ GtkComboBox.combobox-entry .button:focus,
 }
 
 /* primary toolbar - focused element borders */
-.primary-toolbar .button:active:focus,
 .primary-toolbar .entry:focus,
 .primary-toolbar GtkComboBox.combobox-entry .entry:focus,
 .primary-toolbar .button.raised.default:active,
diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
index a2b00f11..eea6c800 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
@@ -443,7 +443,7 @@ GtkTreeView.separator,
 }
 
 .spinbutton .button:insensitive {
-	color: @internal_element_insensitive;
+	color: @internal_element_color;
 }
 
 .spinbutton .button:active,
@@ -972,7 +972,7 @@ GtkComboBox.combobox-entry .button {
 
 .button.default {
 	text-shadow: none;
-	color: @theme_fg_color;
+	color: @theme_selected_fg_color;
 }
 
 /* We may want a background for focused buttons, but in the meantime let's remove it too */
@@ -1542,7 +1542,7 @@ GtkLinkButton.button:active {
 
 .notebook tab.top,
 .notebook tab.bottom {
-	padding: 6px 20px 4px;
+	padding: 8px 20px 6px;
 }
 
 .notebook tab.top:active,
@@ -1673,7 +1673,7 @@ GtkLinkButton.button:active {
 
 	border-color: alpha(black, 0.27)
 		alpha(black, 0.13)
-		alpha(black, 0.13) 
+		alpha(black, 0.13)
 		alpha(black, 0.13);
 }
 
@@ -1824,7 +1824,6 @@ GtkFileChooserButton GtkImage:last-child {
 	border-width: 0;
 	border-radius: 0;
 	border-image: none;
-	box-shadow: none;
 }
 
 .scrollbar.trough,
@@ -1837,6 +1836,7 @@ GtkFileChooserButton GtkImage:last-child {
 	border-color: shade (@theme_bg_color, 0.94);
 	border-radius: 0;
 	border-image: none;
+	box-shadow: none;
 }
 
 .scrollbar.trough.horizontal {
@@ -2351,8 +2351,8 @@ GtkCheckButton:selected:focus {
 .prompt,
 GtkMessageDialog {
 	-GtkDialog-content-area-border: 0;
-	-GtkDialog-action-area-border: 15;
-	-GtkDialog-button-spacing: 10;
+	-GtkDialog-action-area-border: 0;
+	-GtkDialog-button-spacing: 0;
 	margin: 0;
 	padding: 0;
 }
@@ -2892,7 +2892,7 @@ GtkProgressBar.osd.progressbar {
 	icon-shadow: none;
 	background-image: none;
 	background-color: @insentitive_bg_color;
-	border: 1px solid @insensitive_borders;
+/*	border: 1px solid @insensitive_borders;*/
 }
 
 .suggested-action.button GtkLabel:insensitive {
@@ -3233,7 +3233,7 @@ GtkIconView.cell:selected:focus {
 }
 
 .cell {
-	color: @theme_text_color;
+	/*color: @theme_text_color;*/ /* Don't use, seems to change hover effect on combobox menuitems */
 	padding: 2px;
 	text-shadow: none;
 }
@@ -3378,7 +3378,26 @@ column-header .button.dnd {
 }
 
 .list-row:selected {
-	background-color: @theme_selected_bg_color;
+	border-width: 1px 0 1px 0;
+	border-style: solid;
+	border-color: shade (@theme_selected_bg_color, 0.85);
+	background-image: linear-gradient(to bottom,
+		shade (@theme_selected_bg_color, 1.0),
+		shade (@theme_selected_bg_color, 0.85));
+	box-shadow: none;
+	color: @theme_selected_fg_color;
+}
+
+.list-row:selected:backdrop {
+	border-width: 1px 0 1px 0;
+	border-style: solid;
+	border-color: shade (@theme_bg_color, 0.85);
+	background-image: linear-gradient(to bottom,
+		shade (@theme_bg_color, 1.0),
+		shade (@theme_bg_color, 0.85));
+	color: @theme_fg_color;
+	text-shadow: none;
+	box-shadow: none;
 }
 
 /**************
diff --git a/desktop-themes/Menta/gtk-3.0/gnome-applications.css b/desktop-themes/Menta/gtk-3.0/gnome-applications.css
index e6c60be8..0b3caad8 100644
--- a/desktop-themes/Menta/gtk-3.0/gnome-applications.css
+++ b/desktop-themes/Menta/gtk-3.0/gnome-applications.css
@@ -78,6 +78,10 @@ TerminalWindow GtkNotebook.notebook {
 	text-shadow: none;
 }
 
+.nautilus-desktop.nautilus-canvas-item:selected:backdrop {
+	color: @theme_unfocused_selected_fg_color;
+}
+
 NautilusWindow .sidebar .frame {
 	border-style: none;
 }
@@ -171,6 +175,11 @@ GeditWindow .pane-separator:hover {
 	color: @borders;
 }
 
+.gedit-headerbar-paned:backdrop {
+	background-image: url("assets/null.png");
+}
+
+
 .gedit-document-panel {
 	background-color: @sidebar_bg;
 }
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css
index 76c2a67b..35ed4b04 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css
@@ -103,11 +103,14 @@ GtkModelButton.button.radio:insensitive,
 	background-color: transparent;
 }
 
+GtkModelButton.button.radio:active,
+GtkModelButton.button.radio:active:hover,
 .radio:active,
 .view.cell.radio:active {
 	background-image: url("assets/radio-active.png");
 }
 
+GtkModelButton.button.radio:active:insensitive,
 .radio:active:insensitive {
 	background-image: url("assets/radio-active-ins.png");
 }
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css
index d329496f..15a2fc6e 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css
@@ -10,6 +10,20 @@
 	background-color: transparent;
 }
 
+.button.default {
+	background-image: linear-gradient(to bottom, 
+		shade(@theme_selected_bg_color, 1.05),
+		shade(@theme_selected_bg_color, 1.0));
+	background-color: transparent;
+}
+
+.button.default:hover {
+	background-image: linear-gradient(to bottom, 
+		shade(@theme_selected_bg_color, 1.1),
+		shade(@theme_selected_bg_color, 1.05));
+	background-color: transparent;
+}
+
 /* Pushed button and progressbar through background */
 .button:active,
 .button:active:hover,
@@ -138,7 +152,7 @@ GtkComboBox.combobox-entry .button:active,
 column-header.button,
 column-header .button {
 	background-image: linear-gradient(to bottom,
-		shade(@entry_background_a, 1.0),
+		shade(@entry_background_b, 1.0),
 		@entry_background_b);
 	box-shadow: inset 0 2px 0 0 alpha(@borders, 0.3);
 }
@@ -146,7 +160,7 @@ column-header .button {
 column-header.button:hover,
 column-header .button:hover {
 	background-image: linear-gradient(to bottom,
-		shade(@entry_background_a, 0.96),
+		shade(@entry_background_b, 0.96),
 		@entry_background_b);
 	box-shadow: inset 0 2px 0 0 alpha(@theme_selected_bg_color, 0.3);
 }
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css
index 699b058e..2498ef48 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css
@@ -21,7 +21,6 @@ GtkComboBox.combobox-entry .button,
 	border: 1px solid @borders;
 }
 
-
 .entry:insensitive,
 GtkComboBox.combobox-entry .entry:insensitive,
 GtkComboBox.combobox-entry .button:insensitive,
@@ -60,6 +59,7 @@ GtkComboBox.combobox-entry .button:insensitive,
 
 /* focused element borders */
 .entry:focus,
+GtkComboBox.combobox-entry .entry:focus,
 GtkComboBox.combobox-entry .button:focus,
 .button.default:active,
 .inline-toolbar.toolbar.vertical .button.default:active,
@@ -172,7 +172,6 @@ GtkComboBox.combobox-entry .button:focus,
 }
 
 /* primary toolbar - focused element borders */
-.primary-toolbar .button:active:focus,
 .primary-toolbar .entry:focus,
 .primary-toolbar GtkComboBox.combobox-entry .entry:focus,
 .primary-toolbar .button.raised.default:active,
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
index b10cc8dd..77145391 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
@@ -443,7 +443,7 @@ GtkTreeView.separator,
 }
 
 .spinbutton .button:insensitive {
-	color: @internal_element_insensitive;
+	color: @internal_element_color;
 }
 
 .spinbutton .button:active,
@@ -972,7 +972,7 @@ GtkComboBox.combobox-entry .button {
 
 .button.default {
 	text-shadow: none;
-	color: @theme_fg_color;
+	color: @theme_selected_fg_color;
 }
 
 /* We may want a background for focused buttons, but in the meantime let's remove it too */
@@ -1541,7 +1541,7 @@ GtkLinkButton.button:active {
 
 .notebook tab.top,
 .notebook tab.bottom {
-	padding: 6px 20px 4px;
+	padding: 8px 20px 6px;
 }
 
 .notebook tab.top:active,
@@ -1672,7 +1672,7 @@ GtkLinkButton.button:active {
 
 	border-color: alpha(black, 0.27)
 		alpha(black, 0.13) 
-		alpha(black, 0.13) 
+		alpha(black, 0.13)
 		alpha(black, 0.13);
 }
 
@@ -1823,7 +1823,6 @@ GtkFileChooserButton GtkImage:last-child {
 	border-width: 0;
 	border-radius: 0;
 	border-image: none;
-	box-shadow: none;
 }
 
 .scrollbar.trough,
@@ -1836,6 +1835,7 @@ GtkFileChooserButton GtkImage:last-child {
 	border-color: shade (@theme_bg_color, 0.94);
 	border-radius: 0;
 	border-image: none;
+	box-shadow: none;
 }
 
 .scrollbar.trough.horizontal {
@@ -2351,8 +2351,8 @@ GtkCheckButton:selected:focus {
 .prompt,
 GtkMessageDialog {
 	-GtkDialog-content-area-border: 0;
-	-GtkDialog-action-area-border: 15;
-	-GtkDialog-button-spacing: 10;
+	-GtkDialog-action-area-border: 0;
+	-GtkDialog-button-spacing: 0;
 	margin: 0;
 	padding: 0;
 }
@@ -2895,7 +2895,7 @@ GtkProgressBar.osd.progressbar {
 	icon-shadow: none;
 	background-image: none;
 	background-color: @insentitive_bg_color;
-	border: 1px solid @insensitive_borders;
+/*	border: 1px solid @insensitive_borders;*/
 }
 
 .suggested-action.button GtkLabel:insensitive {
@@ -3236,7 +3236,7 @@ GtkIconView.cell:selected:focus {
 }
 
 .cell {
-	color: @theme_text_color;
+	/*color: @theme_text_color;*/ /* Don't use, seems to change hover effect on combobox menuitems */
 	padding: 2px;
 	text-shadow: none;
 }
@@ -3381,7 +3381,26 @@ column-header .button.dnd {
 }
 
 .list-row:selected {
-	background-color: @theme_selected_bg_color;
+	border-width: 1px 0 1px 0;
+	border-style: solid;
+	border-color: shade (@theme_selected_bg_color, 0.85);
+	background-image: linear-gradient(to bottom,
+		shade (@theme_selected_bg_color, 1.0),
+		shade (@theme_selected_bg_color, 0.85));
+	box-shadow: none;
+	color: @theme_selected_fg_color;
+}
+
+.list-row:selected:backdrop {
+	border-width: 1px 0 1px 0;
+	border-style: solid;
+	border-color: shade (@theme_bg_color, 0.85);
+	background-image: linear-gradient(to bottom,
+		shade (@theme_bg_color, 1.0),
+		shade (@theme_bg_color, 0.85));
+	color: @theme_fg_color;
+	text-shadow: none;
+	box-shadow: none;
 }
 
 /**************