Merge pull request #122 from asgeo1/bootstrap_fixes

Add support for boostrap `input-sm` and `input-lg` classes
claviska · Apr 16, 2014 · c4060b4 · c4060b4
2 parents fad977e + f80a865
commit c4060b4
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/jquery.minicolors.css b/jquery.minicolors.css
@@ -232,6 +232,9 @@
 	height: 28px;
 	border-radius: 3px;
 }
+.minicolors-theme-bootstrap .minicolors-swatch-color {
+	border-radius: inherit;
+}
 .minicolors-theme-bootstrap.minicolors-position-right .minicolors-swatch {
 	left: auto;
 	right: 3px;
@@ -242,4 +245,15 @@
 .minicolors-theme-bootstrap.minicolors-position-right .minicolors-input {
 	padding-right: 44px;
 	padding-left: 12px;
-}
+}
+.minicolors-theme-bootstrap .minicolors-input.input-lg + .minicolors-swatch {
+	top: 4px;
+	left: 4px;
+	width: 37px;
+	height: 37px;
+	border-radius: 5px;
+}
+.minicolors-theme-bootstrap .minicolors-input.input-sm + .minicolors-swatch {
+	width: 24px;
+	height: 24px;
+}