diff options
| author | Eric Guzman | 2012-05-10 14:51:31 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-05-10 14:51:31 -0700 |
| commit | 39f23ad4868482f395d2e210490a2d73545a9d84 (patch) | |
| tree | c702d67585f72cddf55932411e7100133bc58452 /js/panels/presets/content.reel/content.html | |
| parent | 733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff) | |
| parent | 632a53278826a33506b302b573ee0681840f2d6c (diff) | |
| download | ninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
Diffstat (limited to 'js/panels/presets/content.reel/content.html')
| -rw-r--r-- | js/panels/presets/content.reel/content.html | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/js/panels/presets/content.reel/content.html b/js/panels/presets/content.reel/content.html index 27928670..50a48389 100644 --- a/js/panels/presets/content.reel/content.html +++ b/js/panels/presets/content.reel/content.html | |||
| @@ -55,13 +55,13 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 55 | </script> | 55 | </script> |
| 56 | </head> | 56 | </head> |
| 57 | <body> | 57 | <body> |
| 58 | <section id="presetsPanel" class="presetsPanel"> | 58 | <section data-montage-id="presetsPanel" class="presetsPanel"> |
| 59 | <nav id="tab-bar" class="tab-bar"> | 59 | <nav data-montage-id="tab-bar" class="tab-bar"> |
| 60 | <div id="styles">Styles</div> | 60 | <div data-montage-id="styles">Styles</div> |
| 61 | <div id="transitions">Transitions</div> | 61 | <div data-montage-id="transitions">Transitions</div> |
| 62 | <div id="animations">Animations</div> | 62 | <div data-montage-id="animations">Animations</div> |
| 63 | </nav> | 63 | </nav> |
| 64 | <div id="librarySlot" class="librarySlot"></div> | 64 | <div data-montage-id="librarySlot" class="librarySlot"></div> |
| 65 | </section> | 65 | </section> |
| 66 | </body> | 66 | </body> |
| 67 | </html> \ No newline at end of file | 67 | </html> \ No newline at end of file |