diff options
| author | Pushkar Joshi | 2012-05-07 11:00:22 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-05-07 11:00:22 -0700 |
| commit | e5ae6e0b6e54db0e6efd75d1f14cb791060ed67a (patch) | |
| tree | e84d2dc5033c1b5c1b993662660a90af12584b69 /js/components/ui/icon-list-basic | |
| parent | ba890518b5a35d5e6893f9fc72d2eee30ae07e17 (diff) | |
| parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
| download | ninja-e5ae6e0b6e54db0e6efd75d1f14cb791060ed67a.tar.gz | |
Merge branch 'master' into pentool
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> |