Menta themes GTK+-3.16: adjustments for window-frame (csd apps) -->

- enable windows shadows for compositor
- add stylying for new widget window-frame.solid-csd (non compositor)

6 files changed, 131 insertions, 116 deletions

diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-main.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-main.css
index aee1e6c4..954ed51d 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-main.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-main.css
@@ -224,6 +224,9 @@
 @define-color wm_button_bg_active_b shade (@theme_bg_color, 0.9);
 @define-color wm_button_bg_active_c shade (@theme_bg_color, 0.9);
 
+/* csd border */
+@define-color wm_csd_solid_border_color shade (#3c3c3c, 1.2);
+
 @import url("gtk-main-common.css");
 @import url("gtk-widgets-backgrounds.css");
 @import url("gtk-widgets-borders.css");
diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
index 8cda950e..a1d2ceb2 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
@@ -2648,10 +2648,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
 	border-width: 0px 0px 0px 0px;
 	border-style: solid;
 	border-color: shade(@borders, 0.90);
-
 	box-shadow: inset 0 -1px shade(@wm_bg_b, 0.95);
 	background-color: @theme_bg_color;
-
 	padding: 6px;
 }
 
@@ -4509,7 +4507,9 @@ GtkModelButton.button.flat:selected {
  *******/
 .titlebar {
     text-shadow: 0 1px @wm_title_shadow;
-    background-image: none;
+    background-image: linear-gradient(to bottom,
+                                      @wm_bg_a,
+                                      @wm_bg_b);
     border-radius: 6px 6px 0px 0px;
     box-shadow: inset 0 -1px alpha(@theme_base_color, 0.4);
     border-color: @borders;
@@ -4566,20 +4566,16 @@ GtkModelButton.button.flat:selected {
     icon-shadow: none;
 }
 
-/****************************************************************************************
-* Give and take related to recent gtk3.3.14 development,                                *
-* to achieve full size of the icon menu of some of the applications whose notification  *
-* icons appear in the system tray, the "shadow" is disabled.                            *
-* same affect in mate-panel main menu, csd apps, header-bars apps                       *
-* if compositor switch to disable !!!!!                                                 *
-*****************************************************************************************/
-
 .window-frame {
-    border-radius: 0px 0px 0px 0px;
-    border-width: 1px;
-    box-shadow: 0 0 0 @wm_shadow;
+    border-radius: 6px 6px 0px 0px;
+    border-width: 0px;
+    box-shadow: 0 0 0 1px @wm_border, 0 2px 8px 3px @wm_shadow;
     /* this is used for the resize cursor area */
-    margin: 2px;
+    margin: 10px;
+}
+
+.window-frame:backdrop {
+    box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px @wm_shadow;
 }
 
 .window-frame.tiled {
@@ -4587,8 +4583,16 @@ GtkModelButton.button.flat:selected {
     background-color: @theme_bg_color;
 }
 
-.window-frame:backdrop {
-    box-shadow: 0 0 0 @wm_shadow;
+.window-frame.ssd {
+    box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.23);
+}
+
+.window-frame.solid-csd {
+    border-radius: 0;
+    margin: 2px;
+    background-color: @wm_bg_a;
+    border: solid 1px @wm_csd_solid_border_color;
+    box-shadow: none;
 }
 
 .window-frame.csd.popup {
diff --git a/desktop-themes/BlueMenta/metacity-1/metacity-theme-1.xml b/desktop-themes/BlueMenta/metacity-1/metacity-theme-1.xml
index d5e9dd05..e16c5702 100644
--- a/desktop-themes/BlueMenta/metacity-1/metacity-theme-1.xml
+++ b/desktop-themes/BlueMenta/metacity-1/metacity-theme-1.xml
@@ -11,55 +11,55 @@
 
 <!-- General window layout -->
 <frame_geometry name="frame_geometry_normal" title_scale="medium" rounded_top_left="true" rounded_top_right="true"  rounded_bottom_left="false" rounded_bottom_right="false">
- 	<distance name="left_width" value="1"/>
-	<distance name="right_width" value="1"/>
-	<distance name="bottom_height" value="1"/>
-	<distance name="left_titlebar_edge" value="4"/>
-	<distance name="right_titlebar_edge" value="1"/>
-	<distance name="button_width" value="24"/>
-	<distance name="button_height" value="24"/>
-	<distance name="title_vertical_pad" value="8"/>
-	<border name="title_border" left="2" right="2" top="0" bottom="0"/>
-	<border name="button_border" left="0" right="0" top="4" bottom="0"/>
+    <distance name="left_width" value="1"/>
+    <distance name="right_width" value="1"/>
+    <distance name="bottom_height" value="1"/>
+    <distance name="left_titlebar_edge" value="4"/>
+    <distance name="right_titlebar_edge" value="1"/>
+    <distance name="button_width" value="24"/>
+    <distance name="button_height" value="24"/>
+    <distance name="title_vertical_pad" value="8"/>
+    <border name="title_border" left="2" right="2" top="0" bottom="0"/>
+    <border name="button_border" left="0" right="0" top="4" bottom="0"/>
 </frame_geometry>
 
 <frame_geometry name="frame_geometry_abnormal" title_scale="medium" rounded_top_left="false" rounded_top_right="false">
-  	<distance name="left_width" value="0"/>
-  	<distance name="right_width" value="0"/>
-  	<distance name="bottom_height" value="0"/>
-  	<distance name="left_titlebar_edge" value="4"/>
-  	<distance name="right_titlebar_edge" value="1"/>
-  	<distance name="button_width" value="24"/>
- 	<distance name="button_height" value="24"/>
-  	<distance name="title_vertical_pad" value="2"/>
-  	<border name="title_border" left="2" right="2" top="0" bottom="0"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
+    <distance name="left_width" value="0"/>
+    <distance name="right_width" value="0"/>
+    <distance name="bottom_height" value="0"/>
+    <distance name="left_titlebar_edge" value="4"/>
+    <distance name="right_titlebar_edge" value="1"/>
+    <distance name="button_width" value="24"/>
+    <distance name="button_height" value="24"/>
+    <distance name="title_vertical_pad" value="2"/>
+    <border name="title_border" left="2" right="2" top="0" bottom="0"/>
+    <border name="button_border" left="0" right="0" top="0" bottom="0"/>
 </frame_geometry>
 
 <frame_geometry name="geometry_maximized" rounded_top_left="false" rounded_top_right="false" rounded_bottom_left="false" rounded_bottom_right="false">
-	<distance name="left_width" value="0"/>
-	<distance name="right_width" value="0"/>
-	<distance name="bottom_height" value="0"/>
-	<distance name="left_titlebar_edge" value="4"/>
-  	<distance name="right_titlebar_edge" value="1"/>
-  	<distance name="button_width" value="24"/>
-  	<distance name="button_height" value="24"/>
-  	<distance name="title_vertical_pad" value="8"/>
-  	<border name="title_border" left="2" right="2" top="4" bottom="0"/>
- 	<border name="button_border" left="0" right="0" top="4" bottom="0"/>
+    <distance name="left_width" value="0"/>
+    <distance name="right_width" value="0"/>
+    <distance name="bottom_height" value="0"/>
+    <distance name="left_titlebar_edge" value="4"/>
+    <distance name="right_titlebar_edge" value="1"/>
+    <distance name="button_width" value="24"/>
+    <distance name="button_height" value="24"/>
+    <distance name="title_vertical_pad" value="8"/>
+    <border name="title_border" left="2" right="2" top="4" bottom="0"/>
+    <border name="button_border" left="0" right="0" top="4" bottom="0"/>
 </frame_geometry>
 
-<frame_geometry name="border" has_title="false" rounded_top_left="true" rounded_top_right="true"  rounded_bottom_left="false" rounded_bottom_right="false">
-	<distance name="left_width" value="1"/>
-	<distance name="right_width" value="1"/>
-	<distance name="bottom_height" value="1"/>
-	<distance name="left_titlebar_edge" value="0"/>
-	<distance name="right_titlebar_edge" value="0"/>
-  	<distance name="button_width" value="0"/>
-  	<distance name="button_height" value="0"/>
-	<distance name="title_vertical_pad" value="0"/>
-	<border name="title_border" left="0" right="0" top="6" bottom="0"/>
-  	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
+<frame_geometry name="border" has_title="false">
+    <distance name="left_width" value="3"/>
+    <distance name="right_width" value="3"/>
+    <distance name="bottom_height" value="3"/>
+    <distance name="left_titlebar_edge" value="0"/>
+    <distance name="right_titlebar_edge" value="0"/>
+    <distance name="button_width" value="0"/>
+    <distance name="button_height" value="0"/>
+    <distance name="title_vertical_pad" value="3"/>
+    <border name="title_border" left="0" right="0" top="0" bottom="0"/>
+    <border name="button_border" left="0" right="0" top="0" bottom="0"/>
 </frame_geometry>
 
 <!-- Window Title -->
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-main.css b/desktop-themes/Menta/gtk-3.0/gtk-main.css
index 212d519b..d7490bb8 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-main.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-main.css
@@ -207,7 +207,8 @@
 @define-color wm_bg_a shade (@theme_bg_color, 1.1);
 @define-color wm_bg_b @theme_bg_color;
 
-@define-color wm_shadow alpha(black, 0.18);
+@define-color wm_shadow alpha(black, 0.5);
+@define-color wm_border alpha(black,0.18);
 
 @define-color wm_button_bg_a shade (@theme_bg_color, 1.0);
 @define-color wm_button_bg_b shade (@theme_bg_color, 0.85);
@@ -223,6 +224,9 @@
 @define-color wm_button_bg_active_b shade (@theme_bg_color, 0.9);
 @define-color wm_button_bg_active_c shade (@theme_bg_color, 0.9);
 
+/* csd border */
+@define-color wm_csd_solid_border_color shade (#3c3c3c, 1.2);
+
 @import url("gtk-main-common.css");
 @import url("gtk-widgets-backgrounds.css");
 @import url("gtk-widgets-borders.css");
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
index 2f11e4c6..c8304336 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
@@ -2651,10 +2651,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
 	border-width: 0px 0px 0px 0px;
 	border-style: solid;
 	border-color: shade(@borders, 0.90);
-
 	box-shadow: inset 0 -1px shade(@wm_bg_b, 0.95);
 	background-color: @theme_bg_color;
-
 	padding: 6px;
 }
 
@@ -4504,7 +4502,9 @@ GtkModelButton.button.flat:selected {
  *******/
 .titlebar {
     text-shadow: 0 1px @wm_title_shadow;
-    background-image: none;
+    background-image: linear-gradient(to bottom,
+                                      @wm_bg_a,
+                                      @wm_bg_b);
     border-radius: 6px 6px 0px 0px;
     box-shadow: inset 0 -1px alpha(@theme_base_color, 0.4);
     border-color: @borders;
@@ -4561,20 +4561,16 @@ GtkModelButton.button.flat:selected {
     icon-shadow: none;
 }
 
-/****************************************************************************************
-* Give and take related to recent gtk3.3.14 development,                                *
-* to achieve full size of the icon menu of some of the applications whose notification  *
-* icons appear in the system tray, the "shadow" is disabled.                            *
-* same affect in mate-panel main menu, csd apps, header-bars apps                       *
-* if compositor switch to disable !!!!!                                                 *
-*****************************************************************************************/
-
 .window-frame {
-    border-radius: 0px 0px 0px 0px;
-    border-width: 1px;
-    box-shadow: 0 0 0 @wm_shadow;
+    border-radius: 6px 6px 0px 0px;
+    border-width: 0px;
+    box-shadow: 0 0 0 1px @wm_border, 0 2px 8px 3px @wm_shadow;
     /* this is used for the resize cursor area */
-    margin: 2px;
+    margin: 10px;
+}
+
+.window-frame:backdrop {
+    box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px @wm_shadow;
 }
 
 .window-frame.tiled {
@@ -4582,8 +4578,16 @@ GtkModelButton.button.flat:selected {
     background-color: @theme_bg_color;
 }
 
-.window-frame:backdrop {
-    box-shadow: 0 0 0 @wm_shadow;
+.window-frame.ssd {
+    box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.23);
+}
+
+.window-frame.solid-csd {
+    border-radius: 0;
+    margin: 2px;
+    background-color: @wm_bg_a;
+    border: solid 1px @wm_csd_solid_border_color;
+    box-shadow: none;
 }
 
 .window-frame.csd.popup {
diff --git a/desktop-themes/Menta/metacity-1/metacity-theme-1.xml b/desktop-themes/Menta/metacity-1/metacity-theme-1.xml
index 2c0af0e2..1ea24e11 100644
--- a/desktop-themes/Menta/metacity-1/metacity-theme-1.xml
+++ b/desktop-themes/Menta/metacity-1/metacity-theme-1.xml
@@ -11,55 +11,55 @@
 
 <!-- General window layout -->
 <frame_geometry name="frame_geometry_normal" title_scale="medium" rounded_top_left="true" rounded_top_right="true"  rounded_bottom_left="false" rounded_bottom_right="false">
- 	<distance name="left_width" value="1"/>
-	<distance name="right_width" value="1"/>
-	<distance name="bottom_height" value="1"/>
-	<distance name="left_titlebar_edge" value="4"/>
-	<distance name="right_titlebar_edge" value="1"/>
-	<distance name="button_width" value="24"/>
-	<distance name="button_height" value="24"/>
-	<distance name="title_vertical_pad" value="8"/>
-	<border name="title_border" left="2" right="2" top="0" bottom="0"/>
+    <distance name="left_width" value="1"/>
+    <distance name="right_width" value="1"/>
+    <distance name="bottom_height" value="1"/>
+    <distance name="left_titlebar_edge" value="4"/>
+    <distance name="right_titlebar_edge" value="1"/>
+    <distance name="button_width" value="24"/>
+    <distance name="button_height" value="24"/>
+    <distance name="title_vertical_pad" value="8"/>
+    <border name="title_border" left="2" right="2" top="0" bottom="0"/>
 	<border name="button_border" left="0" right="0" top="4" bottom="0"/>
 </frame_geometry>
 
 <frame_geometry name="frame_geometry_abnormal" title_scale="medium" rounded_top_left="false" rounded_top_right="false">
-  	<distance name="left_width" value="0"/>
-  	<distance name="right_width" value="0"/>
-  	<distance name="bottom_height" value="0"/>
-  	<distance name="left_titlebar_edge" value="4"/>
-  	<distance name="right_titlebar_edge" value="1"/>
-  	<distance name="button_width" value="24"/>
- 	<distance name="button_height" value="24"/>
-  	<distance name="title_vertical_pad" value="2"/>
-  	<border name="title_border" left="2" right="2" top="0" bottom="0"/>
-	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
+    <distance name="left_width" value="0"/>
+    <distance name="right_width" value="0"/>
+    <distance name="bottom_height" value="0"/>
+    <distance name="left_titlebar_edge" value="4"/>
+    <distance name="right_titlebar_edge" value="1"/>
+    <distance name="button_width" value="24"/>
+    <distance name="button_height" value="24"/>
+    <distance name="title_vertical_pad" value="2"/>
+    <border name="title_border" left="2" right="2" top="0" bottom="0"/>
+    <border name="button_border" left="0" right="0" top="0" bottom="0"/>
 </frame_geometry>
 
 <frame_geometry name="geometry_maximized" rounded_top_left="true" rounded_top_right="true" rounded_bottom_left="false" rounded_bottom_right="false">
-	<distance name="left_width" value="0"/>
-	<distance name="right_width" value="0"/>
-	<distance name="bottom_height" value="0"/>
-	<distance name="left_titlebar_edge" value="4"/>
-  	<distance name="right_titlebar_edge" value="1"/>
-  	<distance name="button_width" value="24"/>
-  	<distance name="button_height" value="24"/>
-  	<distance name="title_vertical_pad" value="8"/>
-  	<border name="title_border" left="2" right="2" top="4" bottom="0"/>
- 	<border name="button_border" left="0" right="0" top="4" bottom="0"/>
+    <distance name="left_width" value="0"/>
+    <distance name="right_width" value="0"/>
+    <distance name="bottom_height" value="0"/>
+    <distance name="left_titlebar_edge" value="4"/>
+    <distance name="right_titlebar_edge" value="1"/>
+    <distance name="button_width" value="24"/>
+    <distance name="button_height" value="24"/>
+    <distance name="title_vertical_pad" value="8"/>
+    <border name="title_border" left="2" right="2" top="4" bottom="0"/>
+    <border name="button_border" left="0" right="0" top="4" bottom="0"/>
 </frame_geometry>
 
-<frame_geometry name="border" has_title="false" rounded_top_left="true" rounded_top_right="true"  rounded_bottom_left="false" rounded_bottom_right="false">
-	<distance name="left_width" value="1"/>
-	<distance name="right_width" value="1"/>
-	<distance name="bottom_height" value="1"/>
-	<distance name="left_titlebar_edge" value="0"/>
-	<distance name="right_titlebar_edge" value="0"/>
-  	<distance name="button_width" value="0"/>
-  	<distance name="button_height" value="0"/>
-	<distance name="title_vertical_pad" value="0"/>
-  	<border name="title_border" left="0" right="0" top="6" bottom="0"/>
-  	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
+<frame_geometry name="border" has_title="false">
+    <distance name="left_width" value="3"/>
+    <distance name="right_width" value="3"/>
+    <distance name="bottom_height" value="3"/>
+    <distance name="left_titlebar_edge" value="0"/>
+    <distance name="right_titlebar_edge" value="0"/>
+    <distance name="button_width" value="0"/>
+    <distance name="button_height" value="0"/>
+    <distance name="title_vertical_pad" value="3"/>
+    <border name="title_border" left="0" right="0" top="0" bottom="0"/>
+    <border name="button_border" left="0" right="0" top="0" bottom="0"/>
 </frame_geometry>
 
 <!-- Window Title -->