GTK+-3.20 GreenLaguna: improve settings for GtkCalendar and GtkExpander

- GtkExpander use button settings now.
- remove weird transparent border from calendar header
- set a border radius for calendar window clock applet

2 files changed, 29 insertions, 8 deletions

diff --git a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
index 8dcd1069..2b1d9a69 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
@@ -3813,15 +3813,22 @@ expander arrow:checked {
 }
 
 expander title {
-    border-style: solid;
+    padding: 4px;
+    border-radius: 3px;
     border-width: 1px;
-    border-radius: 2px;
+    border-style: solid;
     border-color: @internal_element_color;
+    border-image: url("assets/button-border.svg") 3 / 3px stretch;
+    background-image: linear-gradient(to bottom,
+                                      @button_gradient_color_a,
+                                      @button_gradient_color_b);
+    transition: all 400ms ease-out;
     color: @theme_fg_color;
-    background-image: none;
-    background-color: transparent;
+    min-height: 22px;
+    min-width: 22px;
 }
 
+/* does that work? */
 expander title:active {
     border-color: @internal_element_color;
     color: @theme_fg_color;
@@ -3829,7 +3836,12 @@ expander title:active {
 }
 
 expander title:hover {
-    border-color: @internal_element_color;
+    border-style: solid;
+    border-color: shade(@button_border, 1.1);
+    background-image: linear-gradient(to bottom,
+                                      @button_hover_gradient_color_a,
+                                      @button_hover_gradient_color_b);
+    border-image: url("assets/button-active-border.svg") 3 3 3 3 / 3px 3px 3px 3px stretch;
     color: @theme_fg_color;
 }
 
@@ -4055,11 +4067,15 @@ calendar.header .app-notification.frame button.titlebutton {
  *************/
 
 calendar {
+    padding: 1px;
+}
+
+calendar.view {
     border-radius: 3px;
     border-style: solid;
     border-width: 1px;
-    border-color: alpha(@frame_color, 0.6);
-    padding: 1px;
+    border-color: @notebook_border;
+    padding: 0px;
 }
 
 calendar.header {
@@ -4067,7 +4083,7 @@ calendar.header {
     background-image: linear-gradient(to bottom,
                                       shade(@theme_bg_color, 1.1),
                                       shade(@theme_bg_color, 0.86));
-    border-width: 0px 0px 1px 0px;
+    border-width: 0px;
 }
 
 calendar.button {
diff --git a/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css b/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css
index 147ba5bd..b5d4c023 100644
--- a/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css
+++ b/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css
@@ -389,6 +389,11 @@ PanelSeparator {
     font-weight: normal;
 }
 
+/* calendar window */
+#MatePanelPopupWindow {
+	border-radius: 3px;
+}
+
 na-tray-applet {
     -NaTrayApplet-icon-padding: 3px;
     -NaTrayApplet-icon-size: 16;