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/components/menu/menu.reel/menu.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/components/menu/menu.reel/menu.html')
| -rwxr-xr-x | js/components/menu/menu.reel/menu.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/components/menu/menu.reel/menu.html b/js/components/menu/menu.reel/menu.html index adaf68ea..49956f8a 100755 --- a/js/components/menu/menu.reel/menu.html +++ b/js/components/menu/menu.reel/menu.html | |||
| @@ -73,9 +73,9 @@ | |||
| 73 | </head> | 73 | </head> |
| 74 | <body> | 74 | <body> |
| 75 | 75 | ||
| 76 | <nav id="mainMenuBar" class="mainMenuBar unselectable"> | 76 | <nav data-montage-id="mainMenuBar" class="mainMenuBar unselectable"> |
| 77 | <ul id="topMenu" class="horizontal-menu"> | 77 | <ul data-montage-id="topMenu" class="horizontal-menu"> |
| 78 | <li id="menuItem"></li> | 78 | <li data-montage-id="menuItem"></li> |
| 79 | </ul> | 79 | </ul> |
| 80 | </nav> | 80 | </nav> |
| 81 | 81 | ||