From cb061659580594958031645d5e1dece006e5a747 Mon Sep 17 00:00:00 2001
From: spiderr <spider@viovio.com>
Date: Thu, 25 Apr 2013 18:00:24 -0400
Subject: clean up colorpicker so it does not get clobbered by bootstrap

---
 .../libs/jquery/plugins/colorpicker/css/colorpicker.css    | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'javascript/libs/jquery/plugins')

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 {
-- 
cgit v1.3