7 files changed, 43 insertions, 13 deletions
diff --git a/common/gtk-3.0/3.18/gtk-contained-dark.css b/common/gtk-3.0/3.18/gtk-contained-dark.css
index eff1d6f..babae66 100644
--- a/common/gtk-3.0/3.18/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.18/gtk-contained-dark.css
@@ -791,7 +791,7 @@ GtkSearchEntry.entry {
 .app-notification .sidebar-button.button,
 .app-notification.frame .button.flat, .app-notification.frame .sidebar-button.button, .app-notification .button.flat:insensitive,
 .app-notification .sidebar-button.button:insensitive,
-.app-notification.frame .button.flat:insensitive, .app-notification.frame .sidebar-button.button:insensitive {
+.app-notification.frame .button.flat:insensitive, .app-notification.frame .sidebar-button.button:insensitive, GtkCalendar.button, GtkCalendar.button:focus {
   border-color: transparent;
   background-color: transparent;
   background-image: none;
@@ -2649,11 +2649,15 @@ GtkCalendar {
     border: none; }
     GtkCalendar.button:hover, GtkCalendar.button:focus:hover {
       color: #D3DAE3; }
+    GtkCalendar.button:insensitive, GtkCalendar.button:focus:insensitive {
+      color: rgba(211, 218, 227, 0.45);
+      background-color: transparent;
+      background-image: none; }
   GtkCalendar:inconsistent {
     color: alpha(currentColor,0.55); }
   GtkCalendar.highlight {
     color: #D3DAE3;
-    background-color: #2d3036; }
+    background-color: rgba(45, 48, 54, 0.5); }
 
 /***********
  * Dialogs *
diff --git a/common/gtk-3.0/3.18/gtk-contained-darker.css b/common/gtk-3.0/3.18/gtk-contained-darker.css
index ce9b35f..0ba45b5 100644
--- a/common/gtk-3.0/3.18/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.18/gtk-contained-darker.css
@@ -791,7 +791,7 @@ GtkSearchEntry.entry {
 .app-notification .sidebar-button.button,
 .app-notification.frame .button.flat, .app-notification.frame .sidebar-button.button, .app-notification .button.flat:insensitive,
 .app-notification .sidebar-button.button:insensitive,
-.app-notification.frame .button.flat:insensitive, .app-notification.frame .sidebar-button.button:insensitive {
+.app-notification.frame .button.flat:insensitive, .app-notification.frame .sidebar-button.button:insensitive, GtkCalendar.button, GtkCalendar.button:focus {
   border-color: transparent;
   background-color: transparent;
   background-image: none;
@@ -2650,11 +2650,15 @@ GtkCalendar {
     border: none; }
     GtkCalendar.button:hover, GtkCalendar.button:focus:hover {
       color: #5c616c; }
+    GtkCalendar.button:insensitive, GtkCalendar.button:focus:insensitive {
+      color: rgba(92, 97, 108, 0.55);
+      background-color: transparent;
+      background-image: none; }
   GtkCalendar:inconsistent {
     color: alpha(currentColor,0.55); }
   GtkCalendar.highlight {
     color: #5c616c;
-    background-color: #dbdfe3; }
+    background-color: rgba(207, 214, 230, 0.5); }
 
 /***********
  * Dialogs *
diff --git a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css
index bd4a4ea..6e00df9 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css
@@ -791,7 +791,7 @@ GtkSearchEntry.entry {
 .app-notification .sidebar-button.button,
 .app-notification.frame .button.flat, .app-notification.frame .sidebar-button.button, .app-notification .button.flat:insensitive,
 .app-notification .sidebar-button.button:insensitive,
-.app-notification.frame .button.flat:insensitive, .app-notification.frame .sidebar-button.button:insensitive {
+.app-notification.frame .button.flat:insensitive, .app-notification.frame .sidebar-button.button:insensitive, GtkCalendar.button, GtkCalendar.button:focus {
   border-color: transparent;
   background-color: transparent;
   background-image: none;
@@ -2649,11 +2649,15 @@ GtkCalendar {
     border: none; }
     GtkCalendar.button:hover, GtkCalendar.button:focus:hover {
       color: #D3DAE3; }
+    GtkCalendar.button:insensitive, GtkCalendar.button:focus:insensitive {
+      color: rgba(211, 218, 227, 0.45);
+      background-color: transparent;
+      background-image: none; }
   GtkCalendar:inconsistent {
     color: alpha(currentColor,0.55); }
   GtkCalendar.highlight {
     color: #D3DAE3;
-    background-color: #2d3036; }
+    background-color: rgba(45, 48, 54, 0.5); }
 
 /***********
  * Dialogs *
diff --git a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css
index 94b49af..6a862ac 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css
@@ -791,7 +791,7 @@ GtkSearchEntry.entry {
 .app-notification .sidebar-button.button,
 .app-notification.frame .button.flat, .app-notification.frame .sidebar-button.button, .app-notification .button.flat:insensitive,
 .app-notification .sidebar-button.button:insensitive,
-.app-notification.frame .button.flat:insensitive, .app-notification.frame .sidebar-button.button:insensitive {
+.app-notification.frame .button.flat:insensitive, .app-notification.frame .sidebar-button.button:insensitive, GtkCalendar.button, GtkCalendar.button:focus {
   border-color: transparent;
   background-color: transparent;
   background-image: none;
@@ -2650,11 +2650,15 @@ GtkCalendar {
     border: none; }
     GtkCalendar.button:hover, GtkCalendar.button:focus:hover {
       color: #5c616c; }
+    GtkCalendar.button:insensitive, GtkCalendar.button:focus:insensitive {
+      color: rgba(92, 97, 108, 0.55);
+      background-color: transparent;
+      background-image: none; }
   GtkCalendar:inconsistent {
     color: alpha(currentColor,0.55); }
   GtkCalendar.highlight {
     color: #5c616c;
-    background-color: #dbdfe3; }
+    background-color: rgba(207, 214, 230, 0.5); }
 
 /***********
  * Dialogs *
diff --git a/common/gtk-3.0/3.18/gtk-contained-solid.css b/common/gtk-3.0/3.18/gtk-contained-solid.css
index 06ef672..abd6324 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid.css
@@ -791,7 +791,7 @@ GtkSearchEntry.entry {
 .app-notification .sidebar-button.button,
 .app-notification.frame .button.flat, .app-notification.frame .sidebar-button.button, .app-notification .button.flat:insensitive,
 .app-notification .sidebar-button.button:insensitive,
-.app-notification.frame .button.flat:insensitive, .app-notification.frame .sidebar-button.button:insensitive {
+.app-notification.frame .button.flat:insensitive, .app-notification.frame .sidebar-button.button:insensitive, GtkCalendar.button, GtkCalendar.button:focus {
   border-color: transparent;
   background-color: transparent;
   background-image: none;
@@ -2649,11 +2649,15 @@ GtkCalendar {
     border: none; }
     GtkCalendar.button:hover, GtkCalendar.button:focus:hover {
       color: #5c616c; }
+    GtkCalendar.button:insensitive, GtkCalendar.button:focus:insensitive {
+      color: rgba(92, 97, 108, 0.55);
+      background-color: transparent;
+      background-image: none; }
   GtkCalendar:inconsistent {
     color: alpha(currentColor,0.55); }
   GtkCalendar.highlight {
     color: #5c616c;
-    background-color: #dbdfe3; }
+    background-color: rgba(207, 214, 230, 0.5); }
 
 /***********
  * Dialogs *
diff --git a/common/gtk-3.0/3.18/gtk-contained.css b/common/gtk-3.0/3.18/gtk-contained.css
index b38d760..75f0cae 100644
--- a/common/gtk-3.0/3.18/gtk-contained.css
+++ b/common/gtk-3.0/3.18/gtk-contained.css
@@ -791,7 +791,7 @@ GtkSearchEntry.entry {
 .app-notification .sidebar-button.button,
 .app-notification.frame .button.flat, .app-notification.frame .sidebar-button.button, .app-notification .button.flat:insensitive,
 .app-notification .sidebar-button.button:insensitive,
-.app-notification.frame .button.flat:insensitive, .app-notification.frame .sidebar-button.button:insensitive {
+.app-notification.frame .button.flat:insensitive, .app-notification.frame .sidebar-button.button:insensitive, GtkCalendar.button, GtkCalendar.button:focus {
   border-color: transparent;
   background-color: transparent;
   background-image: none;
@@ -2649,11 +2649,15 @@ GtkCalendar {
     border: none; }
     GtkCalendar.button:hover, GtkCalendar.button:focus:hover {
       color: #5c616c; }
+    GtkCalendar.button:insensitive, GtkCalendar.button:focus:insensitive {
+      color: rgba(92, 97, 108, 0.55);
+      background-color: transparent;
+      background-image: none; }
   GtkCalendar:inconsistent {
     color: alpha(currentColor,0.55); }
   GtkCalendar.highlight {
     color: #5c616c;
-    background-color: #dbdfe3; }
+    background-color: rgba(207, 214, 230, 0.5); }
 
 /***********
  * Dialogs *
diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss
index 88d9b69..6cc34a4 100644
--- a/common/gtk-3.0/3.18/sass/_common.scss
+++ b/common/gtk-3.0/3.18/sass/_common.scss
@@ -2391,17 +2391,23 @@ GtkCalendar {
     border-radius: 0;
   }
   &.button, &.button:focus {
+    @extend %undecorated_button;
     color: transparentize($fg_color,0.55);
     box-shadow: none;
     border: none;
     &:hover {
       color: $fg_color;
     }
+    &:insensitive {
+      color: $insensitive_fg_color;
+      background-color: transparent;
+      background-image: none;
+    }
   }
   &:inconsistent { color: gtkalpha(currentColor,0.55); }
   &.highlight {
     color: $fg_color;
-    background-color: $borders_color;
+    background-color: transparentize($button_border, 0.5);
   }
 }