diff options
| author | Pushkar Joshi | 2012-05-21 08:40:40 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-05-21 08:40:40 -0700 |
| commit | 11cfa9ef2871002b600f1c18f4e06e55a826163c (patch) | |
| tree | 381b23b0fa86cdf283a0da7a1b7d532a94e89db4 /js/components/ui | |
| parent | 4cb3612c9a67f4020d2949b5e5e5d84a90017974 (diff) | |
| parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
| download | ninja-11cfa9ef2871002b600f1c18f4e06e55a826163c.tar.gz | |
Merge branch 'master' into pentool
Diffstat (limited to 'js/components/ui')
| -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 | ||