diff options
author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
tree | 867f8bdd588c8f9076979233ca46a688ff70523e /js/components/menu/menu.reel/menu.html | |
parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
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 | ||