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/eclipse.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/eclipse.css')
-rw-r--r-- | imports/codemirror/theme/eclipse.css | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/imports/codemirror/theme/eclipse.css b/imports/codemirror/theme/eclipse.css index 41f6fcbd..47d66a01 100644 --- a/imports/codemirror/theme/eclipse.css +++ b/imports/codemirror/theme/eclipse.css | |||
@@ -1,5 +1,5 @@ | |||
1 | .cm-s-eclipse span.cm-meta {color: #FF1717;} | 1 | .cm-s-eclipse span.cm-meta {color: #FF1717;} |
2 | .cm-s-eclipse span.cm-keyword { font-weight: bold; color: #7F0055; } | 2 | .cm-s-eclipse span.cm-keyword { line-height: 1em; font-weight: bold; color: #7F0055; } |
3 | .cm-s-eclipse span.cm-atom {color: #219;} | 3 | .cm-s-eclipse span.cm-atom {color: #219;} |
4 | .cm-s-eclipse span.cm-number {color: #164;} | 4 | .cm-s-eclipse span.cm-number {color: #164;} |
5 | .cm-s-eclipse span.cm-def {color: #00f;} | 5 | .cm-s-eclipse span.cm-def {color: #00f;} |