From fff16a86a57e0eab09e91243c3a8a28be785ce82 Mon Sep 17 00:00:00 2001
From: Randi Miller <randi@geekguy.co>
Date: Thu, 14 Mar 2019 03:40:03 -0400
Subject: [PATCH 1/4] Added a highlight on today's date in To-Dos cal

---
 website/client/components/tasks/taskModal.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/website/client/components/tasks/taskModal.vue b/website/client/components/tasks/taskModal.vue
index 793ffeafe3..5a88879a81 100644
--- a/website/client/components/tasks/taskModal.vue
+++ b/website/client/components/tasks/taskModal.vue
@@ -88,7 +88,8 @@
               :clearButtonText='$t("clear")',
               :todayButton='!challengeAccessRequired',
               :todayButtonText='$t("today")',
-              :disabled-picker='challengeAccessRequired'
+              :disabled-picker='challengeAccessRequired',
+              :highlighted='calendarHighlights'
             )
         .option(v-if="task.type === 'daily'")
           .form-group
@@ -717,6 +718,7 @@ export default {
         con: 'constitution',
         per: 'perception',
       },
+      calendarHighlights: { dates: [new Date()]},
     };
   },
   mounted () {

From bac91211538c1ab4c823ace21e36e25378ca837c Mon Sep 17 00:00:00 2001
From: Randi Miller <randi@geekguy.co>
Date: Tue, 19 Mar 2019 15:44:06 -0400
Subject: [PATCH 2/4] Changes color scheme for datepicker fixes #11064

---
 website/client/assets/scss/datepicker.scss    | 28 +++++++++++++++++++
 website/client/components/tasks/taskModal.vue |  4 ++-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 website/client/assets/scss/datepicker.scss

diff --git a/website/client/assets/scss/datepicker.scss b/website/client/assets/scss/datepicker.scss
new file mode 100644
index 0000000000..d957e1c90e
--- /dev/null
+++ b/website/client/assets/scss/datepicker.scss
@@ -0,0 +1,28 @@
+
+@import '~client/assets/scss/colors.scss';
+
+.vdp-datepicker .vdp-datepicker__calendar  {
+
+    .cell:not(.blank):not(.disabled).day:hover {
+        border-radius: 2px;
+        border: 1px solid $purple-400;
+    }
+    
+    .cell.selected, 
+    .cell.selected.highlighted, 
+    .cell.selected:hover {
+        border-radius: 2px;
+        color: $white;
+        background: $purple-400;
+    }
+
+    .cell.highlighted {
+        background: rgba($purple-400, 0.24);
+    }
+
+    .cell.highlighted,
+    .cell.selected {
+        font-weight: bold;
+    }
+
+}
\ No newline at end of file
diff --git a/website/client/components/tasks/taskModal.vue b/website/client/components/tasks/taskModal.vue
index 5a88879a81..d9c52e5316 100644
--- a/website/client/components/tasks/taskModal.vue
+++ b/website/client/components/tasks/taskModal.vue
@@ -100,7 +100,8 @@
               :clearButton="false",
               :todayButton="!challengeAccessRequired",
               :todayButtonText="$t('today')",
-              :disabled-picker="challengeAccessRequired"
+              :disabled-picker="challengeAccessRequired",
+              :highlighted='calendarHighlights'
             )
         .option(v-if="task.type === 'daily'")
           .form-group
@@ -250,6 +251,7 @@
 
 <style lang="scss">
   @import '~client/assets/scss/colors.scss';
+  @import '~client/assets/scss/datepicker.scss';
 
   #task-modal {
     .modal-dialog.modal-sm {

From c1767eca1b2070cbb1ea144406fc583ad120fba0 Mon Sep 17 00:00:00 2001
From: Randi Miller <randi@geekguy.co>
Date: Fri, 22 Mar 2019 14:17:36 -0400
Subject: [PATCH 3/4] Move datepicker css and color fixes

---
 website/client/assets/scss/datepicker.scss    | 6 ++----
 website/client/assets/scss/index.scss         | 1 +
 website/client/components/tasks/taskModal.vue | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/website/client/assets/scss/datepicker.scss b/website/client/assets/scss/datepicker.scss
index d957e1c90e..a74e1ff58d 100644
--- a/website/client/assets/scss/datepicker.scss
+++ b/website/client/assets/scss/datepicker.scss
@@ -1,6 +1,3 @@
-
-@import '~client/assets/scss/colors.scss';
-
 .vdp-datepicker .vdp-datepicker__calendar  {
 
     .cell:not(.blank):not(.disabled).day:hover {
@@ -13,11 +10,12 @@
     .cell.selected:hover {
         border-radius: 2px;
         color: $white;
-        background: $purple-400;
+        background: $purple-300;
     }
 
     .cell.highlighted {
         background: rgba($purple-400, 0.24);
+        color: $purple-200;
     }
 
     .cell.highlighted,
diff --git a/website/client/assets/scss/index.scss b/website/client/assets/scss/index.scss
index de1f6b5021..3919ff6efd 100644
--- a/website/client/assets/scss/index.scss
+++ b/website/client/assets/scss/index.scss
@@ -37,3 +37,4 @@
 @import './iconalert';
 @import './tiers';
 @import './payments';
+@import './datepicker.scss';
\ No newline at end of file
diff --git a/website/client/components/tasks/taskModal.vue b/website/client/components/tasks/taskModal.vue
index d9c52e5316..edecc784a0 100644
--- a/website/client/components/tasks/taskModal.vue
+++ b/website/client/components/tasks/taskModal.vue
@@ -251,7 +251,6 @@
 
 <style lang="scss">
   @import '~client/assets/scss/colors.scss';
-  @import '~client/assets/scss/datepicker.scss';
 
   #task-modal {
     .modal-dialog.modal-sm {

From ae21680a5f5a17fc10ba9d3e0d3accf2b195ca9c Mon Sep 17 00:00:00 2001
From: Randi Miller <randi@geekguy.co>
Date: Fri, 22 Mar 2019 14:23:04 -0400
Subject: [PATCH 4/4] Add border-radius to highlighted tile

---
 website/client/assets/scss/datepicker.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/client/assets/scss/datepicker.scss b/website/client/assets/scss/datepicker.scss
index a74e1ff58d..7ec0a7711b 100644
--- a/website/client/assets/scss/datepicker.scss
+++ b/website/client/assets/scss/datepicker.scss
@@ -8,7 +8,6 @@
     .cell.selected, 
     .cell.selected.highlighted, 
     .cell.selected:hover {
-        border-radius: 2px;
         color: $white;
         background: $purple-300;
     }
@@ -20,6 +19,7 @@
 
     .cell.highlighted,
     .cell.selected {
+        border-radius: 2px;
         font-weight: bold;
     }