diff options
author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
tree | 867f8bdd588c8f9076979233ca46a688ff70523e /imports/codemirror/theme/rubyblue.css | |
parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'imports/codemirror/theme/rubyblue.css')
-rw-r--r-- | imports/codemirror/theme/rubyblue.css | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/imports/codemirror/theme/rubyblue.css b/imports/codemirror/theme/rubyblue.css index 3c67762b..502817ae 100644 --- a/imports/codemirror/theme/rubyblue.css +++ b/imports/codemirror/theme/rubyblue.css | |||
@@ -6,7 +6,7 @@ | |||
6 | .cm-s-rubyblue .CodeMirror-gutter-text { color: white; } | 6 | .cm-s-rubyblue .CodeMirror-gutter-text { color: white; } |
7 | .cm-s-rubyblue .CodeMirror-cursor { border-left: 1px solid white !important; } | 7 | .cm-s-rubyblue .CodeMirror-cursor { border-left: 1px solid white !important; } |
8 | 8 | ||
9 | .cm-s-rubyblue span.cm-comment { color: #999; font-style:italic; } | 9 | .cm-s-rubyblue span.cm-comment { color: #999; font-style:italic; line-height: 1em; } |
10 | .cm-s-rubyblue span.cm-atom { color: #F4C20B; } | 10 | .cm-s-rubyblue span.cm-atom { color: #F4C20B; } |
11 | .cm-s-rubyblue span.cm-number, .cm-s-rubyblue span.cm-attribute { color: #82C6E0; } | 11 | .cm-s-rubyblue span.cm-number, .cm-s-rubyblue span.cm-attribute { color: #82C6E0; } |
12 | .cm-s-rubyblue span.cm-keyword { color: #F0F; } | 12 | .cm-s-rubyblue span.cm-keyword { color: #F0F; } |