Gtk+-3.20 GreenLaguna: improve notebooks

1 files changed, 65 insertions, 83 deletions

diff --git a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
index f3f24edf..5e7bbf0e 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
@@ -940,16 +940,34 @@ notebook.frame {
     border-style: solid;
     border-width: 1px;
     border-radius: 3px;
-    padding: 0px;
 }
 
-/* pavu-control */
-window.background > box.vertical > notebook:not(.frame),
+window.background > box.vertical > notebook:not(.frame), /* pavu-control */
 window.background.csd > box.vertical > notebook:not(.frame),
 window.background.ssd > box.vertical > notebook:not(.frame),
-window.background.solid-csd > box.vertical > notebook:not(.frame) {
+window.background.solid-csd > box.vertical > notebook:not(.frame),
+dialog.background > box.vertical.dialog-vbox > notebook:not(.frame) { /* e. shotwell, meld  */
     border-radius: 3px;
-    padding: 0px;
+    background-color: shade(@base_color, 1.02);
+}
+
+window.background > box.vertical > notebook:not(.frame) > stack > box,
+window.background.csd > box.vertical > notebook:not(.frame) > stack > box,
+window.background.ssd > box.vertical > notebook:not(.frame) > stack > box,
+window.background.solid-csd > box.vertical > notebook:not(.frame) > stack > box {
+    border-style: solid;
+    border-width: 0px 1px 1px 1px;
+    border-color: @notebook_border;
+}
+
+window.background > box.vertical > notebook:not(.frame) > header.top,
+window.background.csd > box.vertical > notebook:not(.frame) > header.top,
+window.background.ssd > box.vertical > notebook:not(.frame) > header.top,
+window.background.solid-csd > box.vertical > notebook:not(.frame) > header.top,
+dialog.background > box.vertical.dialog-vbox > notebook:not(.frame) > header.top { /* e. shotwell, meld  */
+    border-style: solid;
+    border-width: 1px 1px 0px 1px;
+    border-color: @notebook_border;
 }
 
 printdialog > box.view.vertical.dialog-vbox > box.vertical > notebook {
@@ -965,7 +983,7 @@ notebook header.top {
     background-image: linear-gradient(to bottom,
                                       shade(@theme_bg_color, 0.86),
                                       shade(@theme_bg_color, 1.00));
-    box-shadow: inset  0px -1px alpha(shade(@button_border, 1.00), 0.90);
+    box-shadow: inset  0px -1px @notebook_border;
 }
 
 dialog.background.csd > box.vertical.dialog-vbox > notebook > header.top,
@@ -981,7 +999,7 @@ notebook header.bottom {
     background-image: linear-gradient(to top,
                                       shade(@theme_bg_color, 0.86),
                                       shade(@theme_bg_color, 1.00));
-    box-shadow: inset  0px  1px alpha(shade(@button_border, 1.00), 0.90);
+    box-shadow: inset  0px  1px @notebook_border;
 }
 
 notebook header.left {
@@ -990,7 +1008,7 @@ notebook header.left {
     background-image: linear-gradient(to right,
                                       shade(@theme_bg_color, 0.86),
                                       shade(@theme_bg_color, 1.00));
-    box-shadow: inset -1px  0px alpha(shade(@button_border, 1.00), 0.90);
+    box-shadow: inset -1px  0px @notebook_border;
 }
 
 notebook header.right {
@@ -999,7 +1017,7 @@ notebook header.right {
     background-image: linear-gradient(to left,
                                       shade(@theme_bg_color, 0.86),
                                       shade(@theme_bg_color, 1.00));
-    box-shadow: inset  1px  0px alpha(shade(@button_border, 1.00), 0.90);
+    box-shadow: inset  1px  0px @notebook_border;
 }
 
 notebook header tab {
@@ -1024,11 +1042,15 @@ notebook header tab .active-page label {
     color: @theme_fg_color;
 }
 
-/* tabs and header in view areas, ie. pluma-, caja-tabs */
-.gedit-bottom-panel-paned > grid > notebook > header.top,
-window.background > notebook > header.top, /* nautilus preferences */
-paned.horizontal > box.vertical > notebook > header.top,
-paned.horizontal > paned.vertical > notebook > header.top {
+/* notebooks, view, header and tabs in caja and pluma view */
+paned.horizontal notebook {
+    border-style: none;
+    border-color: @notebook_border;
+    border-width: 0px;
+    border-radius: 3px 3px 0px 0px;
+}
+
+paned.horizontal notebook header.top {
     border-style: solid;
     border-color: @notebook_border;
     border-width: 1px 0px 0px 1px;
@@ -1036,14 +1058,12 @@ paned.horizontal > paned.vertical > notebook > header.top {
     box-shadow: none;
 }
 
-.gedit-bottom-panel-paned > grid > notebook > header tab,
-window.background > notebook > header tab,
-paned.horizontal > notebook > header tab,
-paned.horizontal > box.vertical > notebook > header tab,
-paned.horizontal > paned.vertical > notebook > header tab {
-    background-image: linear-gradient(to bottom,
-                                      shade(@theme_bg_color, 1.1),
-                                      shade(@theme_bg_color, 0.77));
+paned.horizontal notebook header.top tab {
+    background-image: linear-gradient(to top,
+                                      shade(@theme_bg_color, 0.9),
+                                      shade(@theme_bg_color, 0.98) 40%,
+                                      shade(@theme_bg_color, 1.02) 70%,
+                                      @theme_bg_color);
     padding: 2px 4px;
     margin: 0px -0px 0px -1px;
     border-width: 0px 1px 0 1px;
@@ -1052,16 +1072,8 @@ paned.horizontal > paned.vertical > notebook > header tab {
     border-color: @notebook_border;
 }
 
-.gedit-bottom-panel-paned > grid > notebook > header tab:checked,
-.gedit-bottom-panel-paned > grid > notebook > header tab:checked:hover,
-window.background > notebook > header.top tab:checked,
-window.background > notebook > header.top tab:checked:hover,
-paned.horizontal > notebook > header.top tab:checked,
-paned.horizontal > notebook > header.top tab:checked:hover,
-paned.horizontal > box.vertical > notebook > header.top tab:checked,
-paned.horizontal > box.vertical > notebook > header.top tab:checked:hover,
-paned.horizontal > paned.vertical > notebook > header.top tab:checked,
-paned.horizontal > paned.vertical > notebook > header.top tab:checked:hover {
+paned.horizontal notebook header.top tab:checked,
+paned.horizontal notebook header.top tab:checked:hover {
     background-image: linear-gradient(to bottom,
                                       shade(@theme_bg_color, 0.9),
                                       shade(@theme_bg_color, 0.98) 40%,
@@ -1074,16 +1086,10 @@ paned.horizontal > paned.vertical > notebook > header.top tab:checked:hover {
     box-shadow: none;
 }
 
-.gedit-bottom-panel-paned > grid > notebook > header tab:hover,
-window.background > notebook > header.top tab:hover,
-paned.horizontal > notebook > header.top tab:hover,
-paned.horizontal > box.vertical > notebook > header.top tab:hover,
-paned.horizontal > paned.vertical > notebook > header.top tab:hover {
-    background-image: linear-gradient(to top,
-                                      shade(@theme_bg_color, 0.9),
-                                      shade(@theme_bg_color, 0.98) 40%,
-                                      shade(@theme_bg_color, 1.02) 70%,
-                                      @theme_bg_color);
+paned.horizontal notebook header.top tab:hover {
+    background-image: linear-gradient(to bottom,
+                                      shade(@theme_bg_color, 1.1),
+                                      shade(@theme_bg_color, 0.77));
     border-radius: 3px 3px 0 0;
     border-width: 0px 1px 0 1px;
     border-style: solid;
@@ -1091,45 +1097,16 @@ paned.horizontal > paned.vertical > notebook > header.top tab:hover {
     box-shadow: none;
 }
 
-.gedit-bottom-panel-paned > grid > notebook > header button.flat.small-button,
-paned.horizontal > box.vertical > notebook > header button.flat,
-paned.horizontal > paned.vertical > notebook > header button.flat {
-    padding: 1px;
-}
-
-/* other notebooks */
-stack frame > paned.horizontal > notebook {
-    border-width: 0px;
-    border-style: solid;
-    border-color: @notebook_border;
-    border-radius: 3px 3px 0px 0px;
-}
-
-stack frame > paned.horizontal > notebook:first-child {
-    border-width: 0px 1px 0px 0px;
-}
-
-stack frame > paned.horizontal > notebook:last-child {
-    border-width: 0px 0px 0px 1px;
-}
-
-stack frame > paned.horizontal > notebook:only-child {
-    border-width: 0px 1px 0px 1px;
+/* closable-page */
+paned.horizontal > notebook > header > tabs > tab > label {
+    min-height: 20px;
 }
 
-paned.horizontal > notebook > header {
-    border-width: 0px 0px 0px 0px;
+paned.horizontal > notebook > stack > box {
+    background-color: shade(@base_color, 1.02);
     border-style: solid;
     border-color: @notebook_border;
-    border-radius: 3px 3px 0px 0px;
-}
-
-paned.horizontal > notebook > header label {
-    padding: 4px;
-}
-
-paned.horizontal > notebook > header button.flat.small-button {
-    padding: 1px;
+    border-width: 0px 1px 1px 1px;
 }
 
 /* tabs in dialog windows */
@@ -1138,7 +1115,8 @@ window.background > box.vertical > notebook > header.top tab, /* pavu-control */
 window.background.csd > box.vertical > notebook > header.top tab,
 window.background.ssd > box.vertical > notebook > header.top tab,
 window.background.solid-csd > box.vertical > notebook > header.top tab,
-dialog.background.csd > box.vertical.dialog-vbox > notebook > header.top tab, /* meld preferences */
+dialog.background > box.vertical.dialog-vbox > notebook > header.top tab, /* meld preferences */
+dialog.background.csd > box.vertical.dialog-vbox > notebook > header.top tab,
 dialog.background.ssd > box.vertical.dialog-vbox > notebook > header.top tab,
 dialog.background.solid-csd > box.vertical.dialog-vbox > notebook > header.top tab,
 printdialog notebook > header.top tab,
@@ -1154,6 +1132,7 @@ window.background > box.vertical > notebook > header.top tab, /* pavu-control */
 window.background.csd > box.vertical > notebook > header.top tab,
 window.background.ssd > box.vertical > notebook > header.top tab,
 window.background.solid-csd > box.vertical > notebook > header.top tab,
+dialog.background > box.vertical.dialog-vbox > notebook > header.top tab, /* meld preferences */
 dialog.background.csd > box.vertical.dialog-vbox > notebook > header.top tab,
 dialog.background.ssd > box.vertical.dialog-vbox > notebook > header.top tab,
 dialog.background.solid-csd > box.vertical.dialog-vbox > notebook > header.top tab,
@@ -1166,9 +1145,11 @@ window.background > box.vertical > notebook > header.top tab:checked, /* pavu-co
 window.background.csd > box.vertical > notebook > header.top tab:checked,
 window.background.ssd > box.vertical > notebook > header.top tab:checked,
 window.background.solid-csd > box.vertical > notebook > header.top tab:checked,
+dialog.background > box.vertical.dialog-vbox > notebook > header.top tab:checked, /* meld preferences */
 dialog.background.csd > box.vertical.dialog-vbox > notebook > header.top tab:checked,
 dialog.background.ssd > box.vertical.dialog-vbox > notebook > header.top tab:checked,
 dialog.background.solid-csd > box.vertical.dialog-vbox > notebook > header.top tab:checked,
+dialog.background > box.vertical.dialog-vbox > notebook > header.top tab:checked:hover,
 dialog.background.csd > box.vertical.dialog-vbox > notebook > header.top tab:checked:hover,
 dialog.background.ssd > box.vertical.dialog-vbox > notebook > header.top tab:checked:hover,
 dialog.background.solid-csd > box.vertical.dialog-vbox > notebook > header.top tab:checked:hover,
@@ -1191,6 +1172,7 @@ window.background > box.vertical > notebook > header.top tab:hover, /* pavu-cont
 window.background.csd > box.vertical > notebook > header.top tab:hover,
 window.background.ssd > box.vertical > notebook > header.top tab:hover,
 window.background.solid-csd > box.vertical > notebook > header.top tab:hover,
+dialog.background > box.vertical.dialog-vbox > notebook > header.top tab:hover, /* meld preferences */
 dialog.background.csd > box.vertical.dialog-vbox > notebook > header.top tab:hover,
 dialog.background.ssd > box.vertical.dialog-vbox > notebook > header.top tab:hover,
 dialog.background.solid-csd > box.vertical.dialog-vbox > notebook > header.top tab:hover,
@@ -1358,10 +1340,10 @@ notebook.frame > header > button.flat.toggle.image-button.popup.circular {
     border-image: none;
 }
 
+/* close button styling */
 notebook button.flat,
-notebook > header button.flat,
-notebook > header button.flat.small-button {
-    padding: 0px;
+notebook button.flat.small-button {
+    padding: 1px;
     border-radius: 3px;
     border-image: none;
     border-style: none;
@@ -1369,8 +1351,8 @@ notebook > header button.flat.small-button {
     background-color: transparent;
 }
 
-notebook > header button.flat:hover,
-notebook > header button.flat.small-button:hover {
+notebook button.flat:hover,
+notebook button.flat.small-button:hover {
     -gtk-icon-effect: highlight;
     border-image: none;
     border-style: none;