Merge pull request #1 from Tout/PLAT-2837

Plat 2837
Tout · Sep 23, 2017 · e24267c · e24267c
2 parents c1fd0c8 + f304987
commit e24267c
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 24 deletions.
diff --git a/build/css/bootstrap-datetimepicker.css b/build/css/bootstrap-datetimepicker.css
@@ -10,7 +10,7 @@
 }
 
 /*!
- * Datetimepicker for Bootstrap 3
+ * Datetimepicker for Bootstrap 4
  * ! version : 4.7.14
  * https://github.com/Eonasdan/bootstrap-datetimepicker/
  */
@@ -161,7 +161,7 @@
 }
 .bootstrap-datetimepicker-widget table th.disabled, .bootstrap-datetimepicker-widget table th.disabled:hover {
   background: none;
-  color: #636c72;
+  color: #868e96;
   cursor: not-allowed;
 }
 .bootstrap-datetimepicker-widget table th.prev::after {
@@ -174,7 +174,7 @@
   cursor: pointer;
 }
 .bootstrap-datetimepicker-widget table thead tr:first-child th:hover {
-  background: #eceeef;
+  background: #e9ecef;
 }
 .bootstrap-datetimepicker-widget table td {
   height: 54px;
@@ -185,7 +185,7 @@
   font-size: .8em;
   height: 20px;
   line-height: 20px;
-  color: #636c72;
+  color: #868e96;
 }
 .bootstrap-datetimepicker-widget table td.day {
   height: 20px;
@@ -194,11 +194,11 @@
   padding: 5px;
 }
 .bootstrap-datetimepicker-widget table td.day:hover, .bootstrap-datetimepicker-widget table td.hour:hover, .bootstrap-datetimepicker-widget table td.minute:hover, .bootstrap-datetimepicker-widget table td.second:hover {
-  background: #eceeef;
+  background: #e9ecef;
   cursor: pointer;
 }
 .bootstrap-datetimepicker-widget table td.old, .bootstrap-datetimepicker-widget table td.new {
-  color: #636c72;
+  color: #868e96;
 }
 .bootstrap-datetimepicker-widget table td.today {
   position: relative;
@@ -208,23 +208,23 @@
   display: inline-block;
   border: solid transparent;
   border-width: 0 0 7px 7px;
-  border-bottom-color: #0275d8;
+  border-bottom-color: #007bff;
   border-top-color: rgba(0, 0, 0, 0.2);
   position: absolute;
   bottom: 4px;
   right: 4px;
 }
 .bootstrap-datetimepicker-widget table td.active, .bootstrap-datetimepicker-widget table td.active:hover {
-  background-color: #0275d8;
-  color: #fff;
+  background-color: #007bff;
+  color: color-yiq(#007bff);
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
 }
 .bootstrap-datetimepicker-widget table td.active.today:before {
   border-bottom-color: #fff;
 }
 .bootstrap-datetimepicker-widget table td.disabled, .bootstrap-datetimepicker-widget table td.disabled:hover {
   background: none;
-  color: #636c72;
+  color: #868e96;
   cursor: not-allowed;
 }
 .bootstrap-datetimepicker-widget table td span {
@@ -237,19 +237,19 @@
   border-radius: 0.25rem;
 }
 .bootstrap-datetimepicker-widget table td span:hover {
-  background: #eceeef;
+  background: #e9ecef;
 }
 .bootstrap-datetimepicker-widget table td span.active {
-  background-color: #0275d8;
-  color: #fff;
+  background-color: #007bff;
+  color: color-yiq(#007bff);
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
 }
 .bootstrap-datetimepicker-widget table td span.old {
-  color: #636c72;
+  color: #868e96;
 }
 .bootstrap-datetimepicker-widget table td span.disabled, .bootstrap-datetimepicker-widget table td span.disabled:hover {
   background: none;
-  color: #636c72;
+  color: #868e96;
   cursor: not-allowed;
 }
 .bootstrap-datetimepicker-widget.usetwentyfour td.hour {

diff --git a/build/css/bootstrap-datetimepicker.min.css b/build/css/bootstrap-datetimepicker.min.css
diff --git a/package.json b/package.json
@@ -48,5 +48,5 @@
     "type": "git",
     "url": "https://github.com/Tout/bootstrap4-datetimepicker.git"
   },
-  "version": "5.2.4"
+  "version": "5.2.5"
 }
diff --git a/src/sass/_bootstrap-datetimepicker.scss b/src/sass/_bootstrap-datetimepicker.scss
@@ -1,15 +1,15 @@
 /*!
- * Datetimepicker for Bootstrap 3
+ * Datetimepicker for Bootstrap 4
  * ! version : 4.7.14
  * https://github.com/Eonasdan/bootstrap-datetimepicker/
  */
 $bs-datetimepicker-timepicker-font-size: 1.2em !default;
-$bs-datetimepicker-active-bg: $btn-primary-bg !default;
-$bs-datetimepicker-active-color: $btn-primary-color !default;
+$bs-datetimepicker-active-bg: theme-color("primary") !default;
+$bs-datetimepicker-active-color: color-yiq(theme-color("primary")) !default;
 $bs-datetimepicker-border-radius: $border-radius !default;
-$bs-datetimepicker-btn-hover-bg: $gray-lighter !default;
-$bs-datetimepicker-disabled-color: $gray-light !default;
-$bs-datetimepicker-alternate-color: $gray-light !default;
+$bs-datetimepicker-btn-hover-bg: $gray-200 !default;
+$bs-datetimepicker-disabled-color: $gray-600 !default;
+$bs-datetimepicker-alternate-color: $gray-600 !default;
 $bs-datetimepicker-secondary-border-color: #ccc !default;
 $bs-datetimepicker-secondary-border-color-rgba: rgba(0, 0, 0, 0.2) !default;
 $bs-datetimepicker-primary-border-color: white !default;