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-entry.reel | |
| 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-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> |