diff options
author | Eric Guzman | 2012-05-10 14:51:31 -0700 |
---|---|---|
committer | Eric Guzman | 2012-05-10 14:51:31 -0700 |
commit | 39f23ad4868482f395d2e210490a2d73545a9d84 (patch) | |
tree | c702d67585f72cddf55932411e7100133bc58452 /js/components/ui/icon-list-basic/icon.reel/icon.html | |
parent | 733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff) | |
parent | 632a53278826a33506b302b573ee0681840f2d6c (diff) | |
download | ninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
Diffstat (limited to 'js/components/ui/icon-list-basic/icon.reel/icon.html')
-rwxr-xr-x | js/components/ui/icon-list-basic/icon.reel/icon.html | 6 |
1 files changed, 3 insertions, 3 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 |