aboutsummaryrefslogtreecommitdiff
path: root/js/components/menu/menu-item.reel/menu-item.html
diff options
context:
space:
mode:
authorJonathan Duran2012-05-09 09:58:27 -0700
committerJonathan Duran2012-05-09 09:58:27 -0700
commit48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch)
tree899f9cf1b09a01bc073f92ab498236aed80b38ec /js/components/menu/menu-item.reel/menu-item.html
parent2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff)
parentd220c02e246b30509b28a47fa04916ca2b8122e4 (diff)
downloadninja-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-item.reel/menu-item.html')
-rwxr-xr-xjs/components/menu/menu-item.reel/menu-item.html10
1 files changed, 5 insertions, 5 deletions
diff --git a/js/components/menu/menu-item.reel/menu-item.html b/js/components/menu/menu-item.reel/menu-item.html
index 92e9aafc..5ff8c0fc 100755
--- a/js/components/menu/menu-item.reel/menu-item.html
+++ b/js/components/menu/menu-item.reel/menu-item.html
@@ -62,14 +62,14 @@
62</head> 62</head>
63<body> 63<body>
64 64
65 <li id="menuItem" class="menuItem"> 65 <li data-montage-id="menuItem" class="menuItem">
66 <div id="menuItemBackground" class="menubg"> 66 <div data-montage-id="menuItemBackground" class="menubg">
67 <span class="check"></span> 67 <span class="check"></span>
68 <span id="menuItemText" class="menu-label"></span> 68 <span data-montage-id="menuItemText" class="menu-label"></span>
69 <span class="rightArrow"></span> 69 <span class="rightArrow"></span>
70 70
71 <ul id="subEntries" class="subEntries" style="display: none"> 71 <ul data-montage-id="subEntries" class="subEntries" style="display: none">
72 <li id="menuEntryItem"></li> 72 <li data-montage-id="menuEntryItem"></li>
73 </ul> 73 </ul>
74 74
75 </div> 75 </div>