1 files changed, 65 insertions, 19 deletions
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 fa75b81d..2792315d 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
@@ -5655,6 +5655,18 @@ popover button.image-button:disabled {
                 inset  0px -1px @insensitive_border_color;
 }
 
+popover > box > button.text-button,
+popover > box > button.text-button:hover,
+popover > box > button.text-button:focus { /* ie. gedit menu button popover */
+    padding: 6px;
+}
+
+popover > box > button.text-button { /* ie. gedit menu button popover */
+    background-image: none;
+    color: @theme_fg_dark_color;
+    border-radius: 6px;
+}
+
 modelbutton.flat,
 .linked button.image-button.model {
     min-height: 24px;
@@ -5675,7 +5687,7 @@ modelbutton.flat:last-child,
 modelbutton.flat:only-child {
     background-image: none;
     color: @theme_fg_dark_color;
-    border-radius: 4px;
+    border-radius: 6px;
     padding: 6px 0px 6px 6px;
 }
 
@@ -5703,14 +5715,16 @@ modelbutton.flat:checked:disabled:only-child,
 modelbutton.flat:only-child,
 modelbutton.flat:focus:only-child,
 modelbutton.flat:checked:focus:only-child,
-.linked button.image-button.model {
+.linked button.image-button.model,
+popover > box > button.text-button { /* ie. gedit menu button popover */
+
     background-color: shade (@theme_bg_dark_color, 1.0);
     background-image: none;
     border-color: transparent;
     border-image: none;
     border-style: none;
     box-shadow: none;
-    border-radius: 3px;
+    border-radius: 6px;
 }
 
 modelbutton.flat:checked:hover:only-child,
@@ -5736,7 +5750,12 @@ modelbutton.flat:checked:hover:active,
 modelbutton.flat:focus:hover:active,
 modelbutton.flat:hover:active,
 modelbutton.flat:hover,
-modelbutton.flat:selected {
+modelbutton.flat:selected,
+popover > box > button.text-button:hover,
+popover > box > button.text-button:checked,
+popover > box > button.text-button:hover:active,
+popover > box > button.text-button:checked:hover,
+popover > box > button.text-button:checked:hover:active {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (shade(@menu_bg_dark_color, 2.03)),
@@ -5812,6 +5831,10 @@ modelbutton.flat:selected {
     border-radius: 0 6px 6px 0;
 }
 
+popover > box > button.text-button:disabled {
+    color: mix (@menu_fg_dark_color, @menu_bg_dark_color, 0.4);
+}
+
 popover button.default.text-button.suggested-action {
     background-image: none;
     color: @theme_fg_dark_color;
@@ -5870,26 +5893,46 @@ entry.cursor-handle.bottom,
  ***************/
 
 headerbar,
-.titlebar {
-    border-width: 0 0 1px;
-    border-style: solid;
-    border-color: shade(@borders, 0.90);
-    border-radius: 7px 7px 0px 0px;
-    box-shadow: inset 0 -1px shade(@wm_bg_b, 0.95);
+.background.ssd > paned.horizontal.titlebar,
+.background.csd > paned.horizontal.titlebar,
+.background.solid-csd > paned.horizontal.titlebar {
     background-color: @theme_bg_dark_color;
-    padding: 6px 6px 5px 6px;
     background-image: linear-gradient(to bottom,
                                       @wm_bg_a,
                                       @wm_bg_b);
+    box-shadow: inset 0 -1px shade(@wm_bg_b, 0.95);
 }
 
-/* fix for gedit, .titlebar does not match headerbar selector */
++headerbar.titlebar,
++.background.ssd > paned.horizontal.titlebar,
 .background.csd > paned.horizontal.titlebar,
 .background.solid-csd > paned.horizontal.titlebar {
-    background-color: transparent;
-    padding: 0px;
-    margin: -2px -2px -2px -2px;
-    border-width: 0px;
+    border-width: 0px 0px 1px 0px;
+    border-style: solid;
+    border-color: shade(@borders, 0.90);
+    border-radius: 7px 7px 0px 0px;
+    padding: 6px 6px 5px 6px;
+}
+
+/* fix for gedit, .titlebar does not match headerbar selector */
+.background.ssd > paned.horizontal.titlebar > headerbar,
+.background.csd > paned.horizontal.titlebar > headerbar,
+.background.solid-csd > paned.horizontal.titlebar > headerbar {
+    box-shadow: none;
+}
+
+.background.ssd > paned.horizontal.titlebar > separator, /* gedit */
+.background.csd > paned.horizontal.titlebar > separator,
+.background.solid-csd > paned.horizontal.titlebar > separator {
+    min-width: 1px;
+    background-color: shade(@menu_fg_dark_color, 0.3);
+    border-image: -gtk-gradient (linear,
+                                 left top, right top,
+                                 from (alpha (#000, 0.00)),
+                                 color-stop (0.25, alpha (#000, 0.03)),
+                                 color-stop (0.85, alpha (#000, 0.03)),
+                                 to (alpha (#000, 0.00))) 1;
+    border-style: solid;
 }
 
 /* ie. meld */
@@ -5899,8 +5942,8 @@ dialog.background.solid-csd > headerbar.titlebar  {
 	padding:  4px 6px 5px 6px;
 }
 
-headerbar:backdrop,
-.titlebar:backdrop {
+headerbar.titlebar:backdrop {
+
     border-image: linear-gradient(to top,
                                   @unfocused_borders,
                                   @unfocused_borders 1px,
@@ -6008,7 +6051,10 @@ headerbar .linked button:checked:hover:active:only-child {
 
 headerbar button:disabled,
 headerbar button:disabled:last-child,
-headerbar button:disabled:first-child {
+headerbar button:disabled:first-child,
+headerbar .linked button:disabled,
+headerbar .linked button:disabled:last-child,
+headerbar .linked button:disabled:first-child {
     color: @theme_text_dark_color;
     background-image: none;
     background-color: @theme_bg_dark_color;