diff options
| author | Eric Guzman | 2012-06-11 13:28:42 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-06-11 13:28:42 -0700 |
| commit | 3a4727ffc350216a434a7c6977b6a23653b77780 (patch) | |
| tree | c5dff306f8803c36a16163ba5df1e7f492e762b5 /js | |
| parent | d6b46ba496c9c8974ae39bb476aea35bcd1ddaf1 (diff) | |
| parent | 337efc667372326ae2f9984d89a47bb151016774 (diff) | |
| download | ninja-3a4727ffc350216a434a7c6977b6a23653b77780.tar.gz | |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Diffstat (limited to 'js')
122 files changed, 4910 insertions, 4894 deletions
diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css index 6130382b..aeaf604c 100644 --- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css +++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | height: 20px; | 18 | height: 20px; |
| 19 | } | 19 | } |
| 20 | 20 | ||
| 21 | .viewOptions .autoCodeComplete span{ | 21 | .viewOptions .autoCodeComplete label{ |
| 22 | vertical-align: middle; | 22 | vertical-align: middle; |
| 23 | } | 23 | } |
| 24 | 24 | ||
diff --git a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html index 14d6cb55..2c91ca13 100644 --- a/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html +++ b/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.html | |||
| @@ -14,6 +14,9 @@ | |||
| 14 | "prototype": "montage/ui/checkbox.reel", | 14 | "prototype": "montage/ui/checkbox.reel", |
| 15 | "properties": { | ||