aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/subtool-button.reel/subtool-button.html
diff options
context:
space:
mode:
authorEric Guzman2012-02-22 23:19:45 -0800
committerEric Guzman2012-02-22 23:19:45 -0800
commit9e8cd4448a6d0f809a55c3bdea8b45ed75339794 (patch)
treec7b5105153f17aedecd0669c611dbea44be7374c /js/components/layout/subtool-button.reel/subtool-button.html
parenta5ee11857f923d3e49b44c0a8c480e9d0b026d5b (diff)
parent2afef244a3f8124f8a049e504e9782c05904ce23 (diff)
downloadninja-9e8cd4448a6d0f809a55c3bdea8b45ed75339794.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/components/layout/subtool-button.reel/subtool-button.html')
-rwxr-xr-xjs/components/layout/subtool-button.reel/subtool-button.html7
1 files changed, 2 insertions, 5 deletions
diff --git a/js/components/layout/subtool-button.reel/subtool-button.html b/js/components/layout/subtool-button.reel/subtool-button.html
index 9dad007d..24fce57c 100755
--- a/js/components/layout/subtool-button.reel/subtool-button.html
+++ b/js/components/layout/subtool-button.reel/subtool-button.html
@@ -16,8 +16,7 @@
16 "module": "js/components/layout/subtool-button.reel", 16 "module": "js/components/layout/subtool-button.reel",
17 "name": "SubToolButton", 17 "name": "SubToolButton",
18 "properties": { 18 "properties": {
19 "element": {"#": "buttonBackground"}, 19 "element": {"#": "toolButton"}
20 "button": {"#": "toolBarButton"}
21 } 20 }
22 } 21 }
23 } 22 }
@@ -26,9 +25,7 @@
26 </head> 25 </head>
27 26
28 <body> 27 <body>
29 <div id="buttonBackground" class="buttonBackground"> 28 <div id="toolButton" class="toolbutton"></div>
30 <div id="toolBarButton" class="buttonBackground"></div>
31 </div>
32 </body> 29 </body>
33 30
34</html> 31</html>