[gtk+/gtk-3-20] Adwaita: clean calendar styling

[Lapo Calamandrei <lapo src gnome org>]

commit 553b332faa7a4ae52bcad336e14688c7b9cbd388
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Wed Jul 20 22:48:25 2016 +0200

    Adwaita: clean calendar styling
    
    remove some non working props and generally simplify and clean up
    the code, in the process address:
    
    https://bugzilla.gnome.org/show_bug.cgi?id=769003

 gtk/theme/Adwaita/_common.scss           |   35 ++++++++---------------------
 gtk/theme/Adwaita/gtk-contained-dark.css |   18 +++++++-------
 gtk/theme/Adwaita/gtk-contained.css      |   18 +++++++-------
 3 files changed, 28 insertions(+), 43 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index d87d2eb..160a4a3 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3505,10 +3505,9 @@ calendar {
   }
 
   &.header {
-    border-bottom: 1px solid transparentize(black, 0.9);
-    border-radius: 0;
+    border-bottom-color: transparentize(black, 0.9);
 
-    &:backdrop { border-color: transparentize(black, 0.9); }
+    &:backdrop { border-bottom-color: transparentize(black, 0.9); }
   }
 
   &.button {
@@ -3516,39 +3515,25 @@ calendar {
 
     color: transparentize($fg_color, 0.55);
 
-    &:hover {
-      @extend %undecorated_button;
-
-      color: $fg_color;
-    }
-
-    &:backdrop {
-      @extend %undecorated_button;
-
-      color: transparentize($backdrop_fg_color,0.55);
-    }
+    &:hover { color: $fg_color; }
 
-    &:disabled {
-      @extend %undecorated_button;
+    &:backdrop { color: transparentize($backdrop_fg_color,0.55); }
 
-      color:  transparentize($insensitive_fg_color,0.55);
-    }
+    &:disabled { color:  transparentize($insensitive_fg_color,0.55); }
   }
 
-  &:indeterminate,
-  &:indeterminate:backdrop { color: gtkalpha(currentColor, 0.55); }
+  &.highlight {
+    color: $insensitive_fg_color;
 
-  &.highlight,
-  &.highlight:backdrop {
-    font-size: smaller;
-    color: $fg_color;
+    &:backdrop { color: $backdrop_insensitive_color; }
   }
 
-
   &:backdrop {
     color: $backdrop_text_color;
     border-color: $backdrop_borders_color;
   }
+
+  &:indeterminate { color: gtkalpha(currentColor, 0.3); }
 }
 
 
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 476bc22..86252c4 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1284,7 +1284,7 @@ popover.background radiobutton:backdrop:hover,
 button:visited, button:link:hover, button:link:active, button:link:checked,
 button:visited:hover,
 button:visited:active,
-button:visited:checked, calendar.button, calendar.button:hover, calendar.button:backdrop, 
calendar.button:disabled, .scale-popup button:hover, .scale-popup button:backdrop:hover, .scale-popup 
button:backdrop:disabled, .scale-popup button:backdrop {
+button:visited:checked, calendar.button, .scale-popup button:hover, .scale-popup button:backdrop:hover, 
.scale-popup button:backdrop:disabled, .scale-popup button:backdrop {
   background-color: transparent;
   background-image: none;
   border-color: transparent;
@@ -3871,10 +3871,9 @@ calendar {
   calendar:selected {
     border-radius: 3px; }
   calendar.header {
-    border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-    border-radius: 0; }
+    border-bottom-color: rgba(0, 0, 0, 0.1); }
     calendar.header:backdrop {
-      border-color: rgba(0, 0, 0, 0.1); }
+      border-bottom-color: rgba(0, 0, 0, 0.1); }
   calendar.button {
     color: rgba(238, 238, 236, 0.45); }
     calendar.button:hover {
@@ -3883,14 +3882,15 @@ calendar {
       color: rgba(148, 151, 150, 0.45); }
     calendar.button:disabled {
       color: rgba(148, 151, 150, 0.45); }
-  calendar:indeterminate, calendar:indeterminate:backdrop {
-    color: alpha(currentColor,0.55); }
-  calendar.highlight, calendar.highlight:backdrop {
-    font-size: smaller;
-    color: #eeeeec; }
+  calendar.highlight {
+    color: #949796; }
+    calendar.highlight:backdrop {
+      color: #5d6767; }
   calendar:backdrop {
     color: #d5d5d5;
     border-color: #1f2222; }
+  calendar:indeterminate {
+    color: alpha(currentColor,0.3); }
 
 /***********
  * Dialogs *
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index d98223f..4cfda17 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1287,7 +1287,7 @@ popover.background radiobutton:backdrop:hover,
 button:visited, button:link:hover, button:link:active, button:link:checked,
 button:visited:hover,
 button:visited:active,
-button:visited:checked, calendar.button, calendar.button:hover, calendar.button:backdrop, 
calendar.button:disabled, .scale-popup button:hover, .scale-popup button:backdrop:hover, .scale-popup 
button:backdrop:disabled, .scale-popup button:backdrop {
+button:visited:checked, calendar.button, .scale-popup button:hover, .scale-popup button:backdrop:hover, 
.scale-popup button:backdrop:disabled, .scale-popup button:backdrop {
   background-color: transparent;
   background-image: none;
   border-color: transparent;
@@ -3900,10 +3900,9 @@ calendar {
   calendar:selected {
     border-radius: 3px; }
   calendar.header {
-    border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-    border-radius: 0; }
+    border-bottom-color: rgba(0, 0, 0, 0.1); }
     calendar.header:backdrop {
-      border-color: rgba(0, 0, 0, 0.1); }
+      border-bottom-color: rgba(0, 0, 0, 0.1); }
   calendar.button {
     color: rgba(46, 52, 54, 0.45); }
     calendar.button:hover {
@@ -3912,14 +3911,15 @@ calendar {
       color: rgba(139, 142, 143, 0.45); }
     calendar.button:disabled {
       color: rgba(139, 142, 143, 0.45); }
-  calendar:indeterminate, calendar:indeterminate:backdrop {
-    color: alpha(currentColor,0.55); }
-  calendar.highlight, calendar.highlight:backdrop {
-    font-size: smaller;
-    color: #2e3436; }
+  calendar.highlight {
+    color: #8b8e8f; }
+    calendar.highlight:backdrop {
+      color: #c3c3c0; }
   calendar:backdrop {
     color: #323232;
     border-color: #a5a5a1; }
+  calendar:indeterminate {
+    color: alpha(currentColor,0.3); }
 
 /***********
  * Dialogs *