From 46868bf8d9611e7f8e1fce2a08e958e3c1b6f4da Mon Sep 17 00:00:00 2001 From: Adam George Date: Wed, 16 Apr 2014 12:58:30 +1000 Subject: [PATCH 1/2] Border-radius should be inherited --- jquery.minicolors.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jquery.minicolors.css b/jquery.minicolors.css index a5917e6..bcd6ad1 100644 --- 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; From f80a8650425bb90feb37212df31818eca1054a53 Mon Sep 17 00:00:00 2001 From: Adam George Date: Wed, 16 Apr 2014 12:59:12 +1000 Subject: [PATCH 2/2] Support bootstrap input-sm and input-lg classes --- jquery.minicolors.css | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/jquery.minicolors.css b/jquery.minicolors.css index bcd6ad1..0031ef4 100644 --- a/jquery.minicolors.css +++ b/jquery.minicolors.css @@ -245,4 +245,15 @@ .minicolors-theme-bootstrap.minicolors-position-right .minicolors-input { padding-right: 44px; padding-left: 12px; -} \ No newline at end of file +} +.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; +}