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/document-bar.reel/document-bar.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/document-bar.reel/document-bar.html')
| -rwxr-xr-x[-rw-r--r--] | js/components/layout/document-bar.reel/document-bar.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/components/layout/document-bar.reel/document-bar.html b/js/components/layout/document-bar.reel/document-bar.html index d58f0d14..48f1423c 100644..100755 --- a/js/components/layout/document-bar.reel/document-bar.html +++ b/js/components/layout/document-bar.reel/document-bar.html | |||
| @@ -51,8 +51,8 @@ | |||
| 51 | <body> | 51 | <body> |
| 52 | <div id="documentBar"> | 52 | <div id="documentBar"> |
| 53 | <input class="zoomHotText label" id="zoomControlHT"/> | 53 | <input class="zoomHotText label" id="zoomControlHT"/> |
| 54 | <span class="design-view" id="design">Design View</span> | 54 | <span class="design-view disable" id="design">Design View</span> |
| 55 | <span class="code-view" id="code">Code View</span> | 55 | <span class="code-view disable" id="code">Code View</span> |
| 56 | </div> | 56 | </div> |
| 57 | </body> | 57 | </body> |
| 58 | </html> \ No newline at end of file | 58 | </html> \ No newline at end of file |