lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update bootstrap-datetimepicker and styles. Closes #675

Browse Source
This commit is contained in:
James Brooks
2015-05-28 14:26:51 +01:00
parent 40a65fe7e2
commit 8299afaa8a
5 changed files with 275 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bower.json
View File

@@ -15,7 +15,7 @@
"moment": "~2.9",
"livestampjs": "~1.1.2",
"chartjs": "~1.0.1",
"eonasdan-bootstrap-datetimepicker": "~4.0.0"
"eonasdan-bootstrap-datetimepicker": "~4.7.14"
},
"resolutions": {
"jquery": "~2.1.1"

4
public/build/dist/css/all-a3ad1e03.css → public/build/dist/css/all-100868c6.css vendored
View File

File diff suppressed because one or more lines are too long

24
public/build/dist/js/all-d0596004.js → public/build/dist/js/all-c132bc1e.js vendored
View File

File diff suppressed because one or more lines are too long

4
public/build/rev-manifest.json
View File

@@ -1,4 +1,4 @@
{
"dist/css/all.css": "dist/css/all-a3ad1e03.css",
"dist/js/all.js": "dist/js/all-d0596004.js"
"dist/css/all.css": "dist/css/all-100868c6.css",
"dist/js/all.js": "dist/js/all-c132bc1e.js"
}

241
resources/assets/sass/plugins/bootstrap-datetimepicker/bootstrap-datetimepicker.scss vendored
View File

@@ -2,38 +2,47 @@
@import "./bower_components/bootstrap-sass/assets/stylesheets/bootstrap/_variables";
.bootstrap-datetimepicker-widget {
top: 0;
left: 0;
width: 250px;
list-style: none;
&.dropdown-menu {
margin: 2px 0;
padding: 4px;
margin-top: 1px;
z-index: 99999 !important;
border-radius: $border-radius-base;
width: 19em;
&.timepicker-sbs {
width: 600px;
@media (min-width: $screen-sm-min) {
width: 38em;
}
@media (min-width: $screen-md-min) {
width: 38em;
}
@media (min-width: $screen-lg-min) {
width: 38em;
}
}
&:before, &:after {
content: '';
display: inline-block;
position: absolute;
}
&.bottom {
&:before {
content: '';
display: inline-block;
border-left: 7px solid transparent;
border-right: 7px solid transparent;
border-bottom: 7px solid #ccc;
border-bottom-color: rgba(0,0,0,.2);
position: absolute;
border-bottom-color: rgba(0, 0, 0, 0.2);
top: -7px;
left: 7px;
}
&:after {
content: '';
display: inline-block;
border-left: 6px solid transparent;
border-right: 6px solid transparent;
border-bottom: 6px solid white;
position: absolute;
top: -6px;
left: 8px;
}
@@ -41,33 +50,23 @@
&.top {
&:before {
content: '';
display: inline-block;
border-left: 7px solid transparent;
border-right: 7px solid transparent;
border-top: 7px solid #ccc;
border-top-color: rgba(0,0,0,.2);
position: absolute;
border-top-color: rgba(0, 0, 0, 0.2);
bottom: -7px;
left: 6px;
}
&:after {
content: '';
display: inline-block;
border-left: 6px solid transparent;
border-right: 6px solid transparent;
border-top: 6px solid white;
position: absolute;
bottom: -6px;
left: 7px;
}
}
& .dow {
width: 14.2857%;
}
&.pull-right {
&:before {
left: auto;
@@ -79,9 +78,9 @@
right: 7px;
}
}
}
>ul {
list-style-type: none;
.list-unstyled {
margin: 0;
}
@@ -104,38 +103,127 @@
padding: 6px;
}
table[data-hour-format="12"] .separator {
width: 4px;
padding: 0;
margin: 0;
.btn[data-action="incrementHours"]::after {
@extend .sr-only;
content: "Increment Hours";
}
.datepicker > div {
display: none;
.btn[data-action="incrementMinutes"]::after {
@extend .sr-only;
content: "Increment Minutes";
}
.btn[data-action="decrementHours"]::after {
@extend .sr-only;
content: "Decrement Hours";
}
.btn[data-action="decrementMinutes"]::after {
@extend .sr-only;
content: "Decrement Minutes";
}
.btn[data-action="showHours"]::after {
@extend .sr-only;
content: "Show Hours";
}
.btn[data-action="showMinutes"]::after {
@extend .sr-only;
content: "Show Minutes";
}
.btn[data-action="togglePeriod"]::after {
@extend .sr-only;
content: "Toggle AM/PM";
}
.btn[data-action="clear"]::after {
@extend .sr-only;
content: "Clear the picker";
}
.btn[data-action="today"]::after {
@extend .sr-only;
content: "Set the date to today";
}
.picker-switch {
text-align: center;
&::after {
@extend .sr-only;
content: "Toggle Date and Time Screens";
}
td {
padding: 0;
margin: 0;
height: auto;
width: auto;
line-height: inherit;
span {
line-height: 2.5;
height: 2.5em;
width: 100%;
}
}
}
table {
width: 100%;
margin: 0;
}
td,
th {
& td,
& th {
text-align: center;
border-radius: $border-radius-base;
}
td {
& th {
height: 20px;
line-height: 20px;
width: 20px;
&.picker-switch {
width: 145px;
}
&.disabled,
&.disabled:hover {
background: none;
color: $gray-light;
cursor: not-allowed;
}
&.prev::after {
@extend .sr-only;
content: "Previous Month";
}
&.next::after {
@extend .sr-only;
content: "Next Month";
}
}
& thead tr:first-child th {
cursor: pointer;
&:hover {
background: $gray-lighter;
}
}
& td {
height: 54px;
line-height: 54px;
width: 54px;
&.cw {
font-size: 10px;
font-size: .8em;
height: 20px;
line-height: 20px;
color: $gray-light;
@@ -166,8 +254,8 @@
&:before {
content: '';
display: inline-block;
border-left: 7px solid transparent;
border-bottom: 7px solid $btn-primary-bg;
border: 0 0 7px 7px solid transparent;
border-bottom-color: $cachet-primary;
border-top-color: rgba(0, 0, 0, 0.2);
position: absolute;
bottom: 4px;
@@ -177,9 +265,9 @@
&.active,
&.active:hover {
background-color: $btn-primary-bg;
background-color: $cachet-primary;
color: $btn-primary-color;
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
}
&.active.today:before {
@@ -207,9 +295,9 @@
}
&.active {
background-color: $btn-primary-bg;
background-color: $cachet-primary;
color: $btn-primary-color;
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
}
&.old {
@@ -224,68 +312,19 @@
}
}
}
th {
height: 20px;
line-height: 20px;
width: 20px;
&.picker-switch {
width: 145px;
}
&.next,
&.prev {
font-size: $font-size-base * 1.5;
&.usetwentyfour {
td.hour {
height: 27px;
line-height: 27px;
}
}
}
&.disabled,
&.disabled:hover {
background: none;
color: $gray-light;
cursor: not-allowed;
}
}
thead tr:first-child th {
.input-group.date {
& .input-group-addon {
cursor: pointer;
&:hover {
background: $gray-lighter;
}
}
}
.input-group {
&.date {
.input-group-addon span {
display: block;
cursor: pointer;
width: 16px;
height: 16px;
}
}
}
.bootstrap-datetimepicker-widget.left-oriented {
&:before {
left: auto;
right: 6px;
}
&:after {
left: auto;
right: 7px;
}
}
.bootstrap-datetimepicker-widget ul.list-unstyled li div.timepicker div.timepicker-picker table.table-condensed tbody > tr > td {
padding: 0px !important;
}
@media screen and (max-width: 767px) {
.bootstrap-datetimepicker-widget.timepicker-sbs {
width: 283px;
}
}