diff options
| author | Jon Reid | 2012-05-22 10:40:40 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-22 10:40:40 -0700 |
| commit | d43a3179171a9f82c7a17425ec69ff0a4d571f10 (patch) | |
| tree | 1c78ccc588f04bac9bff4de82e527a128162cf4f /js/components/ui | |
| parent | 1324301feea23f9d66c9ca2f52e004b552e9ed96 (diff) | |
| parent | 0b6dfbbc7f6c0a67bd415ee8d64685b3f209edfa (diff) | |
| download | ninja-d43a3179171a9f82c7a17425ec69ff0a4d571f10.tar.gz | |
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
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 | ||