aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets/content.reel/content.html
diff options
context:
space:
mode:
authorArmen Kesablyan2012-03-22 14:31:43 -0700
committerArmen Kesablyan2012-03-22 14:31:43 -0700
commitcd0b4714b782f8cc4cf9255fa2653d3d5eeade43 (patch)
tree297399e5ece4aa5800abd17b74da47af1899708c /js/panels/presets/content.reel/content.html
parent49596f2a6b518ed0ee945006787d3c69e40a5757 (diff)
parent57cc00a5ef3ab525e54a030d7692b2d9eefaa68b (diff)
downloadninja-cd0b4714b782f8cc4cf9255fa2653d3d5eeade43.tar.gz
Merge branch 'refs/heads/master' into DataBinding
Diffstat (limited to 'js/panels/presets/content.reel/content.html')
-rw-r--r--js/panels/presets/content.reel/content.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/panels/presets/content.reel/content.html b/js/panels/presets/content.reel/content.html
index f01e6435..afbdd559 100644
--- a/js/panels/presets/content.reel/content.html
+++ b/js/panels/presets/content.reel/content.html
@@ -62,9 +62,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
62<body> 62<body>
63 <section id="presetsPanel" class="presetsPanel"> 63 <section id="presetsPanel" class="presetsPanel">
64 <nav id="tab-bar" class="tab-bar"> 64 <nav id="tab-bar" class="tab-bar">
65 <div id="styles">Style Library</div> 65 <div id="styles">Styles</div>
66 <div id="transitions">Transitions Library</div> 66 <div id="transitions">Transitions</div>
67 <div id="animations">Animations Library</div> 67 <div id="animations">Animations</div>
68 </nav> 68 </nav>
69 <div id="librarySlot" class="librarySlot"></div> 69 <div id="librarySlot" class="librarySlot"></div>
70 </section> 70 </section>