aboutsummaryrefslogtreecommitdiff
path: root/js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-06-01 06:53:58 -0700
committerNivesh Rajbhandari2012-06-01 06:53:58 -0700
commit69ca67093bb53188dca5437e0bfbfb7f676ada85 (patch)
treecc2b387c796b0f34f1ab00a7c542c335d52005e9 /js/code-editor/ui/code-editor-view-options.reel/code-editor-view-options.css
parentb7f048624c07a1186cca080bf4c9a87af7d53f35 (diff)
parent7fcb10270f9e19415f8452c261c2d0c86916a29a (diff)
downloadninja-69ca67093bb53188dca5437e0bfbfb7f676ada85.tar.gz
Merge branch 'refs/heads/valerio-document-bindings-fix' into document-bindings-fix
Conflicts: js/stage/stage.reel/stage.js Signed-off-by: Nivesh Rajbhandari <mqg734@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.css2
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