diff options
| author | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
|---|---|---|
| committer | Pushkar Joshi | 2012-02-24 12:08:49 -0800 |
| commit | 03ca7a5ed13c25faaa9100bb666e062fd15335e6 (patch) | |
| tree | c51112223ceb9121cd595a60335eb2795215590f /js/components/layout/tool-button.reel/tool-button.html | |
| parent | fcb12cc09eb3cd3b42bd215877ba18f449275b75 (diff) | |
| parent | 053fc63a2950c7a5ee4ebf98033b64d474a3c46e (diff) | |
| download | ninja-03ca7a5ed13c25faaa9100bb666e062fd15335e6.tar.gz | |
Merge branch 'pentool' into brushtool
Conflicts:
imports/codemirror/mode/scheme/scheme.js
js/tools/BrushTool.js
Diffstat (limited to 'js/components/layout/tool-button.reel/tool-button.html')
| -rwxr-xr-x[-rw-r--r--] | js/components/layout/tool-button.reel/tool-button.html | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/js/components/layout/tool-button.reel/tool-button.html b/js/components/layout/tool-button.reel/tool-button.html index 81a9b927..476b66f3 100644..100755 --- a/js/components/layout/tool-button.reel/tool-button.html +++ b/js/components/layout/tool-button.reel/tool-button.html | |||
| @@ -16,8 +16,7 @@ | |||
| 16 | "module": "js/components/layout/tool-button.reel", | 16 | "module": "js/components/layout/tool-button.reel", |
| 17 | "name": "ToolButton", | 17 | "name": "ToolButton", |
| 18 | "properties": { | 18 | "properties": { |
| 19 | "element": {"#": "buttonBackground"}, | 19 | "element": {"#": "toolBarButton"} |
| 20 | "button": {"#": "toolBarButton"} | ||
| 21 | } | 20 | } |
| 22 | } | 21 | } |
| 23 | } | 22 | } |
| @@ -27,9 +26,7 @@ | |||
| 27 | </head> | 26 | </head> |
| 28 | 27 | ||
| 29 | <body> | 28 | <body> |
| 30 | <div id="buttonBackground" class="buttonBackground"> | 29 | <div id="toolBarButton"></div> |
| 31 | <div id="toolBarButton" class="toolBarButton"></div> | ||
| 32 | </div> | ||
| 33 | </body> | 30 | </body> |
| 34 | 31 | ||
| 35 | </html> | 32 | </html> |