aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/tool-button.reel
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-05-07 11:18:11 -0700
committerNivesh Rajbhandari2012-05-07 11:18:11 -0700
commite377a8dc0b0e34905782ed867acb5fe725ae0131 (patch)
tree6931311aabd7a4e366df195a168d437f1d0d8465 /js/components/layout/tool-button.reel
parent8be6e94b57f4bd6e28754a6113b4d6a401365e13 (diff)
parent526e423e4a2734c2b139af23911e912452a4443f (diff)
downloadninja-e377a8dc0b0e34905782ed867acb5fe725ae0131.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js/components/layout/tool-button.reel')
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.css4
-rwxr-xr-xjs/components/layout/tool-button.reel/tool-button.html2
2 files changed, 3 insertions, 3 deletions
diff --git a/js/components/layout/tool-button.reel/tool-button.css b/js/components/layout/tool-button.reel/tool-button.css
index 46152424..f9d23f35 100755
--- a/js/components/layout/tool-button.reel/tool-button.css
+++ b/js/components/layout/tool-button.reel/tool-button.css
@@ -14,11 +14,11 @@
14 background: #B2B2B2; 14 background: #B2B2B2;
15} 15}
16 16
17#toolBarButton { 17.toolBarButton {
18 border: 3px; 18 border: 3px;
19 float: left; 19 float: left;
20} 20}
21 21
22#toolBarButton:hover { 22.toolBarButton:hover {
23 opacity: 1; 23 opacity: 1;
24} 24}
diff --git a/js/components/layout/tool-button.reel/tool-button.html b/js/components/layout/tool-button.reel/tool-button.html
index 3980b92c..84a6d34e 100755
--- a/js/components/layout/tool-button.reel/tool-button.html
+++ b/js/components/layout/tool-button.reel/tool-button.html
@@ -25,7 +25,7 @@
25 </head> 25 </head>
26 26
27 <body> 27 <body>
28 <div id="toolBarButton"></div> 28 <div data-montage-id="toolBarButton" class="toolBarButton"></div>
29 </body> 29 </body>
30 30
31</html> 31</html>