GTK+-3.20 Menta themes: improve GtkCalendar and GtkExpander

4 files changed, 95 insertions, 14 deletions

diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
index 1d723e8c..143bae83 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
@@ -4556,6 +4556,10 @@ expander arrow {
     min-height: 16px;
     -gtk-icon-style: regular;
 	-gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+    -gtk-icon-shadow:  0px  1px shade (@theme_selected_fg_color, 1.0),
+                       1px  0px shade (@theme_selected_fg_color, 1.0),
+                      -1px  0px shade (@theme_selected_fg_color, 1.0),
+                       0px -1px shade (@theme_selected_fg_color, 1.0);
 }
 
 expander arrow:dir(rtl) {
@@ -4563,11 +4567,29 @@ expander arrow:dir(rtl) {
 }
 
 expander arrow:hover {
-	color: @internal_element_color;
+	color: shade(@theme_selected_fg_color, 1.0);
+    -gtk-icon-shadow:  0px  1px shade (@theme_fg_color, 0.8),
+                       1px  0px shade (@theme_fg_color, 0.8),
+                      -1px  0px shade (@theme_fg_color, 0.8),
+                       0px -1px shade (@theme_fg_color, 0.8);
 }
 
 expander arrow:checked {
 	-gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+	color: shade(@theme_selected_fg_color, 1.0);
+    -gtk-icon-shadow:  0px  1px shade (@theme_fg_color, 0.8),
+                       1px  0px shade (@theme_fg_color, 0.8),
+                      -1px  0px shade (@theme_fg_color, 0.8),
+                       0px -1px shade (@theme_fg_color, 0.8);
+}
+
+expander arrow:checked:hover {
+	-gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+	color: shade(@theme_fg_color, 1.0);
+    -gtk-icon-shadow:  0px  1px shade (@theme_selected_fg_color, 1.0),
+                       1px  0px shade (@theme_selected_fg_color, 1.0),
+                      -1px  0px shade (@theme_selected_fg_color, 1.0),
+                       0px -1px shade (@theme_selected_fg_color, 1.0);
 }
 
 expander {
@@ -4700,25 +4722,26 @@ list > row > button:hover {
  **************/
 
 calendar {
-	padding: 2px;
-    border-color: @borders;
+	padding: 1px;
 }
 
 calendar.view {
 	border-radius: 3px;
 	border-style: solid;
 	border-width: 1px;
-	padding: 2px;
+    border-color: @borders;
+	padding: 0px;
 }
 
 calendar.header {
-	border-width: 0 0 1px;
+	border-radius: 3px 3px 0px 0px;
 	border-style: solid;
 	border-color: shade(@borders, 0.90);
 	background-color: @theme_bg_color;
 	background-image: linear-gradient(to bottom,
 		shade(@theme_bg_color, 1.04),
 		shade(@theme_bg_color, 0.89));
+	border-width: 0px;
 	box-shadow: inset 0 -1px shade(@wm_bg_b, 0.95);
 	padding: 6px;
 }
@@ -4733,7 +4756,6 @@ calendar.header .subtitle {
 	padding: 0px 12px;
 }
 
-/* this makes no sense for gtk+-3.20 :) */
 calendar.button {
   background-image: none;
 }
@@ -4748,9 +4770,9 @@ highlight,
 calendar.highlight {
 	background-color: @theme_selected_bg_color;
 	color: @theme_selected_fg_color;
-	border-radius: 0;
-	padding: 0;
-	border-width: 0;
+	border-radius: 0px;
+	padding: 0px;
+	border-width: 0px;
 }
 
 /**************
diff --git a/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css b/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
index 8ccbb4e9..8d37691c 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
@@ -421,6 +421,24 @@ PanelApplet.wnck-applet .wnck-pager:hover {
     font: normal;
 }
 
+#MatePanelPopupWindow {
+	border-radius: 3px;
+}
+
+#MatePanelPopupWindow frame {
+	border-radius: 3px;
+    border-style: solid;
+    border-width: 1px;
+    border-color: shade(@borders, 0.95);
+}
+
+/* FIXME, does not work */
+#MatePanelPopupWindow ClockMap {
+	border-style: solid;
+	border-width: 1px;
+    border-color: @borders;
+}
+
 na-tray-applet {
     -NaTrayApplet-icon-padding: 3px;
     -NaTrayApplet-icon-size: 16;
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
index c68999ce..35c3ef53 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
@@ -4572,6 +4572,10 @@ expander arrow {
     min-height: 16px;
     -gtk-icon-style: regular;
 	-gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+    -gtk-icon-shadow:  0px  1px shade (@theme_base_color, 1.0),
+                       1px  0px shade (@theme_base_color, 1.0),
+                      -1px  0px shade (@theme_base_color, 1.0),
+                       0px -1px shade (@theme_base_color, 1.0);
 }
 
 expander arrow:dir(rtl) {
@@ -4579,11 +4583,29 @@ expander arrow:dir(rtl) {
 }
 
 expander arrow:hover {
-	color: @internal_element_color;
+	color: shade(@theme_base_color, 1.0);
+    -gtk-icon-shadow:  0px  1px shade (@theme_fg_color, 1.0),
+                       1px  0px shade (@theme_fg_color, 1.0),
+                      -1px  0px shade (@theme_fg_color, 1.0),
+                       0px -1px shade (@theme_fg_color, 1.0);
 }
 
 expander arrow:checked {
 	-gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+	color: shade(@theme_base_color, 1.0);
+    -gtk-icon-shadow:  0px  1px shade (@theme_fg_color, 1.0),
+                       1px  0px shade (@theme_fg_color, 1.0),
+                      -1px  0px shade (@theme_fg_color, 1.0),
+                       0px -1px shade (@theme_fg_color, 1.0);
+}
+
+expander arrow:checked:hover {
+	-gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+	color: shade(@theme_fg_color, 1.0);
+    -gtk-icon-shadow:  0px  1px shade (@theme_base_color, 1.0),
+                       1px  0px shade (@theme_base_color, 1.0),
+                      -1px  0px shade (@theme_base_color, 1.0),
+                       0px -1px shade (@theme_base_color, 1.0);
 }
 
 expander {
@@ -4716,25 +4738,26 @@ list > row > button:hover {
  **************/
 
 calendar {
-	padding: 2px;
-    border-color: @borders;
+	padding: 1px;
 }
 
 calendar.view {
 	border-radius: 3px;
 	border-style: solid;
 	border-width: 1px;
-	padding: 2px;
+    border-color: @borders;
+	padding: 0px;
 }
 
 calendar.header {
-	border-width: 0 0 1px;
+	border-radius: 3px 3px 0px 0px;
 	border-style: solid;
 	border-color: shade(@borders, 0.90);
 	background-color: @theme_bg_color;
 	background-image: linear-gradient(to bottom,
 		shade(@theme_bg_color, 1.04),
 		shade(@theme_bg_color, 0.89));
+	border-width: 0px;
 	box-shadow: inset 0 -1px shade(@wm_bg_b, 0.95);
 	padding: 6px;
 }
diff --git a/desktop-themes/Menta/gtk-3.0/mate-applications.css b/desktop-themes/Menta/gtk-3.0/mate-applications.css
index 34cb3a1c..247a5163 100644
--- a/desktop-themes/Menta/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Menta/gtk-3.0/mate-applications.css
@@ -413,6 +413,24 @@ PanelApplet.wnck-applet .wnck-pager:hover {
     font: normal;
 }
 
+#MatePanelPopupWindow {
+	border-radius: 3px;
+}
+
+#MatePanelPopupWindow frame {
+	border-radius: 3px;
+    border-style: solid;
+    border-width: 1px;
+    border-color: shade(@borders, 0.95);
+}
+
+/* FIXME, does not work */
+#MatePanelPopupWindow ClockMap {
+	border-style: solid;
+	border-width: 1px;
+    border-color: @borders;
+}
+
 na-tray-applet {
     -NaTrayApplet-icon-padding: 3px;
     -NaTrayApplet-icon-size: 16;