diff options
| author | hwc487 | 2012-05-11 13:52:55 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-11 13:52:55 -0700 |
| commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
| tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /js/components/ui/icon-list-basic | |
| parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
| parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
| download | ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
Diffstat (limited to 'js/components/ui/icon-list-basic')
| -rwxr-xr-x | js/components/ui/icon-list-basic/icon.reel/icon.html | 6 | ||||
| -rwxr-xr-x | js/components/ui/icon-list-basic/iconsList.reel/iconsList.html | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.html b/js/components/ui/icon-list-basic/icon.reel/icon.html index f2406566..2ad5885a 100755 --- a/js/components/ui/icon-list-basic/icon.reel/icon.html +++ b/js/components/ui/icon-list-basic/icon.reel/icon.html | |||
| @@ -22,9 +22,9 @@ | |||
| 22 | </script> | 22 | </script> |
| 23 | </head> | 23 | </head> |
| 24 | <body> | 24 | <body> |
| 25 | <div id="icon" class="icon"> | 25 | <div data-montage-id="icon" class="icon"> |
| 26 | <div><img id="iconImg" class="iconImg" src="" /></div> | 26 | <div><img data-montage-id="iconImg" class="iconImg" src="" /></div> |
| 27 | <div id="iconLabel" class="iconLabel"></div> | 27 | <div data-montage-id="iconLabel" class="iconLabel"></div> |
| 28 | </div> | 28 | </div> |
| 29 | </body> | 29 | </body> |
| 30 | </html> \ No newline at end of file | 30 | </html> \ No newline at end of file |
diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html index 35260527..05d3ea7d 100755 --- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html +++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html | |||
| @@ -55,9 +55,9 @@ | |||
| 55 | </script> | 55 | </script> |
| 56 | </head> | 56 | </head> |
| 57 | <body> | 57 | <body> |
| 58 | <div id="list" class="list"> | 58 | <div data-montage-id="list" class="list"> |
| 59 | <div id="iconsView"> | 59 | <div data-montage-id="iconsView"> |
| 60 | <div id="icon"></div> | 60 | <div data-montage-id="icon"></div> |
| 61 | </div> | 61 | </div> |
| 62 | </div> | 62 | </div> |
| 63 | </body> | 63 | </body> |