Gtk+-3.22 Submarine themes: re-work borders for frames

fix for firefox lcation entry

4 files changed, 60 insertions, 87 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 e087cc90..17d1ce4f 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
@@ -37,8 +37,8 @@ window {
 }

 

 .background {

-    color: @theme_fg_color;

-    background-color: @theme_bg_color;

+	color: @theme_fg_color;

+	background-color: @theme_bg_color;

 }

 

 .background:backdrop {

@@ -244,10 +244,6 @@ statusbar {
     font-size: smaller;

 }

 

-statusbar frame {

-    border-style: none;

-}

-

 .dnd {

     border-width: 1px;

     border-style: solid;

@@ -897,26 +893,20 @@ scale.vertical.color.marks-after.fine-tune slider {
  * Frames *

  **********/

 

-frame {

-    padding: 2px;

+.frame,

+frame > border { /* firefox location entry */

+    padding: 0px;

     border-width: 1px;

     border-radius: 4px;

     border-style: solid;

-    border-color: shade (@theme_bg_color, 0.85);

-    border-top-color:    shade(@notebook_border, 1.25);

-    border-left-color:   shade(@notebook_border, 1.25);

-    border-right-color:  shade(@notebook_border, 1.25);

-    border-bottom-color: shade(@notebook_border, 1.25);

+    border-color:  shade (@theme_bg_color, 0.85);

     color: mix(@theme_selected_bg_color, @theme_fg_color, 0.70);

 }

 

-/* only render frames in a GtkScrolledWindow */

-scrolledwindow.frame {

-    border-width:  1px;

-    border-radius: 0;

-    border-style:  solid;

-    border-color:  shade (@theme_bg_color, 0.85);

-    padding: 0px;

+.frame.flat,

+frame > border.flat,

+overlay > frame > border {

+    border-style: none;

 }

 

 /***********

@@ -3464,11 +3454,6 @@ notebook.frame {
     border-radius: 4px 4px 0px 0px;

 }

 

-notebook.frame frame {

-    border-style: none;

-    border-width: 0px;

-}

-

 /* pavu-control */

 window.background > box.vertical > notebook:not(.frame),

 window.background.csd > box.vertical > notebook:not(.frame),

@@ -4914,20 +4899,9 @@ messagedialog {
     padding: 0;

 }

 

-/* ie. mate-keyboard-properties option window or pluma preferences */

-dialog notebook.frame box.vertical > box.vertical > scrolledwindow.frame,

-dialog notebook.frame box.vertical > box.vertical > box.horizontal box.vertical > scrolledwindow.frame {

-    border-color: @notebook_border;

-    border-style: solid;

-    border-width: 1px;

-    border-radius: 2px;

-}

-

 /* ie. caja properties-window notes tab */

-dialog notebook.frame scrolledwindow.frame {

+dialog notebook.frame > stack > scrolledwindow.frame {

     border-style: none;

-    border-width: 0px;

-    border-radius: 0px;

 }

 

 /* credits in GtkAbout windows */

@@ -6622,10 +6596,16 @@ undershoot.right {
  * GtkStack *

  ************/

 

-stack .horizontal .vertical frame {

+stack > .horizontal > .vertical > frame > border {

     background-color: shade (@theme_bg_color, 1.1);

-    border-width: 1px;

-    border-color: @notebook_border;

+    border-radius: 4px;

+}

+

+stacksidebar.sidebar,

+stacksidebar.sidebar > scrolledwindow,

+stacksidebar.sidebar > scrolledwindow > viewport.frame,

+stacksidebar.sidebar > scrolledwindow > viewport.frame list {

+    border-radius: 4px 0px 0px 4px;

 }

 

 stacksidebar.sidebar list row.activatable:hover {

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 ad8c6d17..dabe97d1 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
@@ -243,6 +243,10 @@ paned.horizontal > box.vertical.caja-side-pane > notebook scrolledwindow.frame {
 /* eventbars, ie. search results */
 .caja-notebook box.vertical frame {
     background-color: shade (@theme_bg_color, 1.02);
+}
+
+/* needed as this is used for firefox locationbar */
+.caja-notebook box.vertical > frame > border {
     border-style: none;
     border-radius: 0px;
 }
@@ -252,7 +256,7 @@ paned.horizontal > box.vertical.caja-side-pane > notebook scrolledwindow.frame {
     border-color: @notebook_border;
     border-width: 1px;
     border-style: solid;
-    border-radius: 4px;
+    border-radius: 4px 4px 0px 0px;
 }
 
 .caja-notebook #caja-extra-view-widget button.flat {
@@ -692,17 +696,20 @@ na-tray-applet > widget > box {
 
 .mate-panel-applet-slider frame {
     background-color: rgba(0,0,0,0.5);
-    border-image: none;
-    border-style: none;
-    border-radius:4px;
     padding: 1px;
     margin: 0px;
+    border-radius:4px;
     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);
 }
 
+.mate-panel-applet-slider frame border {
+    border-image: none;
+    border-style: none;
+}
+
 .mate-panel-applet-slider frame frame {
     background-color:transparent;
     box-shadow: none;
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 bc72ee5f..3a9048ef 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
@@ -48,7 +48,6 @@ window {
 

 *:active {

 /*    background-color: alpha(shade(@theme_selected_bg_color, 1.90), 0.015);*/

-

 }

 

 *:hover:active:disabled {

@@ -246,10 +245,6 @@ statusbar {
     font-size: smaller;

 }

 

-statusbar frame {

-    border-style: none;

-}

-

 .dnd {

     border-width: 1px;

     border-style: solid;

@@ -901,26 +896,20 @@ scale.vertical.color.marks-after.fine-tune slider {
  * Frames *

  **********/

 

-frame {

-    padding: 2px;

+.frame,

+frame > border { /* firefox location entry */

+    padding: 0px;

     border-width: 1px;

     border-radius: 4px;

     border-style: solid;

-    border-color: shade (@theme_bg_color, 0.85);

-    border-top-color:    shade(@notebook_border, 1.25);

-    border-left-color:   shade(@notebook_border, 1.25);

-    border-right-color:  shade(@notebook_border, 1.25);

-    border-bottom-color: shade(@notebook_border, 1.25);

+    border-color:  shade (@theme_bg_color, 0.85);

     color: mix(@theme_selected_bg_color, @theme_fg_color, 0.70);

 }

 

-/* only render frames in a GtkScrolledWindow */

-scrolledwindow.frame {

-    border-width:  1px;

-    border-radius: 0;

-    border-style:  solid;

-    border-color:  shade (@theme_bg_color, 0.85);

-    padding: 0px;

+.frame.flat,

+frame > border.flat,

+overlay > frame > border {

+    border-style: none;

 }

 

 /***********

@@ -3464,11 +3453,6 @@ notebook.frame {
     border-radius: 4px 4px 0px 0px;

 }

 

-notebook.frame frame {

-     border-style: none;

-     border-width: 0px;

-}

-

 /* pavu-control */

 window.background > box.vertical > notebook:not(.frame),

 window.background.csd > box.vertical > notebook:not(.frame),

@@ -4919,20 +4903,9 @@ messagedialog {
     padding: 0;

 }

 

-/* ie. mate-keyboard-properties option window or pluma preferences */

-dialog notebook.frame box.vertical > box.vertical > scrolledwindow.frame,

-dialog notebook.frame box.vertical > box.vertical > box.horizontal box.vertical > scrolledwindow.frame {

-    border-color: @notebook_border;

-    border-style: solid;

-    border-width: 1px;

-    border-radius: 2px;

-}

-

 /* ie. caja properties-window notes tab */

-dialog notebook.frame scrolledwindow.frame {

+dialog notebook.frame > stack > scrolledwindow.frame {

     border-style: none;

-    border-width: 0px;

-    border-radius: 0px;

 }

 

 /* credits in GtkAbout windows */

@@ -6621,10 +6594,16 @@ undershoot.right {
  * GtkStack *

  ************/

 

-stack .horizontal .vertical frame {

+stack > .horizontal > .vertical > frame > border {

     background-color: shade (@theme_bg_color, 1.1);

-    border-width: 1px;

-    border-color: @notebook_border;

+    border-radius: 4px;

+}

+

+stacksidebar.sidebar,

+stacksidebar.sidebar > scrolledwindow,

+stacksidebar.sidebar > scrolledwindow > viewport.frame,

+stacksidebar.sidebar > scrolledwindow > viewport.frame list {

+    border-radius: 4px 0px 0px 4px;

 }

 

 stacksidebar.sidebar list row.activatable:hover {

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 975fe944..100615f1 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css
@@ -255,6 +255,10 @@ paned.horizontal > box.vertical.caja-side-pane > notebook scrolledwindow.frame {
 /* eventbars, ie. search results */
 .caja-notebook box.vertical frame {
     background-color: shade (@theme_bg_color, 1.02);
+}
+
+/* needed as this is used for firefox locationbar */
+.caja-notebook box.vertical > frame > border {
     border-style: none;
     border-radius: 0px;
 }
@@ -264,7 +268,7 @@ paned.horizontal > box.vertical.caja-side-pane > notebook scrolledwindow.frame {
     border-color: @notebook_border;
     border-width: 1px;
     border-style: solid;
-    border-radius: 4px;
+    border-radius: 4px 4px 0px 0px;
 }
 
 .caja-notebook #caja-extra-view-widget button.flat {
@@ -704,17 +708,20 @@ na-tray-applet > widget > box {
 
 .mate-panel-applet-slider frame {
     background-color: rgba(0,0,0,0.5);
-    border-image: none;
-    border-style: none;
-    border-radius:4px;
     padding: 1px;
     margin: 0px;
+    border-radius:4px;
     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);
 }
 
+.mate-panel-applet-slider frame border {
+    border-image: none;
+    border-style: none;
+}
+
 .mate-panel-applet-slider frame frame {
     background-color:transparent;
     box-shadow: none;