GTK3 submarine themes: adjust notebook tabs in pluma text area

4 files changed, 52 insertions, 44 deletions

diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
index 4fdf8091..381635bb 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
@@ -3058,7 +3058,7 @@ GtkLinkButton.button.flat:hover {
     -GtkNotebook-initial-gap: 0;

     -GtkNotebook-arrow-spacing: 5;

     -GtkNotebook-tab-curvature: 0;

-    -GtkNotebook-tab-overlap: 0;

+    -GtkNotebook-tab-overlap: 1;

     -GtkNotebook-has-tab-gap: false;

     -GtkWidget-focus-padding: 0;

     -GtkWidget-focus-line-width: 0;

diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css b/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
index 8ec3c516..3adb49c6 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
@@ -1072,33 +1072,37 @@ PlumaWindow .button.flat:hover {
     padding: 2px 5px;
 }
 
-/* surpress styling of close button */
-PlumaWindow .notebook tab .button.flat,
-PlumaWindow .notebook tab .button.flat:hover {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    box-shadow: inset 0 1px rgba(255,255,255,0), 0 1px rgba(255,255,255,0);
-    text-shadow: none;
-    icon-shadow: none;
-    border-image: none;
+/* notebook text area */
+PlumaWindow .notebook {
+    border-style: none;
+    -GtkNotebook-tab-overlap: 1;
 }
 
-PlumaCloseButton.button.flat,
-PlumaCloseButton.button.flat:hover,
-PlumaCloseButton:prelight.button.flat,
-PlumaCloseButton:prelight.button.flat:hover {
-    padding: 1px;
-    -gtk-image-effect: highlight;
+PlumaWindow .notebook tab.top {
+    border-radius: 4px 4px 0px 0px;
+    border-width: 1px 1px 0px 1px;
+    border-color: @notebook_border;
+    border-style: solid;
+    padding: 5px 4px;
 }
 
-PlumaWindow .notebook.frame.top,
-PlumaWindow .notebook.header.top {
-    border-width: 0px 0px 0px 0px;
+PlumaWindow .notebook.header {
+    border-radius: 0px;
+    border-style: none;
 }
 
-PlumaWindow .notebook tab.top {
-    padding: 8px 4px 7px 6px;
+/* surpress styling of close button */
+PlumaWindow .notebook tab .button.flat {
+    background-image: none;
+    box-shadow: none;
+    padding: 1px;
+}
+
+PlumaWindow .notebook tab .button.flat:hover {
+    box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.3),
+                inset  1px  0px shade (@theme_selected_bg_color, 1.3),
+                inset -1px  0px shade (@theme_selected_bg_color, 1.3),
+                inset  0px -1px shade (@theme_selected_bg_color, 1.3);
 }
 
 /* Printpreview */
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
index 8fe89e2c..1da87dfb 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
@@ -3040,7 +3040,7 @@ GtkLinkButton.button.flat:hover {
     -GtkNotebook-initial-gap: 0;

     -GtkNotebook-arrow-spacing: 5;

     -GtkNotebook-tab-curvature: 0;

-    -GtkNotebook-tab-overlap: 0;

+    -GtkNotebook-tab-overlap: 1;

     -GtkNotebook-has-tab-gap: false;

     -GtkWidget-focus-padding: 0;

     -GtkWidget-focus-line-width: 0;

diff --git a/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css b/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css
index cb5f1582..3c0b949c 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css
@@ -1073,33 +1073,37 @@ PlumaWindow .button.flat:hover {
     padding: 2px 5px;
 }
 
-/* surpress styling of close button */
-PlumaWindow .notebook tab .button.flat,
-PlumaWindow .notebook tab .button.flat:hover {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    box-shadow: inset 0 1px rgba(255,255,255,0), 0 1px rgba(255,255,255,0);
-    text-shadow: none;
-    icon-shadow: none;
-    border-image: none;
+/* notebook text area */
+PlumaWindow .notebook {
+    border-style: none;
+    -GtkNotebook-tab-overlap: 1;
 }
 
-PlumaCloseButton.button.flat,
-PlumaCloseButton.button.flat:hover,
-PlumaCloseButton:prelight.button.flat,
-PlumaCloseButton:prelight.button.flat:hover {
-    padding: 1px;
-    -gtk-image-effect: highlight;
+PlumaWindow .notebook tab.top {
+    border-radius: 4px 4px 0px 0px;
+    border-width: 1px 1px 0px 1px;
+    border-color: @notebook_border;
+    border-style: solid;
+    padding: 5px 4px;
 }
 
-PlumaWindow .notebook.frame.top,
-PlumaWindow .notebook.header.top {
-    border-width: 0px 0px 0px 0px;
+PlumaWindow .notebook.header {
+    border-radius: 0px;
+    border-style: none;
 }
 
-PlumaWindow .notebook tab.top {
-    padding: 8px 4px 7px 6px;
+/* surpress styling of close button */
+PlumaWindow .notebook tab .button.flat {
+    background-image: none;
+    box-shadow: none;
+    padding: 1px;
+}
+
+PlumaWindow .notebook tab .button.flat:hover {
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
 }
 
 /* Printpreview */