diff options
| author | Jonathan Duran | 2012-02-23 07:37:17 -0800 |
|---|---|---|
| committer | Jonathan Duran | 2012-02-23 07:37:17 -0800 |
| commit | b7402018659cf8058d5646c08b2a916492269e33 (patch) | |
| tree | 26ffeeaae45bbaaca9931e747e9532c1831c50fd /js/panels/Timeline/Layer.reel/Layer.html | |
| parent | cc295dd0fb873505eed01c232bd987cf6e2dcdd9 (diff) | |
| download | ninja-b7402018659cf8058d5646c08b2a916492269e33.tar.gz | |
Timeline Reset to clean Master branch. Code scrub.
Fresh copy of ninja-internal/master with Timeline folder copied in to resolved merge issues.
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/panels/Timeline/Layer.reel/Layer.html')
| -rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html index dd819b2b..e262afe2 100644 --- a/js/panels/Timeline/Layer.reel/Layer.html +++ b/js/panels/Timeline/Layer.reel/Layer.html | |||
| @@ -153,7 +153,7 @@ | |||
| 153 | <div class="label-style"> | 153 | <div class="label-style"> |
| 154 | <span class="collapsible-label">Style</span> | 154 | <span class="collapsible-label">Style</span> |
| 155 | <span class="clicker-style collapsible-clicker"></span> | 155 | <span class="clicker-style collapsible-clicker"></span> |
| 156 | <div class="cssbutton button-delete"></div> | 156 | <div class="cssbutton button-delete disabled"></div> |
| 157 | <div class="cssbutton button-add"></div> | 157 | <div class="cssbutton button-add"></div> |
| 158 | </div> | 158 | </div> |
| 159 | <div class="content-style collapsible-content"> | 159 | <div class="content-style collapsible-content"> |