From db500e911c305af223abbe4e06a853da7f5399c2 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 10 Aug 2017 19:55:23 +0200 Subject: [PATCH] update date range picker --- public/css/daterangepicker.css | 515 +++++++++++-------------------- public/js/lib/daterangepicker.js | 15 +- 2 files changed, 190 insertions(+), 340 deletions(-) diff --git a/public/css/daterangepicker.css b/public/css/daterangepicker.css index 23fb4e1c69..86f4b775e9 100755 --- a/public/css/daterangepicker.css +++ b/public/css/daterangepicker.css @@ -1,213 +1,141 @@ .daterangepicker { - position: absolute; - color: inherit; - background: #fff; - border-radius: 4px; - width: 278px; - padding: 4px; - margin-top: 1px; - top: 100px; - left: 20px; - /* Calendars */ -} - -.daterangepicker:before, .daterangepicker:after { + position: absolute; + color: inherit; + background-color: #fff; + border-radius: 4px; + width: 278px; + padding: 4px; + margin-top: 1px; + top: 100px; + left: 20px; + /* Calendars */ } + .daterangepicker:before, .daterangepicker:after { position: absolute; display: inline-block; border-bottom-color: rgba(0, 0, 0, 0.2); - content: ''; -} - -.daterangepicker:before { + content: ''; } + .daterangepicker:before { top: -7px; border-right: 7px solid transparent; border-left: 7px solid transparent; - border-bottom: 7px solid #ccc; -} - -.daterangepicker:after { + border-bottom: 7px solid #ccc; } + .daterangepicker:after { top: -6px; border-right: 6px solid transparent; border-bottom: 6px solid #fff; - border-left: 6px solid transparent; -} - -.daterangepicker.opensleft:before { - right: 9px; -} - -.daterangepicker.opensleft:after { - right: 10px; -} - -.daterangepicker.openscenter:before { + border-left: 6px solid transparent; } + .daterangepicker.opensleft:before { + right: 9px; } + .daterangepicker.opensleft:after { + right: 10px; } + .daterangepicker.openscenter:before { left: 0; right: 0; width: 0; margin-left: auto; - margin-right: auto; -} - -.daterangepicker.openscenter:after { + margin-right: auto; } + .daterangepicker.openscenter:after { left: 0; right: 0; width: 0; margin-left: auto; - margin-right: auto; -} - -.daterangepicker.opensright:before { - left: 9px; -} - -.daterangepicker.opensright:after { - left: 10px; -} - -.daterangepicker.dropup { - margin-top: -5px; -} - -.daterangepicker.dropup:before { - top: initial; - bottom: -7px; - border-bottom: initial; - border-top: 7px solid #ccc; -} - -.daterangepicker.dropup:after { - top: initial; - bottom: -6px; - border-bottom: initial; - border-top: 6px solid #fff; -} - -.daterangepicker.dropdown-menu { + margin-right: auto; } + .daterangepicker.opensright:before { + left: 9px; } + .daterangepicker.opensright:after { + left: 10px; } + .daterangepicker.dropup { + margin-top: -5px; } + .daterangepicker.dropup:before { + top: initial; + bottom: -7px; + border-bottom: initial; + border-top: 7px solid #ccc; } + .daterangepicker.dropup:after { + top: initial; + bottom: -6px; + border-bottom: initial; + border-top: 6px solid #fff; } + .daterangepicker.dropdown-menu { max-width: none; - z-index: 3001; -} - -.daterangepicker.single .ranges, .daterangepicker.single .calendar { - float: none; -} - -.daterangepicker.show-calendar .calendar { - display: block; -} - -.daterangepicker .calendar { + z-index: 3001; } + .daterangepicker.single .ranges, .daterangepicker.single .calendar { + float: none; } + .daterangepicker.show-calendar .calendar { + display: block; } + .daterangepicker .calendar { display: none; max-width: 270px; - margin: 4px; -} - -.daterangepicker .calendar.single .calendar-table { - border: none; -} - -.daterangepicker .calendar th, .daterangepicker .calendar td { - white-space: nowrap; - text-align: center; - min-width: 32px; -} - -.daterangepicker .calendar-table { + margin: 4px; } + .daterangepicker .calendar.single .calendar-table { + border: none; } + .daterangepicker .calendar th, .daterangepicker .calendar td { + white-space: nowrap; + text-align: center; + min-width: 32px; } + .daterangepicker .calendar-table { border: 1px solid #fff; padding: 4px; border-radius: 4px; - background: #fff; -} - -.daterangepicker table { + background-color: #fff; } + .daterangepicker table { width: 100%; - margin: 0; -} - -.daterangepicker td, .daterangepicker th { + margin: 0; } + .daterangepicker td, .daterangepicker th { text-align: center; width: 20px; height: 20px; border-radius: 4px; border: 1px solid transparent; white-space: nowrap; - cursor: pointer; -} - -.daterangepicker td.available:hover, .daterangepicker th.available:hover { - background-color: #eee; - border-color: transparent; - color: inherit; -} - -.daterangepicker td.week, .daterangepicker th.week { - font-size: 80%; - color: #ccc; -} - -.daterangepicker td.off, .daterangepicker td.off.in-range, .daterangepicker td.off.start-date, .daterangepicker td.off.end-date { + cursor: pointer; } + .daterangepicker td.available:hover, .daterangepicker th.available:hover { + background-color: #eee; + border-color: transparent; + color: inherit; } + .daterangepicker td.week, .daterangepicker th.week { + font-size: 80%; + color: #ccc; } + .daterangepicker td.off, .daterangepicker td.off.in-range, .daterangepicker td.off.start-date, .daterangepicker td.off.end-date { background-color: #fff; border-color: transparent; - color: #999; -} - -.daterangepicker td.in-range { + color: #999; } + .daterangepicker td.in-range { background-color: #ebf4f8; border-color: transparent; color: #000; - border-radius: 0; -} - -.daterangepicker td.start-date { - border-radius: 4px 0 0 4px; -} - -.daterangepicker td.end-date { - border-radius: 0 4px 4px 0; -} - -.daterangepicker td.start-date.end-date { - border-radius: 4px; -} - -.daterangepicker td.active, .daterangepicker td.active:hover { + border-radius: 0; } + .daterangepicker td.start-date { + border-radius: 4px 0 0 4px; } + .daterangepicker td.end-date { + border-radius: 0 4px 4px 0; } + .daterangepicker td.start-date.end-date { + border-radius: 4px; } + .daterangepicker td.active, .daterangepicker td.active:hover { background-color: #357ebd; border-color: transparent; - color: #fff; -} - -.daterangepicker th.month { - width: auto; -} - -.daterangepicker td.disabled, .daterangepicker option.disabled { + color: #fff; } + .daterangepicker th.month { + width: auto; } + .daterangepicker td.disabled, .daterangepicker option.disabled { color: #999; cursor: not-allowed; - text-decoration: line-through; -} - -.daterangepicker select.monthselect, .daterangepicker select.yearselect { + text-decoration: line-through; } + .daterangepicker select.monthselect, .daterangepicker select.yearselect { font-size: 12px; padding: 1px; height: auto; margin: 0; - cursor: default; -} - -.daterangepicker select.monthselect { + cursor: default; } + .daterangepicker select.monthselect { margin-right: 2%; - width: 56%; -} - -.daterangepicker select.yearselect { - width: 40%; -} - -.daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.secondselect, .daterangepicker select.ampmselect { + width: 56%; } + .daterangepicker select.yearselect { + width: 40%; } + .daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.secondselect, .daterangepicker select.ampmselect { width: 50px; - margin-bottom: 0; -} - -.daterangepicker .input-mini { + margin-bottom: 0; } + .daterangepicker .input-mini { border: 1px solid #ccc; border-radius: 4px; color: #555; @@ -217,202 +145,125 @@ vertical-align: middle; margin: 0 0 5px 0; padding: 0 6px 0 28px; - width: 100%; -} - -.daterangepicker .input-mini.active { - border: 1px solid #08c; - border-radius: 4px; -} - -.daterangepicker .daterangepicker_input { - position: relative; -} - -.daterangepicker .daterangepicker_input i { - position: absolute; - left: 8px; - top: 8px; -} - -.daterangepicker.rtl .input-mini { + width: 100%; } + .daterangepicker .input-mini.active { + border: 1px solid #08c; + border-radius: 4px; } + .daterangepicker .daterangepicker_input { + position: relative; } + .daterangepicker .daterangepicker_input i { + position: absolute; + left: 8px; + top: 8px; } + .daterangepicker.rtl .input-mini { padding-right: 28px; - padding-left: 6px; -} - -.daterangepicker.rtl .daterangepicker_input i { + padding-left: 6px; } + .daterangepicker.rtl .daterangepicker_input i { left: auto; - right: 8px; -} - -.daterangepicker .calendar-time { + right: 8px; } + .daterangepicker .calendar-time { text-align: center; margin: 5px auto; line-height: 30px; position: relative; - padding-left: 28px; -} - -.daterangepicker .calendar-time select.disabled { - color: #ccc; - cursor: not-allowed; -} + padding-left: 28px; } + .daterangepicker .calendar-time select.disabled { + color: #ccc; + cursor: not-allowed; } .ranges { - font-size: 11px; - float: none; - margin: 4px; - text-align: left; -} - -.ranges ul { + font-size: 11px; + float: none; + margin: 4px; + text-align: left; } + .ranges ul { list-style: none; margin: 0 auto; padding: 0; - width: 100%; -} - -.ranges li { + width: 100%; } + .ranges li { font-size: 13px; - background: #f5f5f5; + background-color: #f5f5f5; border: 1px solid #f5f5f5; border-radius: 4px; color: #08c; padding: 3px 12px; margin-bottom: 8px; - cursor: pointer; -} - -.ranges li:hover { - background: #08c; - border: 1px solid #08c; - color: #fff; -} - -.ranges li.active { - background: #08c; - border: 1px solid #08c; - color: #fff; -} + cursor: pointer; } + .ranges li:hover { + background-color: #08c; + border: 1px solid #08c; + color: #fff; } + .ranges li.active { + background-color: #08c; + border: 1px solid #08c; + color: #fff; } /* Larger Screen Styling */ @media (min-width: 564px) { - .daterangepicker { - width: auto; - } - + .daterangepicker { + width: auto; } .daterangepicker .ranges ul { - width: 160px; - } - + width: 160px; } .daterangepicker.single .ranges ul { - width: 100%; - } - + width: 100%; } .daterangepicker.single .calendar.left { - clear: none; - } - + clear: none; } .daterangepicker.single.ltr .ranges, .daterangepicker.single.ltr .calendar { - float: left; - } - + float: left; } .daterangepicker.single.rtl .ranges, .daterangepicker.single.rtl .calendar { - float: right; - } - + float: right; } .daterangepicker.ltr { - direction: ltr; - text-align: left; - } - - .daterangepicker.ltr .calendar.left { + direction: ltr; + text-align: left; } + .daterangepicker.ltr .calendar.left { clear: left; - margin-right: 0; - } - - .daterangepicker.ltr .calendar.left .calendar-table { - border-right: none; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - } - - .daterangepicker.ltr .calendar.right { - margin-left: 0; - } - - .daterangepicker.ltr .calendar.right .calendar-table { - border-left: none; - border-top-left-radius: 0; - border-bottom-left-radius: 0; - } - - .daterangepicker.ltr .left .daterangepicker_input { - padding-right: 12px; - } - - .daterangepicker.ltr .calendar.left .calendar-table { - padding-right: 12px; - } - - .daterangepicker.ltr .ranges, .daterangepicker.ltr .calendar { - float: left; - } - + margin-right: 0; } + .daterangepicker.ltr .calendar.left .calendar-table { + border-right: none; + border-top-right-radius: 0; + border-bottom-right-radius: 0; } + .daterangepicker.ltr .calendar.right { + margin-left: 0; } + .daterangepicker.ltr .calendar.right .calendar-table { + border-left: none; + border-top-left-radius: 0; + border-bottom-left-radius: 0; } + .daterangepicker.ltr .left .daterangepicker_input { + padding-right: 12px; } + .daterangepicker.ltr .calendar.left .calendar-table { + padding-right: 12px; } + .daterangepicker.ltr .ranges, .daterangepicker.ltr .calendar { + float: left; } .daterangepicker.rtl { - direction: rtl; - text-align: right; - } - - .daterangepicker.rtl .calendar.left { + direction: rtl; + text-align: right; } + .daterangepicker.rtl .calendar.left { clear: right; - margin-left: 0; - } - - .daterangepicker.rtl .calendar.left .calendar-table { - border-left: none; - border-top-left-radius: 0; - border-bottom-left-radius: 0; - } - - .daterangepicker.rtl .calendar.right { - margin-right: 0; - } - - .daterangepicker.rtl .calendar.right .calendar-table { - border-right: none; - border-top-right-radius: 0; - border-bottom-right-radius: 0; - } - - .daterangepicker.rtl .left .daterangepicker_input { - padding-left: 12px; - } - - .daterangepicker.rtl .calendar.left .calendar-table { - padding-left: 12px; - } - - .daterangepicker.rtl .ranges, .daterangepicker.rtl .calendar { + margin-left: 0; } + .daterangepicker.rtl .calendar.left .calendar-table { + border-left: none; + border-top-left-radius: 0; + border-bottom-left-radius: 0; } + .daterangepicker.rtl .calendar.right { + margin-right: 0; } + .daterangepicker.rtl .calendar.right .calendar-table { + border-right: none; + border-top-right-radius: 0; + border-bottom-right-radius: 0; } + .daterangepicker.rtl .left .daterangepicker_input { + padding-left: 12px; } + .daterangepicker.rtl .calendar.left .calendar-table { + padding-left: 12px; } + .daterangepicker.rtl .ranges, .daterangepicker.rtl .calendar { text-align: right; - float: right; - } -} - + float: right; } } @media (min-width: 730px) { - .daterangepicker .ranges { - width: auto; - } - - .daterangepicker.ltr .ranges { - float: left; - } - - .daterangepicker.rtl .ranges { - float: right; - } - - .daterangepicker .calendar.left { - clear: none !important; - } -} + .daterangepicker .ranges { + width: auto; } + .daterangepicker.ltr .ranges { + float: left; } + .daterangepicker.rtl .ranges { + float: right; } + .daterangepicker .calendar.left { + clear: none !important; } } diff --git a/public/js/lib/daterangepicker.js b/public/js/lib/daterangepicker.js index f608e066f6..d0c4c7cb1c 100755 --- a/public/js/lib/daterangepicker.js +++ b/public/js/lib/daterangepicker.js @@ -1,11 +1,10 @@ -/** -* @version: 2.1.24 -* @author: Dan Grossman http://www.dangrossman.info/ -* @copyright: Copyright (c) 2012-2016 Dan Grossman. All rights reserved. -* @license: Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php -* @website: https://www.improvely.com/ -*/ -// Follow the UMD template https://github.com/umdjs/umd/blob/master/templates/returnExportsGlobal.js +/* + * daterangepicker.js + * Copyright (c) 2017 thegrumpydictator@gmail.com + * This software may be modified and distributed under the terms of the Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. + */ollow the UMD template https://github.com/umdjs/umd/blob/master/templates/returnExportsGlobal.js (function (root, factory) { if (typeof define === 'function' && define.amd) { // AMD. Make globaly available as well