diff options
| author | Ananya Sen | 2012-06-04 10:43:29 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-06-04 10:43:29 -0700 |
| commit | 6fb29883329c9c42a8b406128b92c0e6323a47be (patch) | |
| tree | 07f46e88bccf9cdb7d4e6818e1b646b0d19f05b9 /js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css | |
| parent | cf097ec69e35c07ecae5a105ed5eeb78291c9ac2 (diff) | |
| parent | c1ec69879028220b0c3f11ad6e24035bf527802c (diff) | |
| download | ninja-6fb29883329c9c42a8b406128b92c0e6323a47be.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Conflicts:
js/ninja.reel/ninja.html
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
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 | ||