diff options
author | John Mayhew | 2012-05-07 16:30:19 -0700 |
---|---|---|
committer | John Mayhew | 2012-05-07 16:30:19 -0700 |
commit | db4ba95f50148198759dde503ec1c778184d9dbe (patch) | |
tree | 8b79ad58108af2f17d15abc8cdc33d35229ab20d /js/components/menu/menu-item.reel/menu-item.html | |
parent | 843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff) | |
parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
download | ninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/components/tools-properties/brush-properties.reel/brush-properties.html
js/components/tools-properties/fill-properties.reel/fill-properties.html
js/components/tools-properties/pen-properties.reel/pen-properties.html
js/components/tools-properties/pencil-properties.reel/pencil-properties.html
js/components/tools-properties/selection-properties.reel/selection-properties.html
js/components/tools-properties/shape-properties.reel/shape-properties.html
js/components/tools-properties/tag-properties.reel/tag-properties.html
js/components/tools-properties/text-properties.reel/text-properties.html
Diffstat (limited to 'js/components/menu/menu-item.reel/menu-item.html')
-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> |