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-item.reel | |
| 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-item.reel')
| -rwxr-xr-x | js/components/menu/menu-item.reel/menu-item.html | 10 |
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> |