diff options
| author | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
| commit | 48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch) | |
| tree | 899f9cf1b09a01bc073f92ab498236aed80b38ec /js/components/menu/menu-entry.reel | |
| parent | 2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff) | |
| parent | d220c02e246b30509b28a47fa04916ca2b8122e4 (diff) | |
| download | ninja-48a2a800155fd2d608fb7191c0180cd8f625cd44.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/components/menu/menu-entry.reel')
| -rwxr-xr-x | js/components/menu/menu-entry.reel/menu-entry.html | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/js/components/menu/menu-entry.reel/menu-entry.html b/js/components/menu/menu-entry.reel/menu-entry.html index 7ebbcec8..cd013a4e 100755 --- a/js/components/menu/menu-entry.reel/menu-entry.html +++ b/js/components/menu/menu-entry.reel/menu-entry.html | |||
| @@ -62,13 +62,13 @@ | |||
| 62 | </head> | 62 | </head> |
| 63 | <body> | 63 | <body> |
| 64 | 64 | ||
| 65 | <li id="menuItem" class="topMenuItem"> | 65 | <li data-montage-id="menuItem" class="topMenuItem"> |
| 66 | <div id="topHeaderBackground" class="menubg"> | 66 | <div data-montage-id="topHeaderBackground" class="menubg"> |
| 67 | <span id="topHeaderText" class="menu-label"></span> | 67 | <span data-montage-id="topHeaderText" class="menu-label"></span> |
| 68 | </div> | 68 | </div> |
| 69 | 69 | ||
| 70 | <ul id="subEntries" class="subEntries" style="z-index: 9991;"> | 70 | <ul data-montage-id="subEntries" class="subEntries" style="z-index: 9991;"> |
| 71 | <li id="menuEntryItem"></li> | 71 | <li data-montage-id="menuEntryItem"></li> |
| 72 | </ul> | 72 | </ul> |
| 73 | 73 | ||
| 74 | </li> | 74 | </li> |