diff options
| author | Ananya Sen | 2012-05-31 10:13:40 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-05-31 10:13:40 -0700 |
| commit | 286457b4f23974277274ba388afd283e8aa085cb (patch) | |
| tree | c21bf791e7c4f572d12f97987ea6b89e74da67fe /js/components/ui/color-chip.reel/color-chip.css | |
| parent | 4d9b481c58090e8f1fc7b0e9d73a81b0f49cccc8 (diff) | |
| parent | d49c909cff7f0c5e5d0b127ad84a2fefc6677dc6 (diff) | |
| download | ninja-286457b4f23974277274ba388afd283e8aa085cb.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Conflicts:
js/controllers/styles-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/components/ui/color-chip.reel/color-chip.css')
| -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 | ||