summaryrefslogtreecommitdiff
path: root/addons/web/static/lib/bootstrap-datetimepicker/src/less
diff options
context:
space:
mode:
authorCedric Snauwaert <csn@openerp.com>2014-08-14 14:10:40 +0200
committerCedric Snauwaert <csn@openerp.com>2014-08-25 12:11:17 +0200
commit36146b3fadc47543f4b696ab75c31b3459afb15b (patch)
tree206541a2737d22cb679ef0e3bad6d559b446508b /addons/web/static/lib/bootstrap-datetimepicker/src/less
parent88dfd62aa539c5c2ad3e24be06c1ac7cffedd1a5 (diff)
[FIX] web: update moment and datepicker library also add a controller to lazily load locale
Diffstat (limited to 'addons/web/static/lib/bootstrap-datetimepicker/src/less')
-rw-r--r--addons/web/static/lib/bootstrap-datetimepicker/src/less/bootstrap-datetimepicker-build.less2
-rwxr-xr-xaddons/web/static/lib/bootstrap-datetimepicker/src/less/bootstrap-datetimepicker.less20
2 files changed, 15 insertions, 7 deletions
diff --git a/addons/web/static/lib/bootstrap-datetimepicker/src/less/bootstrap-datetimepicker-build.less b/addons/web/static/lib/bootstrap-datetimepicker/src/less/bootstrap-datetimepicker-build.less
index 7f5288332e7..4a17370153b 100644
--- a/addons/web/static/lib/bootstrap-datetimepicker/src/less/bootstrap-datetimepicker-build.less
+++ b/addons/web/static/lib/bootstrap-datetimepicker/src/less/bootstrap-datetimepicker-build.less
@@ -1,5 +1,5 @@
// Import boostrap variables including default color palette and fonts
-@import "../bootstrap/variables.less";
+@import "../../node_modules/bootstrap/less/variables.less";
// Import datepicker component
@import "bootstrap-datetimepicker.less";
diff --git a/addons/web/static/lib/bootstrap-datetimepicker/src/less/bootstrap-datetimepicker.less b/addons/web/static/lib/bootstrap-datetimepicker/src/less/bootstrap-datetimepicker.less
index 48e9f1215a3..49fbc15d300 100755
--- a/addons/web/static/lib/bootstrap-datetimepicker/src/less/bootstrap-datetimepicker.less
+++ b/addons/web/static/lib/bootstrap-datetimepicker/src/less/bootstrap-datetimepicker.less
@@ -1,5 +1,6 @@
/*!
* Datetimepicker for Bootstrap v3
+//! version : 3.0.3
* https://github.com/Eonasdan/bootstrap-datetimepicker/
*/
.bootstrap-datetimepicker-widget {
@@ -9,7 +10,7 @@
padding: 4px;
margin-top: 1px;
z-index: 99999 !important;
- border-radius: 4px;
+ border-radius: @border-radius-base;
&.timepicker-sbs {
width: 600px;
@@ -123,7 +124,7 @@
td,
th {
text-align: center;
- border-radius: 4px;
+ border-radius: @border-radius-base;
}
td {
@@ -131,6 +132,14 @@
line-height: 54px;
width: 54px;
+ &.cw
+ {
+ font-size: 10px;
+ height: 20px;
+ line-height: 20px;
+ color: @gray-light;
+ }
+
&.day
{
height: 20px;
@@ -185,14 +194,13 @@
}
span {
- display: block;
+ display: inline-block;
width: 54px;
height: 54px;
line-height: 54px;
- float: left;
margin: 2px 1.5px;
cursor: pointer;
- border-radius: 4px;
+ border-radius: @border-radius-base;
&:hover {
background: @gray-lighter;
@@ -222,7 +230,7 @@
line-height: 20px;
width: 20px;
- &.switch {
+ &.picker-switch {
width: 145px;
}