diff options
| author | Pushkar Joshi | 2012-06-04 10:37:29 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-06-04 10:37:29 -0700 |
| commit | f1d75e5b29661abc4e173adc1f9de2e0cd91df83 (patch) | |
| tree | 796931014054ad6b0647854183f632ffd72ed9ee /js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css | |
| parent | 06b609df1ff7833592faddbd8d7abb5b9f15a74d (diff) | |
| parent | c1ec69879028220b0c3f11ad6e24035bf527802c (diff) | |
| download | ninja-f1d75e5b29661abc4e173adc1f9de2e0cd91df83.tar.gz | |
Merge branch 'master' into pentool
Conflicts:
js/tools/PenTool.js
Diffstat (limited to 'js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css')
| -rw-r--r-- | js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css | 2 |
1 files changed, 1 insertions, 1 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 | ||