Merge branch 'master' into dark_headerbars+dark_variant

14 files changed, 14 insertions, 0 deletions

diff --git a/common/gtk-3.0/3.14/_common.scss b/common/gtk-3.0/3.14/_common.scss
index 98520ff..24b79b2 100644
--- a/common/gtk-3.0/3.14/_common.scss
+++ b/common/gtk-3.0/3.14/_common.scss
@@ -2213,6 +2213,7 @@ GtkExpander {
  * Calendar *
  ***********/
 GtkCalendar {
+  color: $fg_color;
   border: 1px solid $borders_color;
   border-radius: 3px;
   padding: 2px;
diff --git a/common/gtk-3.0/3.14/gtk-contained-dark.css b/common/gtk-3.0/3.14/gtk-contained-dark.css
index 8d5919f..7cfcc46 100644
--- a/common/gtk-3.0/3.14/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-dark.css
@@ -1880,6 +1880,7 @@ GtkExpander {
  * Calendar *
  ***********/
 GtkCalendar {
+  color: #D3DAE3;
   border: 1px solid #2d3036;
   border-radius: 3px;
   padding: 2px; }
diff --git a/common/gtk-3.0/3.14/gtk-contained-darker.css b/common/gtk-3.0/3.14/gtk-contained-darker.css
index 52910bd..07e7066 100644
--- a/common/gtk-3.0/3.14/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.14/gtk-contained-darker.css
@@ -1881,6 +1881,7 @@ GtkExpander {
  * Calendar *
  ***********/
 GtkCalendar {
+  color: #5c616c;
   border: 1px solid #dcdfe3;
   border-radius: 3px;
   padding: 2px; }
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
index 695b6fe..8c70628 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
@@ -1880,6 +1880,7 @@ GtkExpander {
  * Calendar *
  ***********/
 GtkCalendar {
+  color: #D3DAE3;
   border: 1px solid #2d3036;
   border-radius: 3px;
   padding: 2px; }
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css
index df02ff1..edfc5ec 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css
@@ -1881,6 +1881,7 @@ GtkExpander {
  * Calendar *
  ***********/
 GtkCalendar {
+  color: #5c616c;
   border: 1px solid #dcdfe3;
   border-radius: 3px;
   padding: 2px; }
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css
index 61fe1c3..c4f384f 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid.css
@@ -1880,6 +1880,7 @@ GtkExpander {
  * Calendar *
  ***********/
 GtkCalendar {
+  color: #5c616c;
   border: 1px solid #dcdfe3;
   border-radius: 3px;
   padding: 2px; }
diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css
index 4d2bc97..c14a1be 100644
--- a/common/gtk-3.0/3.14/gtk-contained.css
+++ b/common/gtk-3.0/3.14/gtk-contained.css
@@ -1880,6 +1880,7 @@ GtkExpander {
  * Calendar *
  ***********/
 GtkCalendar {
+  color: #5c616c;
   border: 1px solid #dcdfe3;
   border-radius: 3px;
   padding: 2px; }
diff --git a/common/gtk-3.0/3.16/_common.scss b/common/gtk-3.0/3.16/_common.scss
index b4832dc..060acfe 100644
--- a/common/gtk-3.0/3.16/_common.scss
+++ b/common/gtk-3.0/3.16/_common.scss
@@ -2321,6 +2321,7 @@ GtkScrolledWindow {
  * Calendar *
  ***********/
 GtkCalendar {
+  color: $fg_color;
   border: 1px solid $borders_color;
   border-radius: 3px;
   padding: 2px;
diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css
index 2bc6f97..3181949 100644
--- a/common/gtk-3.0/3.16/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-dark.css
@@ -1936,6 +1936,7 @@ GtkScrolledWindow GtkViewport.frame {
  * Calendar *
  ***********/
 GtkCalendar {
+  color: #D3DAE3;
   border: 1px solid #2d3036;
   border-radius: 3px;
   padding: 2px; }
diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css
index 77a11e3..0ba69a9 100644
--- a/common/gtk-3.0/3.16/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-darker.css
@@ -1937,6 +1937,7 @@ GtkScrolledWindow GtkViewport.frame {
  * Calendar *
  ***********/
 GtkCalendar {
+  color: #5c616c;
   border: 1px solid #dcdfe3;
   border-radius: 3px;
   padding: 2px; }
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
index c1fc8d9..2ffc6e2 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
@@ -1936,6 +1936,7 @@ GtkScrolledWindow GtkViewport.frame {
  * Calendar *
  ***********/
 GtkCalendar {
+  color: #D3DAE3;
   border: 1px solid #2d3036;
   border-radius: 3px;
   padding: 2px; }
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
index 1f13d21..e4819fb 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
@@ -1937,6 +1937,7 @@ GtkScrolledWindow GtkViewport.frame {
  * Calendar *
  ***********/
 GtkCalendar {
+  color: #5c616c;
   border: 1px solid #dcdfe3;
   border-radius: 3px;
   padding: 2px; }
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css
index cc13fa1..57a27bc 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid.css
@@ -1936,6 +1936,7 @@ GtkScrolledWindow GtkViewport.frame {
  * Calendar *
  ***********/
 GtkCalendar {
+  color: #5c616c;
   border: 1px solid #dcdfe3;
   border-radius: 3px;
   padding: 2px; }
diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css
index 188ea9f..eaeee5e 100644
--- a/common/gtk-3.0/3.16/gtk-contained.css
+++ b/common/gtk-3.0/3.16/gtk-contained.css
@@ -1936,6 +1936,7 @@ GtkScrolledWindow GtkViewport.frame {
  * Calendar *
  ***********/
 GtkCalendar {
+  color: #5c616c;
   border: 1px solid #dcdfe3;
   border-radius: 3px;
   padding: 2px; }