Revert "Menta themes GTK3: adjust notebook styling"

This reverts commit c6c1fe63d9fccc6473401cfad8e367b0547525d9.

2 files changed, 113 insertions, 244 deletions

diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
index 8575d133..61f74e64 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
@@ -1523,283 +1523,172 @@ GtkLinkButton.button:active:hover {
  * tabs		*
  *****************/
 .notebook {
-    padding: 0;
-    background-clip: border-box;
-    border-style: solid;
-    border-color: @borders;
-    border-width: 0px;
-    background-color: shade (@theme_bg_color, 1.1);
-    -GtkNotebook-initial-gap: 0;
-    -GtkNotebook-arrow-spacing: 5;
-    -GtkNotebook-tab-curvature: 0;
-    -GtkNotebook-tab-overlap: 0;
-    -GtkNotebook-has-tab-gap: false;
-    -GtkWidget-focus-padding: 0;
-    -GtkWidget-focus-line-width: 0;
-}
-
-.notebook :hover {
-    -gtk-image-effect: highlight;
-    color: @theme_fg_color;
-}
-
-.notebook.frame.top {
-    border-width: 0px 1px 1px 1px;
-}
+	padding: 0;
 
-.notebook.frame.bottom {
-    border-width: 1px 1px 0px 1px;
-}
+	border-color: @borders;
+	border-style: solid;
+	border-width: 1px;
 
-.notebook.frame.left {
-    border-width: 1px 1px 1px 0px;
-}
+	background-clip: border-box;
+	background-color: shade (@theme_bg_color, 1.1);
 
-.notebook.frame.right {
-    border-width: 1px 0px 1px 1px;
+	-GtkNotebook-initial-gap: 0;
+	-GtkNotebook-arrow-spacing: 5;
+	-GtkNotebook-has-tab-gap: false;
+	-GtkNotebook-tab-overlap: -1;
 }
 
 .notebook.header {
-    background-image: linear-gradient(to bottom,
-                                      shade(@theme_bg_color, 0.96),
-                                      shade(@theme_bg_color, 1.0));
-    border-width: 0px;
-    box-shadow: inset 0 1px 0 0 alpha(@borders, 0.4), inset 0 -1px 0 0 alpha(@borders, 1.0);
+	background-color: shade(@theme_bg_color, 0.95);
+	box-shadow: inset 0 3px alpha(black, 0.03), inset 0 2px alpha(black, 0.03), inset 0 1px alpha(black, 0.03);
+	border-width: 0px;
 }
 
-.notebook.header.top {
-    border-width: 1px;
-    border-radius: 4px 4px 0px 0px;
+.notebook.header.frame.top {
+	border-top: 1px solid @borders;
+	border-left: 1px solid @borders;
+	border-right: 1px solid @borders;
 }
 
-.notebook.header.bottom {
-    border-width: 1px;
-    border-radius: 0px 0px 4px 4px;
+.notebook.header.frame.bottom {
+	border-bottom: 1px solid @borders;
+	border-left: 1px solid @borders;
+	border-right: 1px solid @borders;
 }
 
-.notebook.header.left {
-    border-width: 1px;
-    border-radius: 4px 0px 0px 4px;
+.notebook.header.frame.left {
+	border-top: 1px solid @borders;
+	border-bottom: 1px solid @borders;
+	border-left: 1px solid @borders;
 }
 
-.notebook.header.right {
-    border-width: 1px;
-    border-radius: 0px 4px 4px 0px;
+.notebook.header.frame.right {
+	border-top: 1px solid @borders;
+	border-bottom: 1px solid @borders;
+	border-right: 1px solid @borders;
 }
 
 .notebook GtkViewport {
-    background-color: @theme_base_color;
-    border-width: 0px;
-}
-
-.notebook tab {
-    border-color: transparent;
-    border-width: 0px;
-    background-image: none;
-    background-color: transparent;
+	background-color: shade (@theme_bg_color, 1.1);
+	border-width: 0px;
 }
 
-.notebook tab GtkLabel {
-    color: mix (@theme_fg_color, @theme_bg_color, 0.40);
-    font-weight: normal;
+.notebook :hover {
+	-gtk-image-effect: highlight;
+	background-color: shade(@theme_bg_color, 1.07);
+	color: @theme_fg_color;
 }
 
-.notebook .prelight-page,
-.notebook .prelight-page GtkLabel {
-    color: mix (@theme_fg_color, @theme_bg_color, 0.15);
+.notebook tab {
+	padding: 2px;
+	border-style: solid;
+	border-width: 1px 1px 0px 1px;
+	border-color: @borders;
+	background-image: linear-gradient(to bottom,
+		@notebook_tab_gradient_a,
+		@notebook_tab_gradient_b);
+	border-radius: 4px 4px 0 0;
+	border-image: none;
+	box-shadow: inset 0 1px alpha (shade (@theme_base_color, 1.1), 0.4);
 }
 
-.notebook .active-page,
-.notebook tab .active-page GtkLabel {
-    color: @theme_fg_color;
+.notebook tab.bottom {
+	background-image: linear-gradient(to top,
+		@notebook_tab_gradient_a,
+		@notebook_tab_gradient_b);
+	border-width: 0px 1px 1px 1px;
+	border-radius: 0 0 4px 4px;
+	box-shadow: inset 0 -1px alpha (shade (@theme_base_color, 1.1), 0.4);
 }
 
-/* horizontal tabs */
-
-.notebook tab.top,
-/* wtf, why this doesn't work? */
-.notebook tab.bottom {
-    padding: 6px 21px 4px;
+.notebook tab:active {
+	background-image: linear-gradient(to bottom,
+		shade (@theme_bg_color, 1.18),
+		shade (@theme_bg_color, 1.1));
+	border-width: 1px 1px 0px 1px;
 }
 
-/* workaround for wtf */
 .notebook tab.bottom:active {
-    padding: 3px 21px 7px 21px;
-}
-
-.notebook tab.top:active,
-.notebook tab.top:active:hover {
-    background-image: linear-gradient(to bottom,
-                                      shade(@theme_bg_color, 1.18),
-                                      shade(@theme_bg_color, 1.1));
-    border-radius: 4px 4px 0px 0px;
-    border-width: 1px 1px 0px 1px;
-    border-style: solid;
-    border-color: @borders;
-    box-shadow: none;
-}
-
-.notebook tab.top:hover {
-    background-image: linear-gradient(to bottom,
-                                      alpha(@theme_base_color, 0.0),
-                                      alpha(@theme_base_color, 0.3));
-    border-radius: 0px;
-    border-width: 0px 1px 0px 1px;
-    border-style: solid;
-    border-color: @borders;
-}
-
-.notebook tab.bottom:active,
-.notebook tab.bottom:active:hover {
-    background-image: linear-gradient(to top,
-                                      shade(@theme_bg_color, 1.18),
-                                      shade(@theme_bg_color, 1.1));
-    border-radius: 0 0 4px 4px;
-    border-style: solid;
-    border-width: 0px 1px 1px 1px;
-    border-color: @borders;
-    box-shadow: none;
-}
-
-.notebook tab.bottom:hover {
-    background-image: linear-gradient(to top,
-                                      alpha(@theme_base_color, 0.0),
-                                      alpha(@theme_base_color, 0.3));
-    border-radius: 0px;
-    border-width: 0px 1px 0px 1px;
-    border-style: solid;
-    border-color: @borders;
-}
-
-/* vertical tabs */
+	background-image: linear-gradient(to bottom,
+		shade (@theme_bg_color, 1.1),
+		shade (@theme_bg_color, 1.18));
+	border-width: 0px 1px 1px 1px;
+}
 
 .notebook tab.left,
 .notebook tab.right {
-    padding: 5px 20px;
+	background-image: none;
+	background-color: @theme_bg_color;
+	padding: 3px;
 }
 
-.notebook tab.left:active,
-.notebook tab.left:active:hover {
-    background-image: linear-gradient(to right,
-                                      shade(@theme_bg_color, 1.18),
-                                      shade(@theme_bg_color, 1.1));
-    border-radius: 4px 0px 0px 4px;
-    border-width: 1px 0px 1px 1px;
-    border-color: @borders;
-}
-
-.notebook tab.left:hover {
-    background-image: linear-gradient(to right,
-                                      alpha(@theme_base_color, 0.0),
-                                      alpha(@theme_base_color, 0.3));
-    border-width: 1px 0px 1px 0px;
-    border-style: solid;
-    border-color: @borders;
-}
-
-.notebook tab.right:active,
-.notebook tab.right:active:hover {
-    background-image: linear-gradient(to left,
-                                      shade(@theme_bg_color, 1.18),
-                                      shade(@theme_bg_color, 1.1));
-    border-radius:  0px 4px 4px 0px;
-    border-width: 1px 1px 1px 0px;
-    border-color: @borders;
-}
-
-.notebook tab.right:hover {
-    background-image: linear-gradient(to left,
-                                      alpha(@theme_base_color, 0.0),
-                                      alpha(@theme_base_color, 0.3));
-    border-width: 1px 0px 1px 0px;
-    border-style: solid;
-    border-color: @borders;
-}
-
-.notebook tab.reorderable-page:hover {
-    background-image: linear-gradient(to bottom,
-                                      alpha(@theme_base_color, 0.0),
-                                      alpha(@theme_base_color, 0.3));
-    border-radius: 0;
-    box-shadow: inset 1px 0 alpha(@borders, 0.6), inset -1px 0 alpha(@borders, 0.6);
-    border-style: none;
-}
-
-.notebook tab.reorderable-page:active {
-    background-image: linear-gradient(to bottom,
-                                      shade(@theme_bg_color, 1.18),
-                                      shade(@theme_bg_color, 1.1));
-    border-radius: 4px 4px 0 0;
-    box-shadow: none;
-    border-style: solid;
+.notebook tab.left {
+	border-width: 1px 0 1px 1px;
+	border-radius: 4px 0 0 4px;
 }
 
-/* close button styling */
-.notebook tab .button {
-    color: mix (@theme_fg_color, @theme_bg_color, 0.85);
-    border-image: none;
-    background-image: none;
-    background-color: transparent;
-    border-radius: 3px;
-    border-style: solid;
-    border-color: transparent;
-    border-width: 1px;
-    padding: 1px;
-    icon-shadow: none;
+.notebook tab.right {
+	border-width: 1px 1px 1px 0;
+	border-radius: 0 4px 4px 0;
 }
 
-.notebook .prelight-page .button,
-.notebook tab.prelight-page .button,
-.notebook .active-page .button,
-.notebook tab.active-page .button {
-    color: mix(@theme_fg_color, @theme_base_color, 0.6);
-    icon-shadow: 0 1px @button_text_shadow;
+.notebook tab.left:active,
+.notebook tab.right:active {
+	background-image: none;
+	background-color: shade (@theme_bg_color, 1.1);
 }
 
-.notebook tab .button:hover {
-    color: @theme_fg_color;
-    border-color: transparent;
-    border-image: none;
-    background-image: none;
-    background-color: transparent;
+.notebook tab.left:active {
+	border-width: 1px 0 1px 1px;
+	padding: 3px 3px 3px 5px;
+	border-radius: 4px 0 0 4px;
 }
 
-.notebook tab .button:active,
-.notebook tab .button:active:hover {
-    color:  @button_active_text;
-    background-color: alpha(black, 0.08);
-    box-shadow: inset 0 1px alpha(black, 0.05);
-    icon-shadow: 0 1px @button_active_text_shadow;
-    border-color: alpha(black, 0.27)
-                        alpha(black, 0.13)
-                        alpha(black, 0.13)
-                        alpha(black, 0.13);
+.notebook tab.right:active {
+	border-width: 1px 1px 1px 0;
+	padding: 3px 5px 3px 3px;
+	border-radius: 0 4px 4px 0;
 }
 
-.notebook.arrow {
-    /* FIXME, why this doesn't work? */
-    -GtkNotebook-arrow-scaling: 0.5;
-    color: shade(@theme_fg_color, 2.6);
+.notebook tab GtkLabel {
+	color: @theme_fg_color;
 }
 
-.notebook.arrow:hover {
-    color: @theme_selected_bg_color;
+.notebook .active-page,
+.notebook tab .active-page GtkLabel {
+	color: @theme_fg_color;
 }
 
-.notebook.arrow:active {
-    color: @theme_fg_color;
+.notebook tab:active {
+	border-bottom-width: 0px;
 }
 
-.notebook.arrow:insensitive {
-    color: rgba(141, 144, 145, 0.3);
+/* close button styling */
+.notebook tab .button,
+.notebook tab .button:active,
+.notebook tab .button:hover {
+	border-image: none;
+	border: 1px solid transparent;
+	background-image: none;
+	background-color: transparent;
 }
 
-.notebook.arrow:backdrop {
-    color: rgba(84, 89, 90, 0.4);
+.notebook tab .button:hover {
+	color: @theme_fg_color;
+	border: 1px solid alpha(black, 0.1);
 }
 
-.notebook.arrow:backdrop:insensitive {
-    color: #c7c7c7;
+.notebook tab .button:active,
+.notebook tab .button:active:hover {
+	background-color: alpha(black, 0.08);
+	box-shadow: inset 0 1px alpha(black, 0.05);
+	color:  @button_active_text;
+	icon-shadow: 0 1px @button_active_text_shadow;
+
+	border-color: alpha(black, 0.27) 
+		alpha(black, 0.13) 
+		alpha(black, 0.13) 
+		alpha(black, 0.13);
 }
 
 /**************
diff --git a/desktop-themes/Menta/gtk-3.0/mate-applications.css b/desktop-themes/Menta/gtk-3.0/mate-applications.css
index bb6f7631..0bec92f4 100644
--- a/desktop-themes/Menta/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Menta/gtk-3.0/mate-applications.css
@@ -255,22 +255,6 @@ CajaNotebook .frame {
 	border-width: 1px 0 0 0;
 }
 
-/* close button styling */
-/* surpress styling of close button */
-CajaWindow .notebook tab .button.flat,
-CajaWindow .notebook tab .button.flat:hover {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    text-shadow: none;
-    icon-shadow: none;
-    border-image: none;
-}
-
-CajaWindow .notebook tab.top {
-    padding: 6px 3px 6px 0px;
-}
-
 .caja-cluebar-label {
 	font: normal;
 	text-shadow: 0 1px shade (@cluebar_color, 1.06);
@@ -622,10 +606,6 @@ PlumaWindow .notebook tab .button.flat:hover {
     border-image: none;
 }
 
-PlumaWindow .notebook tab.top {
-    padding: 6px 0px 6px 6px;
-}
-
 /***********************
  * Mate-Control-Center *
  ***********************/