diff options
author | Ananya Sen | 2012-02-23 17:57:06 -0800 |
---|---|---|
committer | Ananya Sen | 2012-02-23 17:57:06 -0800 |
commit | a23455a887982d306d794b6afca497259cfa7f4a (patch) | |
tree | 7396eb7b5e0759035f666a7eee9d325979887d4a /js/panels/Timeline/Layer.reel/Layer.html | |
parent | 6e66f411ba02eaaeb33471115345ecf3c7ce4ce9 (diff) | |
parent | 97d6314f96f309332a655d49b95ec651c378bcf2 (diff) | |
download | ninja-a23455a887982d306d794b6afca497259cfa7f4a.tar.gz |
Merge branch 'refs/heads/FileIO-jose' into FileIO
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"> |