GTK+-3.20 Traditional themes: fix notbook styling after gtk+-3.19.11 breakage

2 files changed, 104 insertions, 114 deletions

diff --git a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
index 5e6f19bd..2b7adf12 100644
--- a/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
@@ -1364,32 +1364,58 @@ paned.horizontal notebook header {
 
 notebook header.top {
     border-width: 0px 0px 1px 0px;
+    border-radius: 3px 3px 0px 0px;
+    background-image: linear-gradient(to bottom,
+                      shade(@notebook_tab_gradient_a, 1.05),
+                      shade(@notebook_tab_gradient_b, 1.05) 50%,
+                      shade(@notebook_tab_gradient_c, 1.05) 50%,
+                      shade(@notebook_tab_gradient_d, 1.05));
     box-shadow: inset  0px -1px 0 0 @border_color;
 }
 
 
 notebook header.bottom {
     border-width: 1px 1px 0px 0px;
+    background-image: linear-gradient(to top,
+                      shade(@notebook_tab_gradient_a, 1.05),
+                      shade(@notebook_tab_gradient_b, 1.05) 50%,
+                      shade(@notebook_tab_gradient_c, 1.05) 50%,
+                      shade(@notebook_tab_gradient_d, 1.05));
     box-shadow: inset  0px  1px 0 0 @border_color;
 }
 
 notebook header.left {
     border-width: 0px 1px 0px 0px;
+    background-image: linear-gradient(to right,
+                      shade(@notebook_tab_gradient_a, 1.05),
+                      shade(@notebook_tab_gradient_b, 1.05) 50%,
+                      shade(@notebook_tab_gradient_c, 1.05) 50%,
+                      shade(@notebook_tab_gradient_d, 1.05));
     box-shadow: inset -1px  0px 0 0 @border_color;
 }
 
 notebook header.right {
     border-width: 0px 0px 0px 1px;
+    background-image: linear-gradient(to left,
+                      shade(@notebook_tab_gradient_a, 1.05),
+                      shade(@notebook_tab_gradient_b, 1.05) 50%,
+                      shade(@notebook_tab_gradient_c, 1.05) 50%,
+                      shade(@notebook_tab_gradient_d, 1.05));
     box-shadow: inset  1px  0px 0 0 @border_color;
 }
 
 /* tabs in view areas, ie. pluma-, caja-tabs */
-paned.horizontal notebook header tab {
-    padding: 4px 2px;
+paned.horizontal notebook header.top tab {
+    padding: 4px 2px 4px 2px;
+    border-width: 0px 1px 1px 1px;
+}
+
+paned.horizontal notebook header.top tab:checked {
+    padding: 4px 2px 4px 2px;
+    border-width: 0px 1px 0px 1px;
 }
 
 notebook header tab {
-    padding: 3px;
     border-color: @border_color;
     border-style: solid;
     border-width: 1px;
@@ -1397,9 +1423,10 @@ notebook header tab {
 }
 
 notebook header.top tab {
-    padding: 7px 28px 0 28px;
-    border-width: 0px 0px 1px 0px;
-    border-radius: 0px;
+    margin: 0px 0px 0px -1px;
+	padding: 4px 2px 0 2px;
+    border-width: 0px 1px 1px 1px;
+    border-radius: 3px 3px 0px 0px;
     background-image: linear-gradient(to bottom,
                       @notebook_tab_gradient_a,
                       @notebook_tab_gradient_b 50%,
@@ -1407,10 +1434,9 @@ notebook header.top tab {
                       @notebook_tab_gradient_d);
 }
 
-notebook header.top tab:active {
-    border-radius: 3px 3px 0px 0px;
-    border-width: 0px 1px 0px 1px;
+notebook header.top tab:checked {
     border-top-color: @notebook_active_tab_border;
+    border-width: 0px 1px 0px 1px;
     background-image: linear-gradient(to bottom,
                       @notebook_active_tab_strip_gradient_a,
                       @notebook_active_tab_strip_gradient_b 3px,
@@ -1419,18 +1445,11 @@ notebook header.top tab:active {
                       @notebook_active_tab_gradient_b);
 }
 
-notebook header.top tab:active:first-child {
-    border-width: 0px 1px 0px 0px;
-}
-
-notebook header.top tab:active:last-child {
-    border-width: 0px 0px 0px 1px;
-}
-
 notebook header.right tab {
-    padding: 2px 7px 2px 0;
-    border-width: 0px 0px 0px 1px;
-    border-radius: 0px;
+    margin: -1px 0px 0px 0px;
+    padding: 2px 4px 2px 1px;
+    border-width: 1px 0px 1px 1px;
+    border-radius: 0px 3px 3px 0px;
     background-image: linear-gradient(to left,
                       @notebook_tab_gradient_a,
                       @notebook_tab_gradient_b 50%,
@@ -1438,7 +1457,8 @@ notebook header.right tab {
                       @notebook_tab_gradient_d);
 }
 
-notebook header.right tab:active {
+notebook header.right tab:checked {
+    padding: 2px 4px 2px 2px;
     border-width: 1px 0px 1px 0px;
     border-right-color: @notebook_active_tab_border;
     background-image: linear-gradient(to left,
@@ -1449,18 +1469,11 @@ notebook header.right tab:active {
                       @notebook_active_tab_gradient_b);
 }
 
-notebook header.right tab:active:first-child {
-    border-width: 0px 0px 1px 0px;
-}
-
-notebook header.right tab:active:last-child {
-    border-width: 1px 0px 0px 0px;
-}
-
 notebook header.bottom tab {
-    padding: 0px 28px 7px 28px;
-    border-width: 1px 0px 0px 0px;
-    border-radius: 0px;
+    margin: 0px 0px 0px -1px;
+    padding: 0px 2px 4px 2px;
+    border-width: 1px 1px 0px 1px;
+    border-radius: 0px 0px 3px 3px;
     background-image: linear-gradient(to top,
                       @notebook_tab_gradient_a,
                       @notebook_tab_gradient_b 50%,
@@ -1468,7 +1481,8 @@ notebook header.bottom tab {
                       @notebook_tab_gradient_d);
 }
 
-notebook header.bottom tab:active {
+notebook header.bottom tab:checked {
+    padding: 1px 2px 4px 2px;
     border-width: 0px 1px 0px 1px;
     border-bottom-color: @notebook_active_tab_border;
     background-image: linear-gradient(to top,
@@ -1479,18 +1493,11 @@ notebook header.bottom tab:active {
                       @notebook_active_tab_gradient_b);
 }
 
-notebook header.bottom tab:active:first-child {
-    border-width: 0px 1px 0px 0px;
-}
-
-notebook header.bottom tab:active:last-child {
-    border-width: 0px 0px 0px 1px;
-}
-
 notebook header.left tab {
-    padding: 2px 0 2px 7px;
-    border-width: 0px 1px 0px 0px;
-    border-radius: 0px;
+    margin: -1px 0px 0px 0px;
+    padding: 2px 1px 2px 4px;
+    border-width: 1px 1px 1px 0px;
+    border-radius: 3px 0px 0px 3px;
     background-image: linear-gradient(to right,
                       @notebook_tab_gradient_a,
                       @notebook_tab_gradient_b 50%,
@@ -1498,7 +1505,7 @@ notebook header.left tab {
                       @notebook_tab_gradient_d);
 }
 
-notebook header.left tab:active {
+notebook header.left tab:checked {
     border-width: 1px 0px 1px 0px;
     border-left-color: @notebook_active_tab_border;
     background-image: linear-gradient(to right,
@@ -1509,18 +1516,6 @@ notebook header.left tab:active {
                       @notebook_active_tab_gradient_b);
 }
 
-notebook header.left tab:active:first-child {
-    border-width: 0px 0px 1px 0px;
-}
-
-notebook header.left tab:active:last-child {
-    border-width: 1px 0px 0px 0px;
-}
-
-.notebook tab * {
-    background-color: transparent;
-}
-
 /* close button styling */
 paned.horizontal notebook button.flat,
 notebook button.flat.small-button {
diff --git a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
index e27782b2..8378e4bc 100644
--- a/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
@@ -1365,32 +1365,58 @@ paned.horizontal notebook header {
 
 notebook header.top {
     border-width: 0px 0px 1px 0px;
+    border-radius: 3px 3px 0px 0px;
+    background-image: linear-gradient(to bottom,
+                      shade(@notebook_tab_gradient_a, 1.05),
+                      shade(@notebook_tab_gradient_b, 1.05) 50%,
+                      shade(@notebook_tab_gradient_c, 1.05) 50%,
+                      shade(@notebook_tab_gradient_d, 1.05));
     box-shadow: inset  0px -1px 0 0 @border_color;
 }
 
 
 notebook header.bottom {
     border-width: 1px 1px 0px 0px;
+    background-image: linear-gradient(to top,
+                      shade(@notebook_tab_gradient_a, 1.05),
+                      shade(@notebook_tab_gradient_b, 1.05) 50%,
+                      shade(@notebook_tab_gradient_c, 1.05) 50%,
+                      shade(@notebook_tab_gradient_d, 1.05));
     box-shadow: inset  0px  1px 0 0 @border_color;
 }
 
 notebook header.left {
     border-width: 0px 1px 0px 0px;
+    background-image: linear-gradient(to right,
+                      shade(@notebook_tab_gradient_a, 1.05),
+                      shade(@notebook_tab_gradient_b, 1.05) 50%,
+                      shade(@notebook_tab_gradient_c, 1.05) 50%,
+                      shade(@notebook_tab_gradient_d, 1.05));
     box-shadow: inset -1px  0px 0 0 @border_color;
 }
 
 notebook header.right {
     border-width: 0px 0px 0px 1px;
+    background-image: linear-gradient(to left,
+                      shade(@notebook_tab_gradient_a, 1.05),
+                      shade(@notebook_tab_gradient_b, 1.05) 50%,
+                      shade(@notebook_tab_gradient_c, 1.05) 50%,
+                      shade(@notebook_tab_gradient_d, 1.05));
     box-shadow: inset  1px  0px 0 0 @border_color;
 }
 
 /* tabs in view areas, ie. pluma-, caja-tabs */
-paned.horizontal notebook header tab {
-    padding: 4px 2px;
+paned.horizontal notebook header.top tab {
+    padding: 4px 2px 4px 2px;
+    border-width: 0px 1px 1px 1px;
+}
+
+paned.horizontal notebook header.top tab:checked {
+    padding: 4px 2px 4px 2px;
+    border-width: 0px 1px 0px 1px;
 }
 
 notebook header tab {
-    padding: 3px;
     border-color: @border_color;
     border-style: solid;
     border-width: 1px;
@@ -1398,9 +1424,10 @@ notebook header tab {
 }
 
 notebook header.top tab {
-    padding: 7px 28px 0 28px;
-    border-width: 0px 0px 1px 0px;
-    border-radius: 0px;
+    margin: 0px 0px 0px -1px;
+	padding: 4px 2px 0 2px;
+    border-width: 0px 1px 1px 1px;
+    border-radius: 3px 3px 0px 0px;
     background-image: linear-gradient(to bottom,
                       @notebook_tab_gradient_a,
                       @notebook_tab_gradient_b 50%,
@@ -1408,10 +1435,9 @@ notebook header.top tab {
                       @notebook_tab_gradient_d);
 }
 
-notebook header.top tab:active {
-    border-radius: 3px 3px 0px 0px;
-    border-width: 0px 1px 0px 1px;
+notebook header.top tab:checked {
     border-top-color: @notebook_active_tab_border;
+    border-width: 0px 1px 0px 1px;
     background-image: linear-gradient(to bottom,
                       @notebook_active_tab_strip_gradient_a,
                       @notebook_active_tab_strip_gradient_b 3px,
@@ -1420,18 +1446,11 @@ notebook header.top tab:active {
                       @notebook_active_tab_gradient_b);
 }
 
-notebook header.top tab:active:first-child {
-    border-width: 0px 1px 0px 0px;
-}
-
-notebook header.top tab:active:last-child {
-    border-width: 0px 0px 0px 1px;
-}
-
 notebook header.right tab {
-    padding: 2px 7px 2px 0;
-    border-width: 0px 0px 0px 1px;
-    border-radius: 0px;
+    margin: -1px 0px 0px 0px;
+    padding: 2px 4px 2px 1px;
+    border-width: 1px 0px 1px 1px;
+    border-radius: 0px 3px 3px 0px;
     background-image: linear-gradient(to left,
                       @notebook_tab_gradient_a,
                       @notebook_tab_gradient_b 50%,
@@ -1439,7 +1458,8 @@ notebook header.right tab {
                       @notebook_tab_gradient_d);
 }
 
-notebook header.right tab:active {
+notebook header.right tab:checked {
+    padding: 2px 4px 2px 2px;
     border-width: 1px 0px 1px 0px;
     border-right-color: @notebook_active_tab_border;
     background-image: linear-gradient(to left,
@@ -1450,18 +1470,11 @@ notebook header.right tab:active {
                       @notebook_active_tab_gradient_b);
 }
 
-notebook header.right tab:active:first-child {
-    border-width: 0px 0px 1px 0px;
-}
-
-notebook header.right tab:active:last-child {
-    border-width: 1px 0px 0px 0px;
-}
-
 notebook header.bottom tab {
-    padding: 0px 28px 7px 28px;
-    border-width: 1px 0px 0px 0px;
-    border-radius: 0px;
+    margin: 0px 0px 0px -1px;
+    padding: 0px 2px 4px 2px;
+    border-width: 1px 1px 0px 1px;
+    border-radius: 0px 0px 3px 3px;
     background-image: linear-gradient(to top,
                       @notebook_tab_gradient_a,
                       @notebook_tab_gradient_b 50%,
@@ -1469,7 +1482,8 @@ notebook header.bottom tab {
                       @notebook_tab_gradient_d);
 }
 
-notebook header.bottom tab:active {
+notebook header.bottom tab:checked {
+    padding: 1px 2px 4px 2px;
     border-width: 0px 1px 0px 1px;
     border-bottom-color: @notebook_active_tab_border;
     background-image: linear-gradient(to top,
@@ -1480,18 +1494,11 @@ notebook header.bottom tab:active {
                       @notebook_active_tab_gradient_b);
 }
 
-notebook header.bottom tab:active:first-child {
-    border-width: 0px 1px 0px 0px;
-}
-
-notebook header.bottom tab:active:last-child {
-    border-width: 0px 0px 0px 1px;
-}
-
 notebook header.left tab {
-    padding: 2px 0 2px 7px;
-    border-width: 0px 1px 0px 0px;
-    border-radius: 0px;
+    margin: -1px 0px 0px 0px;
+    padding: 2px 1px 2px 4px;
+    border-width: 1px 1px 1px 0px;
+    border-radius: 3px 0px 0px 3px;
     background-image: linear-gradient(to right,
                       @notebook_tab_gradient_a,
                       @notebook_tab_gradient_b 50%,
@@ -1499,7 +1506,7 @@ notebook header.left tab {
                       @notebook_tab_gradient_d);
 }
 
-notebook header.left tab:active {
+notebook header.left tab:checked {
     border-width: 1px 0px 1px 0px;
     border-left-color: @notebook_active_tab_border;
     background-image: linear-gradient(to right,
@@ -1510,18 +1517,6 @@ notebook header.left tab:active {
                       @notebook_active_tab_gradient_b);
 }
 
-notebook header.left tab:active:first-child {
-    border-width: 0px 0px 1px 0px;
-}
-
-notebook header.left tab:active:last-child {
-    border-width: 1px 0px 0px 0px;
-}
-
-.notebook tab * {
-    background-color: transparent;
-}
-
 /* close button styling */
 paned.horizontal notebook button.flat,
 notebook button.flat.small-button {