Update bootstrap-colorpicker

pull/1226/merge
Raphaël Vinot 2016-06-06 17:03:23 +02:00
parent c199e3287e
commit 917d52f72f
3 changed files with 1073 additions and 903 deletions

View File

@ -5,7 +5,7 @@ set -e
D3JS='3.5.17'
JQUERY_UI='1.11.4'
JQUERY='2.2.4'
BOOTSTRAP_COLORPICKER='2.0.0-beta'
BOOTSTRAP_COLORPICKER='2.3.0'
BOOTSTRAP_DATEPICKER='1.5.0-RC1'
BOOTSTRAP_TIMEPICKER='0.2.6'
BOOTSTRAP_TRANSITION='2.3.2'

View File

@ -1,6 +1,6 @@
/*!
* Bootstrap Colorpicker
* http://mjaalnir.github.io/bootstrap-colorpicker/
* http://mjolnic.github.io/bootstrap-colorpicker/
*
* Originally written by (c) 2012 Stefan Petre
* Licensed under the Apache License v2.0
@ -72,6 +72,12 @@
background-image: url("../img/bootstrap-colorpicker/alpha.png");
}
.colorpicker-saturation,
.colorpicker-hue,
.colorpicker-alpha {
background-size: contain;
}
.colorpicker {
top: 0;
left: 0;
@ -143,15 +149,36 @@
height: 10px;
}
.colorpicker-element .input-group-addon i {
display: block;
.colorpicker-selectors {
display: none;
height: 10px;
margin-top: 5px;
clear: both;
}
.colorpicker-selectors i {
float: left;
width: 10px;
height: 10px;
cursor: pointer;
}
.colorpicker-selectors i + i {
margin-left: 3px;
}
.colorpicker-element .input-group-addon i,
.colorpicker-element .add-on i {
display: inline-block;
width: 16px;
height: 16px;
vertical-align: text-top;
cursor: pointer;
}
.colorpicker.colorpicker-inline {
position: static;
position: relative;
z-index: auto;
display: inline-block;
float: none;
}
@ -211,4 +238,14 @@
.colorpicker-inline.colorpicker-visible {
display: inline-block;
}
.colorpicker-right:before {
right: 6px;
left: auto;
}
.colorpicker-right:after {
right: 7px;
left: auto;
}

File diff suppressed because it is too large Load Diff