aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/subtool-button.reel
diff options
context:
space:
mode:
authorPushkar Joshi2012-05-07 11:00:22 -0700
committerPushkar Joshi2012-05-07 11:00:22 -0700
commite5ae6e0b6e54db0e6efd75d1f14cb791060ed67a (patch)
treee84d2dc5033c1b5c1b993662660a90af12584b69 /js/components/layout/subtool-button.reel
parentba890518b5a35d5e6893f9fc72d2eee30ae07e17 (diff)
parent526e423e4a2734c2b139af23911e912452a4443f (diff)
downloadninja-e5ae6e0b6e54db0e6efd75d1f14cb791060ed67a.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/components/layout/subtool-button.reel')
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.css4
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.html2
2 files changed, 3 insertions, 3 deletions
diff --git a/js/components/layout/subtool-button.reel/subtool-button.css b/js/components/layout/subtool-button.reel/subtool-button.css
index cda505b0..b98941d9 100755
--- a/js/components/layout/subtool-button.reel/subtool-button.css
+++ b/js/components/layout/subtool-button.reel/subtool-button.css
@@ -12,11 +12,11 @@
12 background: #B2B2B2; 12 background: #B2B2B2;
13} 13}
14 14
15#toolBarButton { 15.toolBarButton {
16 border: 3px; 16 border: 3px;
17 float: left; 17 float: left;
18} 18}
19 19
20#toolBarButton:hover { 20.toolBarButton:hover {
21 opacity: 1; 21 opacity: 1;
22} 22}
diff --git a/js/components/layout/subtool-button.reel/subtool-button.html b/js/components/layout/subtool-button.reel/subtool-button.html
index 501193d3..30f75d8c 100755
--- a/js/components/layout/subtool-button.reel/subtool-button.html
+++ b/js/components/layout/subtool-button.reel/subtool-button.html
@@ -24,7 +24,7 @@
24 </head> 24 </head>
25 25
26 <body> 26 <body>
27 <div id="toolButton" class="toolbutton"></div> 27 <div data-montage-id="toolButton" class="toolbutton"></div>
28 </body> 28 </body>
29 29
30</html> 30</html>