aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui
diff options
context:
space:
mode:
authorhwc4872012-05-17 08:58:52 -0700
committerhwc4872012-05-17 08:58:52 -0700
commita73034090b30d79a0722fc5d32e081f35d2c7f5c (patch)
tree1c7a8c519a3d2e2f52df73511281918c6c70449a /js/components/ui
parentcb37bee07085690d72e69a82e76cae9166e5f0f1 (diff)
parentc37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff)
downloadninja-a73034090b30d79a0722fc5d32e081f35d2c7f5c.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into 3DBugs
Diffstat (limited to 'js/components/ui')
-rwxr-xr-xjs/components/ui/color-chip.reel/color-chip.css10
1 files changed, 0 insertions, 10 deletions
diff --git a/js/components/ui/color-chip.reel/color-chip.css b/js/components/ui/color-chip.reel/color-chip.css
index da75c41e..7c7135a2 100755
--- a/js/components/ui/color-chip.reel/color-chip.css
+++ b/js/components/ui/color-chip.reel/color-chip.css
@@ -19,13 +19,3 @@
19 padding: 0; 19 padding: 0;
20 background: none; 20 background: none;
21} 21}
22
23.colortoolbar .chipContainer {
24 margin: 1px 1px 1px 1px !important;
25 width: 40px !important;
26 height: 20px !important;
27 border: 0;
28 padding: 0;
29 background-image: url(../../../../images/colorpanel/transparent.png) !important;
30 background-repeat: repeat !important;
31} \ No newline at end of file