aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui/color-chip.reel
diff options
context:
space:
mode:
authorhwc4872012-05-17 11:06:20 -0700
committerhwc4872012-05-17 11:06:20 -0700
commit0a3c703ce285941da20167a6d04b13b7eced23be (patch)
treee87019bcc3356c58dc93d982af2cfe16b582974b /js/components/ui/color-chip.reel
parent1e649405d66f17d6acddb9055b181bba7ad70566 (diff)
parentc37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff)
downloadninja-0a3c703ce285941da20167a6d04b13b7eced23be.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'js/components/ui/color-chip.reel')
-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