From 5e692184ee82c53d2e59fdbf77b6ccffa02894a2 Mon Sep 17 00:00:00 2001
From: Barret Schloerke <schloerke@gmail.com>
Date: Thu, 4 Mar 2021 16:15:26 -0500
Subject: [PATCH] Have the patches work

---
 .../datepicker/css/bootstrap-datepicker3.css  | 229 +++++++++---------
 .../css/bootstrap-datepicker3.min.css         |   2 +-
 .../datepicker/js/bootstrap-datepicker.js     |   6 +-
 inst/www/shared/datepicker/scss/build3.scss   |  57 ++---
 .../shared/datepicker/scss/datepicker3.scss   |  41 ++--
 tools/updateBootstrapDatepicker.R             |  21 +-
 6 files changed, 188 insertions(+), 168 deletions(-)

diff --git a/inst/www/shared/datepicker/css/bootstrap-datepicker3.css b/inst/www/shared/datepicker/css/bootstrap-datepicker3.css
index 648e28ac3b..06fe4a8029 100644
--- a/inst/www/shared/datepicker/css/bootstrap-datepicker3.css
+++ b/inst/www/shared/datepicker/css/bootstrap-datepicker3.css
@@ -1,5 +1,5 @@
 .datepicker {
-  border-radius: 4px;
+  border-radius: 0.25rem;
   direction: ltr;
 }
 
@@ -105,63 +105,64 @@
 }
 
 .datepicker table tr td.old, .datepicker table tr td.new {
-  color: #777777;
+  color: #6c757d;
 }
 
 .datepicker table tr td.day:hover, .datepicker table tr td.focused {
-  background: #eeeeee;
+  color: #000;
+  background: #e9e9ea;
   cursor: pointer;
 }
 
 .datepicker table tr td.disabled, .datepicker table tr td.disabled:hover {
   background: none;
-  color: #777777;
+  color: #6c757d;
   cursor: default;
 }
 
 .datepicker table tr td.highlighted {
   color: #000;
-  background-color: #d9edf7;
-  border-color: #85c5e5;
+  background-color: #d1ecf1;
+  border-color: #83ccd9;
   border-radius: 0;
 }
 
 .datepicker table tr td.highlighted:focus, .datepicker table tr td.highlighted.focus {
   color: #000;
-  background-color: #afd9ee;
-  border-color: #298fc2;
+  background-color: #bcd4d9;
+  border-color: #6299a3;
 }
 
 .datepicker table tr td.highlighted:hover {
   color: #000;
-  background-color: #afd9ee;
-  border-color: #52addb;
+  background-color: #697679;
+  border-color: #73b3bf;
 }
 
 .datepicker table tr td.highlighted:active, .datepicker table tr td.highlighted.active {
   color: #000;
-  background-color: #afd9ee;
-  border-color: #52addb;
+  background-color: #bcd4d9;
+  border-color: #73b3bf;
 }
 
 .datepicker table tr td.highlighted:active:hover, .datepicker table tr td.highlighted:active:focus, .datepicker table tr td.highlighted.focus:active, .datepicker table tr td.highlighted.active:hover, .datepicker table tr td.highlighted.active:focus, .datepicker table tr td.highlighted.active.focus {
   color: #000;
-  background-color: #91cbe8;
-  border-color: #298fc2;
+  background-color: #adc4c8;
+  border-color: #6299a3;
 }
 
 .datepicker table tr td.highlighted.disabled:hover, .datepicker table tr td.highlighted.disabled:focus, .datepicker table tr td.highlighted.disabled.focus, .datepicker table tr td.highlighted[disabled]:hover, .datepicker table tr td.highlighted[disabled]:focus, .datepicker table tr td.highlighted.focus[disabled], fieldset[disabled] .datepicker table tr td.highlighted:hover, fieldset[disabled] .datepicker table tr td.highlighted:focus, fieldset[disabled] .datepicker table tr td.highlighted.focus {
-  background-color: #d9edf7;
-  border-color: #85c5e5;
+  background-color: #d1ecf1;
+  border-color: #83ccd9;
 }
 
 .datepicker table tr td.highlighted.focused {
-  background: #afd9ee;
+  background: #aadce5;
 }
 
 .datepicker table tr td.highlighted.disabled, .datepicker table tr td.highlighted.disabled:active {
-  background: #d9edf7;
-  color: #777777;
+  background: #d1ecf1;
+  color: #6c757d;
 }
 
 .datepicker table tr td.today {
@@ -172,26 +173,26 @@
 
 .datepicker table tr td.today:focus, .datepicker table tr td.today.focus {
   color: #000;
-  background-color: #ffc966;
-  border-color: #b37400;
+  background-color: #e6c58a;
+  border-color: #bf8926;
 }
 
 .datepicker table tr td.today:hover {
   color: #000;
-  background-color: #ffc966;
-  border-color: #f59e00;
+  background-color: #806e4d;
+  border-color: #e0a12d;
 }
 
 .datepicker table tr td.today:active, .datepicker table tr td.today.active {
   color: #000;
-  background-color: #ffc966;
-  border-color: #f59e00;
+  background-color: #e6c58a;
+  border-color: #e0a12d;
 }
 
 .datepicker table tr td.today:active:hover, .datepicker table tr td.today:active:focus, .datepicker table tr td.today.focus:active, .datepicker table tr td.today.active:hover, .datepicker table tr td.today.active:focus, .datepicker table tr td.today.active.focus {
   color: #000;
-  background-color: #ffbc42;
-  border-color: #b37400;
+  background-color: #d4b67f;
+  border-color: #bf8926;
 }
 
 .datepicker table tr td.today.disabled:hover, .datepicker table tr td.today.disabled:focus, .datepicker table tr td.today.disabled.focus, .datepicker table tr td.today[disabled]:hover, .datepicker table tr td.today[disabled]:focus, .datepicker table tr td.today.focus[disabled], fieldset[disabled] .datepicker table tr td.today:hover, fieldset[disabled] .datepicker table tr td.today:focus, fieldset[disabled] .datepicker table tr td.today.focus {
@@ -205,208 +206,208 @@
 
 .datepicker table tr td.today.disabled, .datepicker table tr td.today.disabled:active {
   background: #ffdb99;
-  color: #777777;
+  color: #6c757d;
 }
 
 .datepicker table tr td.range {
   color: #000;
-  background-color: #eeeeee;
-  border-color: #bbbbbb;
+  background-color: #e9e9ea;
+  border-color: #b5b5b8;
   border-radius: 0;
 }
 
 .datepicker table tr td.range:focus, .datepicker table tr td.range.focus {
   color: #000;
-  background-color: #d5d5d5;
-  border-color: #7c7c7c;
+  background-color: #d2d2d3;
+  border-color: #88888a;
 }
 
 .datepicker table tr td.range:hover {
   color: #000;
-  background-color: #d5d5d5;
-  border-color: #9d9d9d;
+  background-color: #757575;
+  border-color: #9f9fa2;
 }
 
 .datepicker table tr td.range:active, .datepicker table tr td.range.active {
   color: #000;
-  background-color: #d5d5d5;
-  border-color: #9d9d9d;
+  background-color: #d2d2d3;
+  border-color: #9f9fa2;
 }
 
 .datepicker table tr td.range:active:hover, .datepicker table tr td.range:active:focus, .datepicker table tr td.range.focus:active, .datepicker table tr td.range.active:hover, .datepicker table tr td.range.active:focus, .datepicker table tr td.range.active.focus {
   color: #000;
-  background-color: #c3c3c3;
-  border-color: #7c7c7c;
+  background-color: #c1c1c2;
+  border-color: #88888a;
 }
 
 .datepicker table tr td.range.disabled:hover, .datepicker table tr td.range.disabled:focus, .datepicker table tr td.range.disabled.focus, .datepicker table tr td.range[disabled]:hover, .datepicker table tr td.range[disabled]:focus, .datepicker table tr td.range.focus[disabled], fieldset[disabled] .datepicker table tr td.range:hover, fieldset[disabled] .datepicker table tr td.range:focus, fieldset[disabled] .datepicker table tr td.range.focus {
-  background-color: #eeeeee;
-  border-color: #bbbbbb;
+  background-color: #e9e9ea;
+  border-color: #b5b5b8;
 }
 
 .datepicker table tr td.range.focused {
-  background: #d5d5d5;
+  background: #cfcfd1;
 }
 
 .datepicker table tr td.range.disabled, .datepicker table tr td.range.disabled:active {
-  background: #eeeeee;
-  color: #777777;
+  background: #e9e9ea;
+  color: #6c757d;
 }
 
 .datepicker table tr td.range.highlighted {
   color: #000;
-  background-color: #e4eef3;
-  border-color: #9dc2d4;
+  background-color: #ddebee;
+  border-color: #99c3cc;
 }
 
 .datepicker table tr td.range.highlighted:focus, .datepicker table tr td.range.highlighted.focus {
   color: #000;
-  background-color: #c1d8e3;
-  border-color: #4a88a7;
+  background-color: #c7d4d6;
+  border-color: #739299;
 }
 
 .datepicker table tr td.range.highlighted:hover {
   color: #000;
-  background-color: #c1d8e3;
-  border-color: #73a7c1;
+  background-color: #6f7677;
+  border-color: #87acb4;
 }
 
 .datepicker table tr td.range.highlighted:active, .datepicker table tr td.range.highlighted.active {
   color: #000;
-  background-color: #c1d8e3;
-  border-color: #73a7c1;
+  background-color: #c7d4d6;
+  border-color: #87acb4;
 }
 
 .datepicker table tr td.range.highlighted:active:hover, .datepicker table tr td.range.highlighted:active:focus, .datepicker table tr td.range.highlighted.focus:active, .datepicker table tr td.range.highlighted.active:hover, .datepicker table tr td.range.highlighted.active:focus, .datepicker table tr td.range.highlighted.active.focus {
   color: #000;
-  background-color: #a8c8d8;
-  border-color: #4a88a7;
+  background-color: #b7c3c6;
+  border-color: #739299;
 }
 
 .datepicker table tr td.range.highlighted.disabled:hover, .datepicker table tr td.range.highlighted.disabled:focus, .datepicker table tr td.range.highlighted.disabled.focus, .datepicker table tr td.range.highlighted[disabled]:hover, .datepicker table tr td.range.highlighted[disabled]:focus, .datepicker table tr td.range.highlighted.focus[disabled], fieldset[disabled] .datepicker table tr td.range.highlighted:hover, fieldset[disabled] .datepicker table tr td.range.highlighted:focus, fieldset[disabled] .datepicker table tr td.range.highlighted.focus {
-  background-color: #e4eef3;
-  border-color: #9dc2d4;
+  background-color: #ddebee;
+  border-color: #99c3cc;
 }
 
 .datepicker table tr td.range.highlighted.focused {
-  background: #c1d8e3;
+  background: #bbd7dd;
 }
 
 .datepicker table tr td.range.highlighted.disabled, .datepicker table tr td.range.highlighted.disabled:active {
-  background: #e4eef3;
-  color: #777777;
+  background: #ddebee;
+  color: #6c757d;
 }
 
 .datepicker table tr td.range.today {
   color: #000;
-  background-color: #f7ca77;
-  border-color: #f1a417;
+  background-color: #f4c775;
+  border-color: #eca117;
 }
 
 .datepicker table tr td.range.today:focus, .datepicker table tr td.range.today.focus {
   color: #000;
-  background-color: #f4b747;
-  border-color: #815608;
+  background-color: #dcb369;
+  border-color: #b17811;
 }
 
 .datepicker table tr td.range.today:hover {
   color: #000;
-  background-color: #f4b747;
-  border-color: #c0800b;
+  background-color: #7a643b;
+  border-color: #d08d14;
 }
 
 .datepicker table tr td.range.today:active, .datepicker table tr td.range.today.active {
   color: #000;
-  background-color: #f4b747;
-  border-color: #c0800b;
+  background-color: #dcb369;
+  border-color: #d08d14;
 }
 
 .datepicker table tr td.range.today:active:hover, .datepicker table tr td.range.today:active:focus, .datepicker table tr td.range.today.focus:active, .datepicker table tr td.range.today.active:hover, .datepicker table tr td.range.today.active:focus, .datepicker table tr td.range.today.active.focus {
   color: #000;
-  background-color: #f2aa25;
-  border-color: #815608;
+  background-color: #cba561;
+  border-color: #b17811;
 }
 
 .datepicker table tr td.range.today.disabled:hover, .datepicker table tr td.range.today.disabled:focus, .datepicker table tr td.range.today.disabled.focus, .datepicker table tr td.range.today[disabled]:hover, .datepicker table tr td.range.today[disabled]:focus, .datepicker table tr td.range.today.focus[disabled], fieldset[disabled] .datepicker table tr td.range.today:hover, fieldset[disabled] .datepicker table tr td.range.today:focus, fieldset[disabled] .datepicker table tr td.range.today.focus {
-  background-color: #f7ca77;
-  border-color: #f1a417;
+  background-color: #f4c775;
+  border-color: #eca117;
 }
 
 .datepicker table tr td.range.today.disabled, .datepicker table tr td.range.today.disabled:active {
-  background: #f7ca77;
-  color: #777777;
+  background: #f4c775;
+  color: #6c757d;
 }
 
 .datepicker table tr td.selected, .datepicker table tr td.selected.highlighted {
   color: #fff;
-  background-color: #777777;
-  border-color: #555555;
+  background-color: #898b8d;
+  border-color: #6b6e71;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
 }
 
 .datepicker table tr td.selected:focus, .datepicker table tr td.selected.focus, .datepicker table tr td.selected.highlighted:focus, .datepicker table tr td.selected.highlighted.focus {
   color: #fff;
-  background-color: #5e5e5e;
-  border-color: #161616;
+  background-color: #959798;
+  border-color: #909295;
 }
 
 .datepicker table tr td.selected:hover, .datepicker table tr td.selected.highlighted:hover {
   color: #fff;
-  background-color: #5e5e5e;
-  border-color: #373737;
+  background-color: #c4c5c6;
+  border-color: #7d7f82;
 }
 
 .datepicker table tr td.selected:active, .datepicker table tr td.selected.active, .datepicker table tr td.selected.highlighted:active, .datepicker table tr td.selected.highlighted.active {
   color: #fff;
-  background-color: #5e5e5e;
-  border-color: #373737;
+  background-color: #959798;
+  border-color: #7d7f82;
 }
 
 .datepicker table tr td.selected:active:hover, .datepicker table tr td.selected:active:focus, .datepicker table tr td.selected.focus:active, .datepicker table tr td.selected.active:hover, .datepicker table tr td.selected.active:focus, .datepicker table tr td.selected.active.focus, .datepicker table tr td.selected.highlighted:active:hover, .datepicker table tr td.selected.highlighted:active:focus, .datepicker table tr td.selected.highlighted.focus:active, .datepicker table tr td.selected.highlighted.active:hover, .datepicker table tr td.selected.highlighted.active:focus, .datepicker table tr td.selected.highlighted.active.focus {
   color: #fff;
-  background-color: #4c4c4c;
-  border-color: #161616;
+  background-color: #9d9fa0;
+  border-color: #909295;
 }
 
 .datepicker table tr td.selected.disabled:hover, .datepicker table tr td.selected.disabled:focus, .datepicker table tr td.selected.disabled.focus, .datepicker table tr td.selected[disabled]:hover, .datepicker table tr td.selected[disabled]:focus, .datepicker table tr td.selected.focus[disabled], fieldset[disabled] .datepicker table tr td.selected:hover, fieldset[disabled] .datepicker table tr td.selected:focus, fieldset[disabled] .datepicker table tr td.selected.focus, .datepicker table tr td.selected.highlighted.disabled:hover, .datepicker table tr td.selected.highlighted.disabled:focus, .datepicker table tr td.selected.highlighted.disabled.focus, .datepicker table tr td.selected.highlighted[disabled]:hover, .datepicker table tr td.selected.highlighted[disabled]:focus, .datepicker table tr td.selected.highlighted.focus[disabled], fieldset[disabled] .datepicker table tr td.selected.highlighted:hover, fieldset[disabled] .datepicker table tr td.selected.highlighted:focus, fieldset[disabled] .datepicker table tr td.selected.highlighted.focus {
-  background-color: #777777;
-  border-color: #555555;
+  background-color: #898b8d;
+  border-color: #6b6e71;
 }
 
 .datepicker table tr td.active, .datepicker table tr td.active.highlighted {
   color: #fff;
-  background-color: #337ab7;
-  border-color: #2e6da4;
+  background-color: #007bff;
+  border-color: #0277f4;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
 }
 
 .datepicker table tr td.active:focus, .datepicker table tr td.active.focus, .datepicker table tr td.active.highlighted:focus, .datepicker table tr td.active.highlighted.focus {
   color: #fff;
-  background-color: #286090;
-  border-color: #122b40;
+  background-color: #1a88ff;
+  border-color: #4199f7;
 }
 
 .datepicker table tr td.active:hover, .datepicker table tr td.active.highlighted:hover {
   color: #fff;
-  background-color: #286090;
-  border-color: #204d74;
+  background-color: #80bdff;
+  border-color: #2087f5;
 }
 
 .datepicker table tr td.active:active, .datepicker table tr td.active.active, .datepicker table tr td.active.highlighted:active, .datepicker table tr td.active.highlighted.active {
   color: #fff;
-  background-color: #286090;
-  border-color: #204d74;
+  background-color: #1a88ff;
+  border-color: #2087f5;
 }
 
 .datepicker table tr td.active:active:hover, .datepicker table tr td.active:active:focus, .datepicker table tr td.active.focus:active, .datepicker table tr td.active.active:hover, .datepicker table tr td.active.active:focus, .datepicker table tr td.active.active.focus, .datepicker table tr td.active.highlighted:active:hover, .datepicker table tr td.active.highlighted:active:focus, .datepicker table tr td.active.highlighted.focus:active, .datepicker table tr td.active.highlighted.active:hover, .datepicker table tr td.active.highlighted.active:focus, .datepicker table tr td.active.highlighted.active.focus {
   color: #fff;
-  background-color: #204d74;
-  border-color: #122b40;
+  background-color: #2b91ff;
+  border-color: #4199f7;
 }
 
 .datepicker table tr td.active.disabled:hover, .datepicker table tr td.active.disabled:focus, .datepicker table tr td.active.disabled.focus, .datepicker table tr td.active[disabled]:hover, .datepicker table tr td.active[disabled]:focus, .datepicker table tr td.active.focus[disabled], fieldset[disabled] .datepicker table tr td.active:hover, fieldset[disabled] .datepicker table tr td.active:focus, fieldset[disabled] .datepicker table tr td.active.focus, .datepicker table tr td.active.highlighted.disabled:hover, .datepicker table tr td.active.highlighted.disabled:focus, .datepicker table tr td.active.highlighted.disabled.focus, .datepicker table tr td.active.highlighted[disabled]:hover, .datepicker table tr td.active.highlighted[disabled]:focus, .datepicker table tr td.active.highlighted.focus[disabled], fieldset[disabled] .datepicker table tr td.active.highlighted:hover, fieldset[disabled] .datepicker table tr td.active.highlighted:focus, fieldset[disabled] .datepicker table tr td.active.highlighted.focus {
-  background-color: #337ab7;
-  border-color: #2e6da4;
+  background-color: #007bff;
+  border-color: #0277f4;
 }
 
 .datepicker table tr td span {
@@ -421,53 +422,54 @@
 }
 
 .datepicker table tr td span:hover, .datepicker table tr td span.focused {
-  background: #eeeeee;
+  color: #000;
+  background: #e9e9ea;
 }
 
 .datepicker table tr td span.disabled, .datepicker table tr td span.disabled:hover {
   background: none;
-  color: #777777;
+  color: #6c757d;
   cursor: default;
 }
 
 .datepicker table tr td span.active, .datepicker table tr td span.active:hover, .datepicker table tr td span.active.disabled, .datepicker table tr td span.active.disabled:hover {
   color: #fff;
-  background-color: #337ab7;
-  border-color: #2e6da4;
+  background-color: #007bff;
+  border-color: #0277f4;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
 }
 
 .datepicker table tr td span.active:focus, .datepicker table tr td span.active.focus, .datepicker table tr td span.active:hover:focus, .datepicker table tr td span.active.focus:hover, .datepicker table tr td span.active.disabled:focus, .datepicker table tr td span.active.disabled.focus, .datepicker table tr td span.active.disabled:hover:focus, .datepicker table tr td span.active.disabled.focus:hover {
   color: #fff;
-  background-color: #286090;
-  border-color: #122b40;
+  background-color: #1a88ff;
+  border-color: #4199f7;
 }
 
 .datepicker table tr td span.active:hover, .datepicker table tr td span.active:hover:hover, .datepicker table tr td span.active.disabled:hover, .datepicker table tr td span.active.disabled:hover:hover {
   color: #fff;
-  background-color: #286090;
-  border-color: #204d74;
+  background-color: #80bdff;
+  border-color: #2087f5;
 }
 
 .datepicker table tr td span.active:active, .datepicker table tr td span.active.active, .datepicker table tr td span.active:hover:active, .datepicker table tr td span.active.active:hover, .datepicker table tr td span.active.disabled:active, .datepicker table tr td span.active.disabled.active, .datepicker table tr td span.active.disabled:hover:active, .datepicker table tr td span.active.disabled.active:hover {
   color: #fff;
-  background-color: #286090;
-  border-color: #204d74;
+  background-color: #1a88ff;
+  border-color: #2087f5;
 }
 
 .datepicker table tr td span.active:active:hover, .datepicker table tr td span.active:active:focus, .datepicker table tr td span.active.focus:active, .datepicker table tr td span.active.active:hover, .datepicker table tr td span.active.active:focus, .datepicker table tr td span.active.active.focus, .datepicker table tr td span.active:hover:active:hover, .datepicker table tr td span.active:hover:active:focus, .datepicker table tr td span.active.focus:hover:active, .datepicker table tr td span.active.active:hover:hover, .datepicker table tr td span.active.active:hover:focus, .datepicker table tr td span.active.active.focus:hover, .datepicker table tr td span.active.disabled:active:hover, .datepicker table tr td span.active.disabled:active:focus, .datepicker table tr td span.active.disabled.focus:active, .datepicker table tr td span.active.disabled.active:hover, .datepicker table tr td span.active.disabled.active:focus, .datepicker table tr td span.active.disabled.active.focus, .datepicker table tr td span.active.disabled:hover:active:hover, .datepicker table tr td span.active.disabled:hover:active:focus, .datepicker table tr td span.active.disabled.focus:hover:active, .datepicker table tr td span.active.disabled.active:hover:hover, .datepicker table tr td span.active.disabled.active:hover:focus, .datepicker table tr td span.active.disabled.active.focus:hover {
   color: #fff;
-  background-color: #204d74;
-  border-color: #122b40;
+  background-color: #2b91ff;
+  border-color: #4199f7;
 }
 
 .datepicker table tr td span.active.disabled:hover, .datepicker table tr td span.active.disabled:focus, .datepicker table tr td span.active.disabled.focus, .datepicker table tr td span.active[disabled]:hover, .datepicker table tr td span.active[disabled]:focus, .datepicker table tr td span.active.focus[disabled], fieldset[disabled] .datepicker table tr td span.active:hover, fieldset[disabled] .datepicker table tr td span.active:focus, fieldset[disabled] .datepicker table tr td span.active.focus, .datepicker table tr td span.active.disabled:hover:hover, .datepicker table tr td span.active.disabled:hover:focus, .datepicker table tr td span.active.disabled.focus:hover, .datepicker table tr td span.active[disabled]:hover:hover, .datepicker table tr td span.active[disabled]:hover:focus, .datepicker table tr td span.active.focus[disabled]:hover, fieldset[disabled] .datepicker table tr td span.active:hover:hover, fieldset[disabled] .datepicker table tr td span.active:hover:focus, fieldset[disabled] .datepicker table tr td span.active.focus:hover, .datepicker table tr td span.active.disabled.disabled:hover, .datepicker table tr td span.active.disabled.disabled:focus, .datepicker table tr td span.active.disabled.disabled.focus, .datepicker table tr td span.active.disabled[disabled]:hover, .datepicker table tr td span.active.disabled[disabled]:focus, .datepicker table tr td span.active.disabled.focus[disabled], fieldset[disabled] .datepicker table tr td span.active.disabled:hover, fieldset[disabled] .datepicker table tr td span.active.disabled:focus, fieldset[disabled] .datepicker table tr td span.active.disabled.focus, .datepicker table tr td span.active.disabled.disabled:hover:hover, .datepicker table tr td span.active.disabled.disabled:hover:focus, .datepicker table tr td span.active.disabled.disabled.focus:hover, .datepicker table tr td span.active.disabled[disabled]:hover:hover, .datepicker table tr td span.active.disabled[disabled]:hover:focus, .datepicker table tr td span.active.disabled.focus[disabled]:hover, fieldset[disabled] .datepicker table tr td span.active.disabled:hover:hover, fieldset[disabled] .datepicker table tr td span.active.disabled:hover:focus, fieldset[disabled] .datepicker table tr td span.active.disabled.focus:hover {
-  background-color: #337ab7;
-  border-color: #2e6da4;
+  background-color: #007bff;
+  border-color: #0277f4;
 }
 
 .datepicker table tr td span.old, .datepicker table tr td span.new {
-  color: #777777;
+  color: #6c757d;
 }
 
 .datepicker .datepicker-switch {
@@ -485,7 +487,8 @@
 .datepicker .prev:hover,
 .datepicker .next:hover,
 .datepicker tfoot tr th:hover {
-  background: #eeeeee;
+  color: #000;
+  background: #e9e9ea;
 }
 
 .datepicker .prev.disabled, .datepicker .next.disabled {
@@ -523,7 +526,7 @@
   width: auto;
   min-width: 16px;
   padding: 4px 5px;
-  line-height: 1.42857;
+  line-height: 1.5;
   border-width: 1px 0;
   margin-left: -5px;
   margin-right: -5px;
diff --git a/inst/www/shared/datepicker/css/bootstrap-datepicker3.min.css b/inst/www/shared/datepicker/css/bootstrap-datepicker3.min.css
index c9ad758e3a..1d33862db0 100644
--- a/inst/www/shared/datepicker/css/bootstrap-datepicker3.min.css
+++ b/inst/www/shared/datepicker/css/bootstrap-datepicker3.min.css
@@ -1 +1 @@
-.datepicker{border-radius:4px;direction:ltr}.datepicker-inline{width:220px}.datepicker-rtl{direction:rtl}.datepicker-rtl.dropdown-menu{left:auto}.datepicker-rtl table tr td span{float:right}.datepicker-dropdown{top:0;left:0;padding:4px}.datepicker-dropdown:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid rgba(0,0,0,0.15);border-top:0;border-bottom-color:rgba(0,0,0,0.2);position:absolute}.datepicker-dropdown:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;border-top:0;position:absolute}.datepicker-dropdown.datepicker-orient-left:before{left:6px}.datepicker-dropdown.datepicker-orient-left:after{left:7px}.datepicker-dropdown.datepicker-orient-right:before{right:6px}.datepicker-dropdown.datepicker-orient-right:after{right:7px}.datepicker-dropdown.datepicker-orient-bottom:before{top:-7px}.datepicker-dropdown.datepicker-orient-bottom:after{top:-6px}.datepicker-dropdown.datepicker-orient-top:before{bottom:-7px;border-bottom:0;border-top:7px solid rgba(0,0,0,0.15)}.datepicker-dropdown.datepicker-orient-top:after{bottom:-6px;border-bottom:0;border-top:6px solid #fff}.datepicker table{margin:0;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.datepicker table tr td,.datepicker table tr th{text-align:center;width:30px;height:30px;border-radius:4px;border:none}.table-striped .datepicker table tr td,.table-striped .datepicker table tr th{background-color:transparent}.datepicker table tr td.old,.datepicker table tr td.new{color:#777}.datepicker table tr td.day:hover,.datepicker table tr td.focused{background:#eee;cursor:pointer}.datepicker table tr td.disabled,.datepicker table tr td.disabled:hover{background:none;color:#777;cursor:default}.datepicker table tr td.highlighted{color:#000;background-color:#d9edf7;border-color:#85c5e5;border-radius:0}.datepicker table tr td.highlighted:focus,.datepicker table tr td.highlighted.focus{color:#000;background-color:#afd9ee;border-color:#298fc2}.datepicker table tr td.highlighted:hover{color:#000;background-color:#afd9ee;border-color:#52addb}.datepicker table tr td.highlighted:active,.datepicker table tr td.highlighted.active{color:#000;background-color:#afd9ee;border-color:#52addb}.datepicker table tr td.highlighted:active:hover,.datepicker table tr td.highlighted:active:focus,.datepicker table tr td.highlighted.focus:active,.datepicker table tr td.highlighted.active:hover,.datepicker table tr td.highlighted.active:focus,.datepicker table tr td.highlighted.active.focus{color:#000;background-color:#91cbe8;border-color:#298fc2}.datepicker table tr td.highlighted.disabled:hover,.datepicker table tr td.highlighted.disabled:focus,.datepicker table tr td.highlighted.disabled.focus,.datepicker table tr td.highlighted[disabled]:hover,.datepicker table tr td.highlighted[disabled]:focus,.datepicker table tr td.highlighted.focus[disabled],fieldset[disabled] .datepicker table tr td.highlighted:hover,fieldset[disabled] .datepicker table tr td.highlighted:focus,fieldset[disabled] .datepicker table tr td.highlighted.focus{background-color:#d9edf7;border-color:#85c5e5}.datepicker table tr td.highlighted.focused{background:#afd9ee}.datepicker table tr td.highlighted.disabled,.datepicker table tr td.highlighted.disabled:active{background:#d9edf7;color:#777}.datepicker table tr td.today{color:#000;background-color:#ffdb99;border-color:#ffb733}.datepicker table tr td.today:focus,.datepicker table tr td.today.focus{color:#000;background-color:#ffc966;border-color:#b37400}.datepicker table tr td.today:hover{color:#000;background-color:#ffc966;border-color:#f59e00}.datepicker table tr td.today:active,.datepicker table tr td.today.active{color:#000;background-color:#ffc966;border-color:#f59e00}.datepicker table tr td.today:active:hover,.datepicker table tr td.today:active:focus,.datepicker table tr td.today.focus:active,.datepicker table tr td.today.active:hover,.datepicker table tr td.today.active:focus,.datepicker table tr td.today.active.focus{color:#000;background-color:#ffbc42;border-color:#b37400}.datepicker table tr td.today.disabled:hover,.datepicker table tr td.today.disabled:focus,.datepicker table tr td.today.disabled.focus,.datepicker table tr td.today[disabled]:hover,.datepicker table tr td.today[disabled]:focus,.datepicker table tr td.today.focus[disabled],fieldset[disabled] .datepicker table tr td.today:hover,fieldset[disabled] .datepicker table tr td.today:focus,fieldset[disabled] .datepicker table tr td.today.focus{background-color:#ffdb99;border-color:#ffb733}.datepicker table tr td.today.focused{background:#ffc966}.datepicker table tr td.today.disabled,.datepicker table tr td.today.disabled:active{background:#ffdb99;color:#777}.datepicker table tr td.range{color:#000;background-color:#eee;border-color:#bbb;border-radius:0}.datepicker table tr td.range:focus,.datepicker table tr td.range.focus{color:#000;background-color:#d5d5d5;border-color:#7c7c7c}.datepicker table tr td.range:hover{color:#000;background-color:#d5d5d5;border-color:#9d9d9d}.datepicker table tr td.range:active,.datepicker table tr td.range.active{color:#000;background-color:#d5d5d5;border-color:#9d9d9d}.datepicker table tr td.range:active:hover,.datepicker table tr td.range:active:focus,.datepicker table tr td.range.focus:active,.datepicker table tr td.range.active:hover,.datepicker table tr td.range.active:focus,.datepicker table tr td.range.active.focus{color:#000;background-color:#c3c3c3;border-color:#7c7c7c}.datepicker table tr td.range.disabled:hover,.datepicker table tr td.range.disabled:focus,.datepicker table tr td.range.disabled.focus,.datepicker table tr td.range[disabled]:hover,.datepicker table tr td.range[disabled]:focus,.datepicker table tr td.range.focus[disabled],fieldset[disabled] .datepicker table tr td.range:hover,fieldset[disabled] .datepicker table tr td.range:focus,fieldset[disabled] .datepicker table tr td.range.focus{background-color:#eee;border-color:#bbb}.datepicker table tr td.range.focused{background:#d5d5d5}.datepicker table tr td.range.disabled,.datepicker table tr td.range.disabled:active{background:#eee;color:#777}.datepicker table tr td.range.highlighted{color:#000;background-color:#e4eef3;border-color:#9dc2d4}.datepicker table tr td.range.highlighted:focus,.datepicker table tr td.range.highlighted.focus{color:#000;background-color:#c1d8e3;border-color:#4a88a7}.datepicker table tr td.range.highlighted:hover{color:#000;background-color:#c1d8e3;border-color:#73a7c1}.datepicker table tr td.range.highlighted:active,.datepicker table tr td.range.highlighted.active{color:#000;background-color:#c1d8e3;border-color:#73a7c1}.datepicker table tr td.range.highlighted:active:hover,.datepicker table tr td.range.highlighted:active:focus,.datepicker table tr td.range.highlighted.focus:active,.datepicker table tr td.range.highlighted.active:hover,.datepicker table tr td.range.highlighted.active:focus,.datepicker table tr td.range.highlighted.active.focus{color:#000;background-color:#a8c8d8;border-color:#4a88a7}.datepicker table tr td.range.highlighted.disabled:hover,.datepicker table tr td.range.highlighted.disabled:focus,.datepicker table tr td.range.highlighted.disabled.focus,.datepicker table tr td.range.highlighted[disabled]:hover,.datepicker table tr td.range.highlighted[disabled]:focus,.datepicker table tr td.range.highlighted.focus[disabled],fieldset[disabled] .datepicker table tr td.range.highlighted:hover,fieldset[disabled] .datepicker table tr td.range.highlighted:focus,fieldset[disabled] .datepicker table tr td.range.highlighted.focus{background-color:#e4eef3;border-color:#9dc2d4}.datepicker table tr td.range.highlighted.focused{background:#c1d8e3}.datepicker table tr td.range.highlighted.disabled,.datepicker table tr td.range.highlighted.disabled:active{background:#e4eef3;color:#777}.datepicker table tr td.range.today{color:#000;background-color:#f7ca77;border-color:#f1a417}.datepicker table tr td.range.today:focus,.datepicker table tr td.range.today.focus{color:#000;background-color:#f4b747;border-color:#815608}.datepicker table tr td.range.today:hover{color:#000;background-color:#f4b747;border-color:#c0800b}.datepicker table tr td.range.today:active,.datepicker table tr td.range.today.active{color:#000;background-color:#f4b747;border-color:#c0800b}.datepicker table tr td.range.today:active:hover,.datepicker table tr td.range.today:active:focus,.datepicker table tr td.range.today.focus:active,.datepicker table tr td.range.today.active:hover,.datepicker table tr td.range.today.active:focus,.datepicker table tr td.range.today.active.focus{color:#000;background-color:#f2aa25;border-color:#815608}.datepicker table tr td.range.today.disabled:hover,.datepicker table tr td.range.today.disabled:focus,.datepicker table tr td.range.today.disabled.focus,.datepicker table tr td.range.today[disabled]:hover,.datepicker table tr td.range.today[disabled]:focus,.datepicker table tr td.range.today.focus[disabled],fieldset[disabled] .datepicker table tr td.range.today:hover,fieldset[disabled] .datepicker table tr td.range.today:focus,fieldset[disabled] .datepicker table tr td.range.today.focus{background-color:#f7ca77;border-color:#f1a417}.datepicker table tr td.range.today.disabled,.datepicker table tr td.range.today.disabled:active{background:#f7ca77;color:#777}.datepicker table tr td.selected,.datepicker table tr td.selected.highlighted{color:#fff;background-color:#777;border-color:#555;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.datepicker table tr td.selected:focus,.datepicker table tr td.selected.focus,.datepicker table tr td.selected.highlighted:focus,.datepicker table tr td.selected.highlighted.focus{color:#fff;background-color:#5e5e5e;border-color:#161616}.datepicker table tr td.selected:hover,.datepicker table tr td.selected.highlighted:hover{color:#fff;background-color:#5e5e5e;border-color:#373737}.datepicker table tr td.selected:active,.datepicker table tr td.selected.active,.datepicker table tr td.selected.highlighted:active,.datepicker table tr td.selected.highlighted.active{color:#fff;background-color:#5e5e5e;border-color:#373737}.datepicker table tr td.selected:active:hover,.datepicker table tr td.selected:active:focus,.datepicker table tr td.selected.focus:active,.datepicker table tr td.selected.active:hover,.datepicker table tr td.selected.active:focus,.datepicker table tr td.selected.active.focus,.datepicker table tr td.selected.highlighted:active:hover,.datepicker table tr td.selected.highlighted:active:focus,.datepicker table tr td.selected.highlighted.focus:active,.datepicker table tr td.selected.highlighted.active:hover,.datepicker table tr td.selected.highlighted.active:focus,.datepicker table tr td.selected.highlighted.active.focus{color:#fff;background-color:#4c4c4c;border-color:#161616}.datepicker table tr td.selected.disabled:hover,.datepicker table tr td.selected.disabled:focus,.datepicker table tr td.selected.disabled.focus,.datepicker table tr td.selected[disabled]:hover,.datepicker table tr td.selected[disabled]:focus,.datepicker table tr td.selected.focus[disabled],fieldset[disabled] .datepicker table tr td.selected:hover,fieldset[disabled] .datepicker table tr td.selected:focus,fieldset[disabled] .datepicker table tr td.selected.focus,.datepicker table tr td.selected.highlighted.disabled:hover,.datepicker table tr td.selected.highlighted.disabled:focus,.datepicker table tr td.selected.highlighted.disabled.focus,.datepicker table tr td.selected.highlighted[disabled]:hover,.datepicker table tr td.selected.highlighted[disabled]:focus,.datepicker table tr td.selected.highlighted.focus[disabled],fieldset[disabled] .datepicker table tr td.selected.highlighted:hover,fieldset[disabled] .datepicker table tr td.selected.highlighted:focus,fieldset[disabled] .datepicker table tr td.selected.highlighted.focus{background-color:#777;border-color:#555}.datepicker table tr td.active,.datepicker table tr td.active.highlighted{color:#fff;background-color:#337ab7;border-color:#2e6da4;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.datepicker table tr td.active:focus,.datepicker table tr td.active.focus,.datepicker table tr td.active.highlighted:focus,.datepicker table tr td.active.highlighted.focus{color:#fff;background-color:#286090;border-color:#122b40}.datepicker table tr td.active:hover,.datepicker table tr td.active.highlighted:hover{color:#fff;background-color:#286090;border-color:#204d74}.datepicker table tr td.active:active,.datepicker table tr td.active.active,.datepicker table tr td.active.highlighted:active,.datepicker table tr td.active.highlighted.active{color:#fff;background-color:#286090;border-color:#204d74}.datepicker table tr td.active:active:hover,.datepicker table tr td.active:active:focus,.datepicker table tr td.active.focus:active,.datepicker table tr td.active.active:hover,.datepicker table tr td.active.active:focus,.datepicker table tr td.active.active.focus,.datepicker table tr td.active.highlighted:active:hover,.datepicker table tr td.active.highlighted:active:focus,.datepicker table tr td.active.highlighted.focus:active,.datepicker table tr td.active.highlighted.active:hover,.datepicker table tr td.active.highlighted.active:focus,.datepicker table tr td.active.highlighted.active.focus{color:#fff;background-color:#204d74;border-color:#122b40}.datepicker table tr td.active.disabled:hover,.datepicker table tr td.active.disabled:focus,.datepicker table tr td.active.disabled.focus,.datepicker table tr td.active[disabled]:hover,.datepicker table tr td.active[disabled]:focus,.datepicker table tr td.active.focus[disabled],fieldset[disabled] .datepicker table tr td.active:hover,fieldset[disabled] .datepicker table tr td.active:focus,fieldset[disabled] .datepicker table tr td.active.focus,.datepicker table tr td.active.highlighted.disabled:hover,.datepicker table tr td.active.highlighted.disabled:focus,.datepicker table tr td.active.highlighted.disabled.focus,.datepicker table tr td.active.highlighted[disabled]:hover,.datepicker table tr td.active.highlighted[disabled]:focus,.datepicker table tr td.active.highlighted.focus[disabled],fieldset[disabled] .datepicker table tr td.active.highlighted:hover,fieldset[disabled] .datepicker table tr td.active.highlighted:focus,fieldset[disabled] .datepicker table tr td.active.highlighted.focus{background-color:#337ab7;border-color:#2e6da4}.datepicker table tr td span{display:block;width:23%;height:54px;line-height:54px;float:left;margin:1%;cursor:pointer;border-radius:4px}.datepicker table tr td span:hover,.datepicker table tr td span.focused{background:#eee}.datepicker table tr td span.disabled,.datepicker table tr td span.disabled:hover{background:none;color:#777;cursor:default}.datepicker table tr td span.active,.datepicker table tr td span.active:hover,.datepicker table tr td span.active.disabled,.datepicker table tr td span.active.disabled:hover{color:#fff;background-color:#337ab7;border-color:#2e6da4;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.datepicker table tr td span.active:focus,.datepicker table tr td span.active.focus,.datepicker table tr td span.active:hover:focus,.datepicker table tr td span.active.focus:hover,.datepicker table tr td span.active.disabled:focus,.datepicker table tr td span.active.disabled.focus,.datepicker table tr td span.active.disabled:hover:focus,.datepicker table tr td span.active.disabled.focus:hover{color:#fff;background-color:#286090;border-color:#122b40}.datepicker table tr td span.active:hover,.datepicker table tr td span.active:hover:hover,.datepicker table tr td span.active.disabled:hover,.datepicker table tr td span.active.disabled:hover:hover{color:#fff;background-color:#286090;border-color:#204d74}.datepicker table tr td span.active:active,.datepicker table tr td span.active.active,.datepicker table tr td span.active:hover:active,.datepicker table tr td span.active.active:hover,.datepicker table tr td span.active.disabled:active,.datepicker table tr td span.active.disabled.active,.datepicker table tr td span.active.disabled:hover:active,.datepicker table tr td span.active.disabled.active:hover{color:#fff;background-color:#286090;border-color:#204d74}.datepicker table tr td span.active:active:hover,.datepicker table tr td span.active:active:focus,.datepicker table tr td span.active.focus:active,.datepicker table tr td span.active.active:hover,.datepicker table tr td span.active.active:focus,.datepicker table tr td span.active.active.focus,.datepicker table tr td span.active:hover:active:hover,.datepicker table tr td span.active:hover:active:focus,.datepicker table tr td span.active.focus:hover:active,.datepicker table tr td span.active.active:hover:hover,.datepicker table tr td span.active.active:hover:focus,.datepicker table tr td span.active.active.focus:hover,.datepicker table tr td span.active.disabled:active:hover,.datepicker table tr td span.active.disabled:active:focus,.datepicker table tr td span.active.disabled.focus:active,.datepicker table tr td span.active.disabled.active:hover,.datepicker table tr td span.active.disabled.active:focus,.datepicker table tr td span.active.disabled.active.focus,.datepicker table tr td span.active.disabled:hover:active:hover,.datepicker table tr td span.active.disabled:hover:active:focus,.datepicker table tr td span.active.disabled.focus:hover:active,.datepicker table tr td span.active.disabled.active:hover:hover,.datepicker table tr td span.active.disabled.active:hover:focus,.datepicker table tr td span.active.disabled.active.focus:hover{color:#fff;background-color:#204d74;border-color:#122b40}.datepicker table tr td span.active.disabled:hover,.datepicker table tr td span.active.disabled:focus,.datepicker table tr td span.active.disabled.focus,.datepicker table tr td span.active[disabled]:hover,.datepicker table tr td span.active[disabled]:focus,.datepicker table tr td span.active.focus[disabled],fieldset[disabled] .datepicker table tr td span.active:hover,fieldset[disabled] .datepicker table tr td span.active:focus,fieldset[disabled] .datepicker table tr td span.active.focus,.datepicker table tr td span.active.disabled:hover:hover,.datepicker table tr td span.active.disabled:hover:focus,.datepicker table tr td span.active.disabled.focus:hover,.datepicker table tr td span.active[disabled]:hover:hover,.datepicker table tr td span.active[disabled]:hover:focus,.datepicker table tr td span.active.focus[disabled]:hover,fieldset[disabled] .datepicker table tr td span.active:hover:hover,fieldset[disabled] .datepicker table tr td span.active:hover:focus,fieldset[disabled] .datepicker table tr td span.active.focus:hover,.datepicker table tr td span.active.disabled.disabled:hover,.datepicker table tr td span.active.disabled.disabled:focus,.datepicker table tr td span.active.disabled.disabled.focus,.datepicker table tr td span.active.disabled[disabled]:hover,.datepicker table tr td span.active.disabled[disabled]:focus,.datepicker table tr td span.active.disabled.focus[disabled],fieldset[disabled] .datepicker table tr td span.active.disabled:hover,fieldset[disabled] .datepicker table tr td span.active.disabled:focus,fieldset[disabled] .datepicker table tr td span.active.disabled.focus,.datepicker table tr td span.active.disabled.disabled:hover:hover,.datepicker table tr td span.active.disabled.disabled:hover:focus,.datepicker table tr td span.active.disabled.disabled.focus:hover,.datepicker table tr td span.active.disabled[disabled]:hover:hover,.datepicker table tr td span.active.disabled[disabled]:hover:focus,.datepicker table tr td span.active.disabled.focus[disabled]:hover,fieldset[disabled] .datepicker table tr td span.active.disabled:hover:hover,fieldset[disabled] .datepicker table tr td span.active.disabled:hover:focus,fieldset[disabled] .datepicker table tr td span.active.disabled.focus:hover{background-color:#337ab7;border-color:#2e6da4}.datepicker table tr td span.old,.datepicker table tr td span.new{color:#777}.datepicker .datepicker-switch{width:145px}.datepicker .datepicker-switch,.datepicker .prev,.datepicker .next,.datepicker tfoot tr th{cursor:pointer}.datepicker .datepicker-switch:hover,.datepicker .prev:hover,.datepicker .next:hover,.datepicker tfoot tr th:hover{background:#eee}.datepicker .prev.disabled,.datepicker .next.disabled{visibility:hidden}.datepicker .cw{font-size:10px;width:12px;padding:0 2px 0 5px;vertical-align:middle}.input-group.date .input-group-addon{cursor:pointer}.input-daterange{width:100%}.input-daterange input{text-align:center}.input-daterange input:first-child{border-radius:3px 0 0 3px}.input-daterange input:last-child{border-radius:0 3px 3px 0}.input-daterange .input-group-addon{width:auto;min-width:16px;padding:4px 5px;line-height:1.42857;border-width:1px 0;margin-left:-5px;margin-right:-5px}
+.datepicker{border-radius:.25rem;direction:ltr}.datepicker-inline{width:220px}.datepicker-rtl{direction:rtl}.datepicker-rtl.dropdown-menu{left:auto}.datepicker-rtl table tr td span{float:right}.datepicker-dropdown{top:0;left:0;padding:4px}.datepicker-dropdown:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid rgba(0,0,0,0.15);border-top:0;border-bottom-color:rgba(0,0,0,0.2);position:absolute}.datepicker-dropdown:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;border-top:0;position:absolute}.datepicker-dropdown.datepicker-orient-left:before{left:6px}.datepicker-dropdown.datepicker-orient-left:after{left:7px}.datepicker-dropdown.datepicker-orient-right:before{right:6px}.datepicker-dropdown.datepicker-orient-right:after{right:7px}.datepicker-dropdown.datepicker-orient-bottom:before{top:-7px}.datepicker-dropdown.datepicker-orient-bottom:after{top:-6px}.datepicker-dropdown.datepicker-orient-top:before{bottom:-7px;border-bottom:0;border-top:7px solid rgba(0,0,0,0.15)}.datepicker-dropdown.datepicker-orient-top:after{bottom:-6px;border-bottom:0;border-top:6px solid #fff}.datepicker table{margin:0;-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.datepicker table tr td,.datepicker table tr th{text-align:center;width:30px;height:30px;border-radius:4px;border:none}.table-striped .datepicker table tr td,.table-striped .datepicker table tr th{background-color:transparent}.datepicker table tr td.old,.datepicker table tr td.new{color:#6c757d}.datepicker table tr td.day:hover,.datepicker table tr td.focused{color:#000;background:#e9e9ea;cursor:pointer}.datepicker table tr td.disabled,.datepicker table tr td.disabled:hover{background:none;color:#6c757d;cursor:default}.datepicker table tr td.highlighted{color:#000;background-color:#d1ecf1;border-color:#83ccd9;border-radius:0}.datepicker table tr td.highlighted:focus,.datepicker table tr td.highlighted.focus{color:#000;background-color:#bcd4d9;border-color:#6299a3}.datepicker table tr td.highlighted:hover{color:#000;background-color:#697679;border-color:#73b3bf}.datepicker table tr td.highlighted:active,.datepicker table tr td.highlighted.active{color:#000;background-color:#bcd4d9;border-color:#73b3bf}.datepicker table tr td.highlighted:active:hover,.datepicker table tr td.highlighted:active:focus,.datepicker table tr td.highlighted.focus:active,.datepicker table tr td.highlighted.active:hover,.datepicker table tr td.highlighted.active:focus,.datepicker table tr td.highlighted.active.focus{color:#000;background-color:#adc4c8;border-color:#6299a3}.datepicker table tr td.highlighted.disabled:hover,.datepicker table tr td.highlighted.disabled:focus,.datepicker table tr td.highlighted.disabled.focus,.datepicker table tr td.highlighted[disabled]:hover,.datepicker table tr td.highlighted[disabled]:focus,.datepicker table tr td.highlighted.focus[disabled],fieldset[disabled] .datepicker table tr td.highlighted:hover,fieldset[disabled] .datepicker table tr td.highlighted:focus,fieldset[disabled] .datepicker table tr td.highlighted.focus{background-color:#d1ecf1;border-color:#83ccd9}.datepicker table tr td.highlighted.focused{background:#aadce5}.datepicker table tr td.highlighted.disabled,.datepicker table tr td.highlighted.disabled:active{background:#d1ecf1;color:#6c757d}.datepicker table tr td.today{color:#000;background-color:#ffdb99;border-color:#ffb733}.datepicker table tr td.today:focus,.datepicker table tr td.today.focus{color:#000;background-color:#e6c58a;border-color:#bf8926}.datepicker table tr td.today:hover{color:#000;background-color:#806e4d;border-color:#e0a12d}.datepicker table tr td.today:active,.datepicker table tr td.today.active{color:#000;background-color:#e6c58a;border-color:#e0a12d}.datepicker table tr td.today:active:hover,.datepicker table tr td.today:active:focus,.datepicker table tr td.today.focus:active,.datepicker table tr td.today.active:hover,.datepicker table tr td.today.active:focus,.datepicker table tr td.today.active.focus{color:#000;background-color:#d4b67f;border-color:#bf8926}.datepicker table tr td.today.disabled:hover,.datepicker table tr td.today.disabled:focus,.datepicker table tr td.today.disabled.focus,.datepicker table tr td.today[disabled]:hover,.datepicker table tr td.today[disabled]:focus,.datepicker table tr td.today.focus[disabled],fieldset[disabled] .datepicker table tr td.today:hover,fieldset[disabled] .datepicker table tr td.today:focus,fieldset[disabled] .datepicker table tr td.today.focus{background-color:#ffdb99;border-color:#ffb733}.datepicker table tr td.today.focused{background:#ffc966}.datepicker table tr td.today.disabled,.datepicker table tr td.today.disabled:active{background:#ffdb99;color:#6c757d}.datepicker table tr td.range{color:#000;background-color:#e9e9ea;border-color:#b5b5b8;border-radius:0}.datepicker table tr td.range:focus,.datepicker table tr td.range.focus{color:#000;background-color:#d2d2d3;border-color:#88888a}.datepicker table tr td.range:hover{color:#000;background-color:#757575;border-color:#9f9fa2}.datepicker table tr td.range:active,.datepicker table tr td.range.active{color:#000;background-color:#d2d2d3;border-color:#9f9fa2}.datepicker table tr td.range:active:hover,.datepicker table tr td.range:active:focus,.datepicker table tr td.range.focus:active,.datepicker table tr td.range.active:hover,.datepicker table tr td.range.active:focus,.datepicker table tr td.range.active.focus{color:#000;background-color:#c1c1c2;border-color:#88888a}.datepicker table tr td.range.disabled:hover,.datepicker table tr td.range.disabled:focus,.datepicker table tr td.range.disabled.focus,.datepicker table tr td.range[disabled]:hover,.datepicker table tr td.range[disabled]:focus,.datepicker table tr td.range.focus[disabled],fieldset[disabled] .datepicker table tr td.range:hover,fieldset[disabled] .datepicker table tr td.range:focus,fieldset[disabled] .datepicker table tr td.range.focus{background-color:#e9e9ea;border-color:#b5b5b8}.datepicker table tr td.range.focused{background:#cfcfd1}.datepicker table tr td.range.disabled,.datepicker table tr td.range.disabled:active{background:#e9e9ea;color:#6c757d}.datepicker table tr td.range.highlighted{color:#000;background-color:#ddebee;border-color:#99c3cc}.datepicker table tr td.range.highlighted:focus,.datepicker table tr td.range.highlighted.focus{color:#000;background-color:#c7d4d6;border-color:#739299}.datepicker table tr td.range.highlighted:hover{color:#000;background-color:#6f7677;border-color:#87acb4}.datepicker table tr td.range.highlighted:active,.datepicker table tr td.range.highlighted.active{color:#000;background-color:#c7d4d6;border-color:#87acb4}.datepicker table tr td.range.highlighted:active:hover,.datepicker table tr td.range.highlighted:active:focus,.datepicker table tr td.range.highlighted.focus:active,.datepicker table tr td.range.highlighted.active:hover,.datepicker table tr td.range.highlighted.active:focus,.datepicker table tr td.range.highlighted.active.focus{color:#000;background-color:#b7c3c6;border-color:#739299}.datepicker table tr td.range.highlighted.disabled:hover,.datepicker table tr td.range.highlighted.disabled:focus,.datepicker table tr td.range.highlighted.disabled.focus,.datepicker table tr td.range.highlighted[disabled]:hover,.datepicker table tr td.range.highlighted[disabled]:focus,.datepicker table tr td.range.highlighted.focus[disabled],fieldset[disabled] .datepicker table tr td.range.highlighted:hover,fieldset[disabled] .datepicker table tr td.range.highlighted:focus,fieldset[disabled] .datepicker table tr td.range.highlighted.focus{background-color:#ddebee;border-color:#99c3cc}.datepicker table tr td.range.highlighted.focused{background:#bbd7dd}.datepicker table tr td.range.highlighted.disabled,.datepicker table tr td.range.highlighted.disabled:active{background:#ddebee;color:#6c757d}.datepicker table tr td.range.today{color:#000;background-color:#f4c775;border-color:#eca117}.datepicker table tr td.range.today:focus,.datepicker table tr td.range.today.focus{color:#000;background-color:#dcb369;border-color:#b17811}.datepicker table tr td.range.today:hover{color:#000;background-color:#7a643b;border-color:#d08d14}.datepicker table tr td.range.today:active,.datepicker table tr td.range.today.active{color:#000;background-color:#dcb369;border-color:#d08d14}.datepicker table tr td.range.today:active:hover,.datepicker table tr td.range.today:active:focus,.datepicker table tr td.range.today.focus:active,.datepicker table tr td.range.today.active:hover,.datepicker table tr td.range.today.active:focus,.datepicker table tr td.range.today.active.focus{color:#000;background-color:#cba561;border-color:#b17811}.datepicker table tr td.range.today.disabled:hover,.datepicker table tr td.range.today.disabled:focus,.datepicker table tr td.range.today.disabled.focus,.datepicker table tr td.range.today[disabled]:hover,.datepicker table tr td.range.today[disabled]:focus,.datepicker table tr td.range.today.focus[disabled],fieldset[disabled] .datepicker table tr td.range.today:hover,fieldset[disabled] .datepicker table tr td.range.today:focus,fieldset[disabled] .datepicker table tr td.range.today.focus{background-color:#f4c775;border-color:#eca117}.datepicker table tr td.range.today.disabled,.datepicker table tr td.range.today.disabled:active{background:#f4c775;color:#6c757d}.datepicker table tr td.selected,.datepicker table tr td.selected.highlighted{color:#fff;background-color:#898b8d;border-color:#6b6e71;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.datepicker table tr td.selected:focus,.datepicker table tr td.selected.focus,.datepicker table tr td.selected.highlighted:focus,.datepicker table tr td.selected.highlighted.focus{color:#fff;background-color:#959798;border-color:#909295}.datepicker table tr td.selected:hover,.datepicker table tr td.selected.highlighted:hover{color:#fff;background-color:#c4c5c6;border-color:#7d7f82}.datepicker table tr td.selected:active,.datepicker table tr td.selected.active,.datepicker table tr td.selected.highlighted:active,.datepicker table tr td.selected.highlighted.active{color:#fff;background-color:#959798;border-color:#7d7f82}.datepicker table tr td.selected:active:hover,.datepicker table tr td.selected:active:focus,.datepicker table tr td.selected.focus:active,.datepicker table tr td.selected.active:hover,.datepicker table tr td.selected.active:focus,.datepicker table tr td.selected.active.focus,.datepicker table tr td.selected.highlighted:active:hover,.datepicker table tr td.selected.highlighted:active:focus,.datepicker table tr td.selected.highlighted.focus:active,.datepicker table tr td.selected.highlighted.active:hover,.datepicker table tr td.selected.highlighted.active:focus,.datepicker table tr td.selected.highlighted.active.focus{color:#fff;background-color:#9d9fa0;border-color:#909295}.datepicker table tr td.selected.disabled:hover,.datepicker table tr td.selected.disabled:focus,.datepicker table tr td.selected.disabled.focus,.datepicker table tr td.selected[disabled]:hover,.datepicker table tr td.selected[disabled]:focus,.datepicker table tr td.selected.focus[disabled],fieldset[disabled] .datepicker table tr td.selected:hover,fieldset[disabled] .datepicker table tr td.selected:focus,fieldset[disabled] .datepicker table tr td.selected.focus,.datepicker table tr td.selected.highlighted.disabled:hover,.datepicker table tr td.selected.highlighted.disabled:focus,.datepicker table tr td.selected.highlighted.disabled.focus,.datepicker table tr td.selected.highlighted[disabled]:hover,.datepicker table tr td.selected.highlighted[disabled]:focus,.datepicker table tr td.selected.highlighted.focus[disabled],fieldset[disabled] .datepicker table tr td.selected.highlighted:hover,fieldset[disabled] .datepicker table tr td.selected.highlighted:focus,fieldset[disabled] .datepicker table tr td.selected.highlighted.focus{background-color:#898b8d;border-color:#6b6e71}.datepicker table tr td.active,.datepicker table tr td.active.highlighted{color:#fff;background-color:#007bff;border-color:#0277f4;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.datepicker table tr td.active:focus,.datepicker table tr td.active.focus,.datepicker table tr td.active.highlighted:focus,.datepicker table tr td.active.highlighted.focus{color:#fff;background-color:#1a88ff;border-color:#4199f7}.datepicker table tr td.active:hover,.datepicker table tr td.active.highlighted:hover{color:#fff;background-color:#80bdff;border-color:#2087f5}.datepicker table tr td.active:active,.datepicker table tr td.active.active,.datepicker table tr td.active.highlighted:active,.datepicker table tr td.active.highlighted.active{color:#fff;background-color:#1a88ff;border-color:#2087f5}.datepicker table tr td.active:active:hover,.datepicker table tr td.active:active:focus,.datepicker table tr td.active.focus:active,.datepicker table tr td.active.active:hover,.datepicker table tr td.active.active:focus,.datepicker table tr td.active.active.focus,.datepicker table tr td.active.highlighted:active:hover,.datepicker table tr td.active.highlighted:active:focus,.datepicker table tr td.active.highlighted.focus:active,.datepicker table tr td.active.highlighted.active:hover,.datepicker table tr td.active.highlighted.active:focus,.datepicker table tr td.active.highlighted.active.focus{color:#fff;background-color:#2b91ff;border-color:#4199f7}.datepicker table tr td.active.disabled:hover,.datepicker table tr td.active.disabled:focus,.datepicker table tr td.active.disabled.focus,.datepicker table tr td.active[disabled]:hover,.datepicker table tr td.active[disabled]:focus,.datepicker table tr td.active.focus[disabled],fieldset[disabled] .datepicker table tr td.active:hover,fieldset[disabled] .datepicker table tr td.active:focus,fieldset[disabled] .datepicker table tr td.active.focus,.datepicker table tr td.active.highlighted.disabled:hover,.datepicker table tr td.active.highlighted.disabled:focus,.datepicker table tr td.active.highlighted.disabled.focus,.datepicker table tr td.active.highlighted[disabled]:hover,.datepicker table tr td.active.highlighted[disabled]:focus,.datepicker table tr td.active.highlighted.focus[disabled],fieldset[disabled] .datepicker table tr td.active.highlighted:hover,fieldset[disabled] .datepicker table tr td.active.highlighted:focus,fieldset[disabled] .datepicker table tr td.active.highlighted.focus{background-color:#007bff;border-color:#0277f4}.datepicker table tr td span{display:block;width:23%;height:54px;line-height:54px;float:left;margin:1%;cursor:pointer;border-radius:4px}.datepicker table tr td span:hover,.datepicker table tr td span.focused{color:#000;background:#e9e9ea}.datepicker table tr td span.disabled,.datepicker table tr td span.disabled:hover{background:none;color:#6c757d;cursor:default}.datepicker table tr td span.active,.datepicker table tr td span.active:hover,.datepicker table tr td span.active.disabled,.datepicker table tr td span.active.disabled:hover{color:#fff;background-color:#007bff;border-color:#0277f4;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.datepicker table tr td span.active:focus,.datepicker table tr td span.active.focus,.datepicker table tr td span.active:hover:focus,.datepicker table tr td span.active.focus:hover,.datepicker table tr td span.active.disabled:focus,.datepicker table tr td span.active.disabled.focus,.datepicker table tr td span.active.disabled:hover:focus,.datepicker table tr td span.active.disabled.focus:hover{color:#fff;background-color:#1a88ff;border-color:#4199f7}.datepicker table tr td span.active:hover,.datepicker table tr td span.active:hover:hover,.datepicker table tr td span.active.disabled:hover,.datepicker table tr td span.active.disabled:hover:hover{color:#fff;background-color:#80bdff;border-color:#2087f5}.datepicker table tr td span.active:active,.datepicker table tr td span.active.active,.datepicker table tr td span.active:hover:active,.datepicker table tr td span.active.active:hover,.datepicker table tr td span.active.disabled:active,.datepicker table tr td span.active.disabled.active,.datepicker table tr td span.active.disabled:hover:active,.datepicker table tr td span.active.disabled.active:hover{color:#fff;background-color:#1a88ff;border-color:#2087f5}.datepicker table tr td span.active:active:hover,.datepicker table tr td span.active:active:focus,.datepicker table tr td span.active.focus:active,.datepicker table tr td span.active.active:hover,.datepicker table tr td span.active.active:focus,.datepicker table tr td span.active.active.focus,.datepicker table tr td span.active:hover:active:hover,.datepicker table tr td span.active:hover:active:focus,.datepicker table tr td span.active.focus:hover:active,.datepicker table tr td span.active.active:hover:hover,.datepicker table tr td span.active.active:hover:focus,.datepicker table tr td span.active.active.focus:hover,.datepicker table tr td span.active.disabled:active:hover,.datepicker table tr td span.active.disabled:active:focus,.datepicker table tr td span.active.disabled.focus:active,.datepicker table tr td span.active.disabled.active:hover,.datepicker table tr td span.active.disabled.active:focus,.datepicker table tr td span.active.disabled.active.focus,.datepicker table tr td span.active.disabled:hover:active:hover,.datepicker table tr td span.active.disabled:hover:active:focus,.datepicker table tr td span.active.disabled.focus:hover:active,.datepicker table tr td span.active.disabled.active:hover:hover,.datepicker table tr td span.active.disabled.active:hover:focus,.datepicker table tr td span.active.disabled.active.focus:hover{color:#fff;background-color:#2b91ff;border-color:#4199f7}.datepicker table tr td span.active.disabled:hover,.datepicker table tr td span.active.disabled:focus,.datepicker table tr td span.active.disabled.focus,.datepicker table tr td span.active[disabled]:hover,.datepicker table tr td span.active[disabled]:focus,.datepicker table tr td span.active.focus[disabled],fieldset[disabled] .datepicker table tr td span.active:hover,fieldset[disabled] .datepicker table tr td span.active:focus,fieldset[disabled] .datepicker table tr td span.active.focus,.datepicker table tr td span.active.disabled:hover:hover,.datepicker table tr td span.active.disabled:hover:focus,.datepicker table tr td span.active.disabled.focus:hover,.datepicker table tr td span.active[disabled]:hover:hover,.datepicker table tr td span.active[disabled]:hover:focus,.datepicker table tr td span.active.focus[disabled]:hover,fieldset[disabled] .datepicker table tr td span.active:hover:hover,fieldset[disabled] .datepicker table tr td span.active:hover:focus,fieldset[disabled] .datepicker table tr td span.active.focus:hover,.datepicker table tr td span.active.disabled.disabled:hover,.datepicker table tr td span.active.disabled.disabled:focus,.datepicker table tr td span.active.disabled.disabled.focus,.datepicker table tr td span.active.disabled[disabled]:hover,.datepicker table tr td span.active.disabled[disabled]:focus,.datepicker table tr td span.active.disabled.focus[disabled],fieldset[disabled] .datepicker table tr td span.active.disabled:hover,fieldset[disabled] .datepicker table tr td span.active.disabled:focus,fieldset[disabled] .datepicker table tr td span.active.disabled.focus,.datepicker table tr td span.active.disabled.disabled:hover:hover,.datepicker table tr td span.active.disabled.disabled:hover:focus,.datepicker table tr td span.active.disabled.disabled.focus:hover,.datepicker table tr td span.active.disabled[disabled]:hover:hover,.datepicker table tr td span.active.disabled[disabled]:hover:focus,.datepicker table tr td span.active.disabled.focus[disabled]:hover,fieldset[disabled] .datepicker table tr td span.active.disabled:hover:hover,fieldset[disabled] .datepicker table tr td span.active.disabled:hover:focus,fieldset[disabled] .datepicker table tr td span.active.disabled.focus:hover{background-color:#007bff;border-color:#0277f4}.datepicker table tr td span.old,.datepicker table tr td span.new{color:#6c757d}.datepicker .datepicker-switch{width:145px}.datepicker .datepicker-switch,.datepicker .prev,.datepicker .next,.datepicker tfoot tr th{cursor:pointer}.datepicker .datepicker-switch:hover,.datepicker .prev:hover,.datepicker .next:hover,.datepicker tfoot tr th:hover{color:#000;background:#e9e9ea}.datepicker .prev.disabled,.datepicker .next.disabled{visibility:hidden}.datepicker .cw{font-size:10px;width:12px;padding:0 2px 0 5px;vertical-align:middle}.input-group.date .input-group-addon{cursor:pointer}.input-daterange{width:100%}.input-daterange input{text-align:center}.input-daterange input:first-child{border-radius:3px 0 0 3px}.input-daterange input:last-child{border-radius:0 3px 3px 0}.input-daterange .input-group-addon{width:auto;min-width:16px;padding:4px 5px;line-height:1.5;border-width:1px 0;margin-left:-5px;margin-right:-5px}
diff --git a/inst/www/shared/datepicker/js/bootstrap-datepicker.js b/inst/www/shared/datepicker/js/bootstrap-datepicker.js
index a94f79fc11..c22f0806a8 100644
--- a/inst/www/shared/datepicker/js/bootstrap-datepicker.js
+++ b/inst/www/shared/datepicker/js/bootstrap-datepicker.js
@@ -660,7 +660,7 @@
 				visualPadding = 10,
 				container = $(this.o.container),
 				windowWidth = container.width(),
-				scrollTop = this.o.container === 'body' ? $(document).scrollTop() : container.scrollTop(),
+				scrollTop = this.o.container === 'body:first' ? $(document).scrollTop() : container.scrollTop(),
 				appendOffset = container.offset();
 
 			var parentsZindex = [0];
@@ -675,7 +675,7 @@
 			var left = offset.left - appendOffset.left;
 			var top = offset.top - appendOffset.top;
 
-			if (this.o.container !== 'body') {
+			if (this.o.container !== 'body:first') {
 				top += scrollTop;
 			}
 
@@ -1709,7 +1709,7 @@
 		enableOnReadonly: true,
 		showOnFocus: true,
 		zIndexOffset: 10,
-		container: 'body',
+		container: 'body:first',
 		immediateUpdates: false,
 		title: '',
 		templates: {
diff --git a/inst/www/shared/datepicker/scss/build3.scss b/inst/www/shared/datepicker/scss/build3.scss
index b5388654ba..3a9d55b7f6 100644
--- a/inst/www/shared/datepicker/scss/build3.scss
+++ b/inst/www/shared/datepicker/scss/build3.scss
@@ -6,32 +6,33 @@
 //
 // Variables and mixins copied from Bootstrap 3.3.5
 
-// Variables
-$gray:                   lighten(#000, 33.5%); // #555
-$gray-light:             lighten(#000, 46.7%); // #777
-$gray-lighter:           lighten(#000, 93.5%); // #eee
+// These are BS3 variables that are used in datepicker3.scss. So, when compiling against
+// a BS3 bslib theme, these variables should already be defined. Here we set
+// *defaults* for these variables based on BS4 variables, so this scss can work for
+// both BS3 and BS4
+$gray:                mix($body-bg, $body-color, 33.5%) !default;
+$gray-light:          mix($body-bg, $body-color, 46.7%) !default;
+$gray-lighter:        mix($body-bg, $body-color, 90%) !default;
+$brand-primary:       $primary !default;
+$btn-primary-color:   $body-bg !default;
+$btn-primary-bg:      $primary !default;
+$btn-primary-border:  mix($body-color, $btn-primary-bg, 5%) !default;
+$state-info-bg:       mix($body-bg, $info, 80%) !default;
+$border-radius-base:  $border-radius !default;
+$dropdown-border:     $dropdown-border-color !default;
+// These variables are also used in datepicker3.scss, but we don't need to set them since
+// they're the same in BS3 and BS4
+//$line-height-base:        1.428571429;
+//$btn-link-disabled-color: $gray-light;
+//$dropdown-bg:             #fff;
 
-$brand-primary:         darken(#428bca, 6.5%); // #337ab7
 
-$btn-primary-color:              #fff;
-$btn-primary-bg:                 $brand-primary;
-$btn-primary-border:             darken($btn-primary-bg, 5%);
 
-$btn-link-disabled-color:        $gray-light;
 
-$state-info-bg:           #d9edf7;
 
-$line-height-base:        1.428571429; // 20/14
-$border-radius-base:      4px;
+@mixin button-variant($background, $border) {
+  $color: color-contrast($background);
 
-$dropdown-bg:                   #fff;
-$dropdown-border:               rgba(0,0,0,.15);
-
-
-// Mixins
-
-// Button variants
-@mixin button-variant($color, $background, $border) {
   color: $color;
   background-color: $background;
   border-color: $border;
@@ -39,26 +40,26 @@ $dropdown-border:               rgba(0,0,0,.15);
   &:focus,
   &.focus {
     color: $color;
-    background-color: darken($background, 10%);
-        border-color: darken($border, 25%);
+    background-color: mix($background, $color, 90%);
+        border-color: mix($border, $color, 75%);
   }
   &:hover {
     color: $color;
-    background-color: darken($background, 10%);
-        border-color: darken($border, 12%);
+    background-color: mix($background, $color, 50%);
+        border-color: mix($border, $color, 88%);
   }
   &:active,
   &.active {
     color: $color;
-    background-color: darken($background, 10%);
-        border-color: darken($border, 12%);
+    background-color: mix($background, $color, 90%);
+        border-color: mix($border, $color, 88%);
 
     &:hover,
     &:focus,
     &.focus {
       color: $color;
-      background-color: darken($background, 17%);
-          border-color: darken($border, 25%);
+      background-color: mix($background, $color, 83%);
+          border-color: mix($border, $color, 75%);
     }
   }
   &.disabled,
diff --git a/inst/www/shared/datepicker/scss/datepicker3.scss b/inst/www/shared/datepicker/scss/datepicker3.scss
index 3d1621e0c8..e1b7585c8c 100644
--- a/inst/www/shared/datepicker/scss/datepicker3.scss
+++ b/inst/www/shared/datepicker/scss/datepicker3.scss
@@ -1,5 +1,15 @@
+// Both BS3 and BS4 define a border radius mixin, but just in case
+// we're trying to compile this without bootstrapSass
+@mixin border-radius-shim($radius) {
+  @if mixin-exists("border-radius") {
+    @include border-radius($radius);
+  } @else {
+    border-radius: $radius;
+  }
+}
+
 .datepicker {
-	border-radius: $border-radius-base;
+	@include border-radius-shim($border-radius-base);
 	&-inline {
 		width: 220px;
 	}
@@ -64,7 +74,7 @@
 				text-align: center;
 				width: 30px;
 				height: 30px;
-				border-radius: 4px;
+				@include border-radius-shim(4px);
 				border: none;
 			}
 		}
@@ -83,6 +93,7 @@
 		}
 		&.day:hover,
 		&.focused {
+		  color: color-contrast($gray-lighter);
 			background: $gray-lighter;
 			cursor: pointer;
 		}
@@ -94,7 +105,7 @@
 		}
 		&.highlighted {
 			$highlighted-bg: $state-info-bg;
-			@include button-variant(#000, $highlighted-bg, darken($highlighted-bg, 20%));
+			@include button-variant($highlighted-bg, darken($highlighted-bg, 20%));
 			border-radius: 0;
 
 			&.focused {
@@ -109,7 +120,7 @@
 		}
 		&.today {
 			$today-bg: lighten(orange, 30%);
-			@include button-variant(#000, $today-bg, darken($today-bg, 20%));
+			@include button-variant($today-bg, darken($today-bg, 20%));
 
 			&.focused {
 				background: darken($today-bg, 10%);
@@ -123,7 +134,7 @@
 		}
 		&.range {
 			$range-bg: $gray-lighter;
-			@include button-variant(#000, $range-bg, darken($range-bg, 20%));
+			@include button-variant($range-bg, darken($range-bg, 20%));
 			border-radius: 0;
 
 			&.focused {
@@ -138,7 +149,7 @@
 		}
 		&.range.highlighted {
 			$range-highlighted-bg: mix($state-info-bg, $gray-lighter, 50%);
-			@include button-variant(#000, $range-highlighted-bg, darken($range-highlighted-bg, 20%));
+			@include button-variant($range-highlighted-bg, darken($range-highlighted-bg, 20%));
 
 			&.focused {
 				background: darken($range-highlighted-bg, 10%);
@@ -152,7 +163,7 @@
 		}
 		&.range.today {
 			$range-today-bg: mix(orange, $gray-lighter, 50%);
-			@include button-variant(#000, $range-today-bg, darken($range-today-bg, 20%));
+			@include button-variant($range-today-bg, darken($range-today-bg, 20%));
 
 			&.disabled,
 			&.disabled:active {
@@ -162,12 +173,12 @@
 		}
 		&.selected,
 		&.selected.highlighted {
-			@include button-variant(#fff, $gray-light, $gray);
+			@include button-variant($gray-light, $gray);
 			text-shadow: 0 -1px 0 rgba(0,0,0,.25);
 		}
 		&.active,
 		&.active.highlighted {
-			@include button-variant($btn-primary-color, $btn-primary-bg, $btn-primary-border);
+			@include button-variant($btn-primary-bg, $btn-primary-border);
 			text-shadow: 0 -1px 0 rgba(0,0,0,.25);
 		}
 		span {
@@ -178,9 +189,10 @@
 			float: left;
 			margin: 1%;
 			cursor: pointer;
-			border-radius: 4px;
+			@include border-radius-shim(4px);
 			&:hover,
 			&.focused {
+			  color: color-contrast($gray-lighter);
 				background: $gray-lighter;
 			}
 			&.disabled,
@@ -193,7 +205,7 @@
 			&.active:hover,
 			&.active.disabled,
 			&.active.disabled:hover {
-				@include button-variant($btn-primary-color, $btn-primary-bg, $btn-primary-border);
+				@include button-variant($btn-primary-bg, $btn-primary-border);
 				text-shadow: 0 -1px 0 rgba(0,0,0,.25);
 			}
 			&.old,
@@ -213,7 +225,8 @@
 	tfoot tr th {
 		cursor: pointer;
 		&:hover {
-			background: $gray-lighter;
+		  color: color-contrast($gray-lighter);
+		  background: $gray-lighter;
 		}
 	}
 
@@ -240,10 +253,10 @@
 		text-align: center;
 	}
 	input:first-child {
-		border-radius: 3px 0 0 3px;
+	  @include border-radius-shim(3px 0 0 3px);
 	}
 	input:last-child {
-		border-radius: 0 3px 3px 0;
+		@include border-radius-shim(0 3px 3px 0);
 	}
 	.input-group-addon {
 		width: auto;
diff --git a/tools/updateBootstrapDatepicker.R b/tools/updateBootstrapDatepicker.R
index a3e57eb57f..70ee49415e 100755
--- a/tools/updateBootstrapDatepicker.R
+++ b/tools/updateBootstrapDatepicker.R
@@ -44,6 +44,7 @@ dir.create(scss_dir, recursive = TRUE)
 src <- file.path(unzipped, paste0("bootstrap-datepicker-", version))
 system(paste0("npx less2sass ", src))
 
+
 # Copy over just the bootstrap
 sass_files <- file.path(src, c("less/datepicker3.scss", "build/build3.scss"))
 file.copy(sass_files, scss_dir)
@@ -62,15 +63,17 @@ invisible(lapply(
 
 # Apply patches to source
 patch_dir <- rprojroot::find_package_root_file("tools/datepicker-patches")
-for (patch in list.files(patch_dir, full.names = TRUE)) {
-  tryCatch(
-    {
-      message(sprintf("Applying %s", basename(patch)))
-      system(sprintf("git apply %s", patch))
-    },
-    error = function(e) quit(save = "no", status = 1)
-  )
-}
+withr::with_dir(find_package_root_file(), {
+  for (patch in list.files(patch_dir, full.names = TRUE)) {
+    tryCatch(
+      {
+        message(sprintf("Applying %s", basename(patch)))
+        system(sprintf("git apply %s", patch))
+      },
+      error = function(e) quit(save = "no", status = 1)
+    )
+  }
+})
 
 # Compile to CSS
 library(sass)