diff options
| author | Nivesh Rajbhandari | 2012-05-03 17:09:07 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-05-03 17:09:07 -0700 |
| commit | 8be6e94b57f4bd6e28754a6113b4d6a401365e13 (patch) | |
| tree | 19f48f969ab872b9ef46cc4e7d6c2b9d2544cd4d /js/components/ui/icon-list-basic | |
| parent | c14b8d9fd1acde98ffc427b0bbdba7d1442c39a4 (diff) | |
| parent | fec9ccee11ea21ffc95edce6e89d0d302b63e3d8 (diff) | |
| download | ninja-8be6e94b57f4bd6e28754a6113b4d6a401365e13.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
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> |