diff options
| author | spiderr <spider@viovio.com> | 2013-04-25 18:00:24 -0400 |
|---|---|---|
| committer | spiderr <spider@viovio.com> | 2013-04-25 18:00:24 -0400 |
| commit | cb061659580594958031645d5e1dece006e5a747 (patch) | |
| tree | e5a63a183f9159f4b8f8c58c8ea4a5375e76ca0b /javascript/libs/jquery/plugins | |
| parent | 723d4f3dc00766cddd38965a7e0ce265b8fe2777 (diff) | |
| download | util-cb061659580594958031645d5e1dece006e5a747.tar.gz util-cb061659580594958031645d5e1dece006e5a747.tar.bz2 util-cb061659580594958031645d5e1dece006e5a747.zip | |
clean up colorpicker so it does not get clobbered by bootstrap
Diffstat (limited to 'javascript/libs/jquery/plugins')
| -rwxr-xr-x | javascript/libs/jquery/plugins/colorpicker/css/colorpicker.css | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/javascript/libs/jquery/plugins/colorpicker/css/colorpicker.css b/javascript/libs/jquery/plugins/colorpicker/css/colorpicker.css index 4bb6ef1..400263d 100755 --- a/javascript/libs/jquery/plugins/colorpicker/css/colorpicker.css +++ b/javascript/libs/jquery/plugins/colorpicker/css/colorpicker.css @@ -68,19 +68,25 @@ top: 13px;
background: #f00;
}
-.colorpicker input {
+.colorpicker input[type="text"]:focus,
+.colorpicker input[type="text"] {
background-color: transparent;
border: 1px solid transparent;
position: absolute;
font-size: 10px;
font-family: Arial, Helvetica, sans-serif;
color: #898989;
- top: 4px;
+ top: 0px;
right: 11px;
text-align: right;
margin: 0;
padding: 0;
- height: 11px;
+ height: auto;
+ width: 50px;
+ transition: none;
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
}
.colorpicker_hex {
position: absolute;
@@ -90,7 +96,7 @@ left: 212px;
top: 142px;
}
-.colorpicker_hex input {
+.colorpicker_hex input[type="text"] {
right: 6px;
}
.colorpicker_field {
|