diff options
| author | Jon Reid | 2012-06-15 10:10:41 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-15 10:10:41 -0700 |
| commit | 526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch) | |
| tree | 65939e59615aaa10a7db77211e71616ad531bd0e /js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.css | |
| parent | b5b760ee82e5cc4da176914983a6002cbf86c11a (diff) | |
| parent | 5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff) | |
| download | ninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz | |
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Diffstat (limited to 'js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.css')
| -rwxr-xr-x | js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.css | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.css b/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.css index 4db0abff..3ffcd2f5 100755 --- a/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.css +++ b/js/panels/color/colorpanelpopup.reel/css/colorpanelpopup.css | |||
| @@ -56,7 +56,7 @@ | |||
| 56 | 56 | ||
| 57 | /* line 62, colorpanelpopup.scss */ | 57 | /* line 62, colorpanelpopup.scss */ |
| 58 | .cp_pu_palettes { | 58 | .cp_pu_palettes { |
| 59 | background: #000; | 59 | background: url(../img/icon_palette.jpg) no-repeat black -1px -1px; |
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | /* line 67, colorpanelpopup.scss */ | 62 | /* line 67, colorpanelpopup.scss */ |