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/elegant.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/elegant.css')
| -rw-r--r-- | imports/codemirror/theme/elegant.css | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/imports/codemirror/theme/elegant.css b/imports/codemirror/theme/elegant.css index 29afa982..d0ce0cb5 100644 --- a/imports/codemirror/theme/elegant.css +++ b/imports/codemirror/theme/elegant.css | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | .cm-s-elegant span.cm-number, .cm-s-elegant span.cm-string, .cm-s-elegant span.cm-atom {color: #762;} | 1 | .cm-s-elegant span.cm-number, .cm-s-elegant span.cm-string, .cm-s-elegant span.cm-atom {color: #762;} |
| 2 | .cm-s-elegant span.cm-comment {color: #262;font-style: italic;} | 2 | .cm-s-elegant span.cm-comment {color: #262; font-style: italic; line-height: 1em;} |
| 3 | .cm-s-elegant span.cm-meta {color: #555;font-style: italic;} | 3 | .cm-s-elegant span.cm-meta {color: #555; font-style: italic; line-height: 1em;} |
| 4 | .cm-s-elegant span.cm-variable {color: black;} | 4 | .cm-s-elegant span.cm-variable {color: black;} |
| 5 | .cm-s-elegant span.cm-variable-2 {color: #b11;} | 5 | .cm-s-elegant span.cm-variable-2 {color: #b11;} |
| 6 | .cm-s-elegant span.cm-qualifier {color: #555;} | 6 | .cm-s-elegant span.cm-qualifier {color: #555;} |