diff options
author | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-17 14:01:38 -0700 |
commit | 6c8f3525b839e82cf43df43700a0160ee2c5458f (patch) | |
tree | 3fb801fa54b759c5568d75bb467e02652ce77c3e /js/components/ui/color-chip.reel | |
parent | e8ae5db7ce7023b638375cbc27a3f7b7a2f77b23 (diff) | |
parent | 342c97ac9b727b22a7b0bfefca4d2a168bc3055b (diff) | |
download | ninja-6c8f3525b839e82cf43df43700a0160ee2c5458f.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
css/ninja.css
scss/imports/scss/_toolbar.scss
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/components/ui/color-chip.reel')
-rwxr-xr-x | js/components/ui/color-chip.reel/color-chip.css | 10 |
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 | ||