diff options
| author | Jose Antonio Marquez | 2012-02-23 15:11:51 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-23 15:11:51 -0800 |
| commit | bdc39718cacad2eab10a7d031ea10fda13c92a03 (patch) | |
| tree | 5fa2ae85a15d8a5067fa6f608c2b285869264ead /js/panels/Timeline/Layer.reel/Layer.html | |
| parent | 23b4bbd13345ecd5c00fda60b995a7fb2aab317c (diff) | |
| parent | 41b69af7c0be3dd5fe4f772668862696af8b917a (diff) | |
| download | ninja-bdc39718cacad2eab10a7d031ea10fda13c92a03.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
js/controllers/document-controller.js
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"> |