diff options
| author | Eric Guzman | 2012-05-10 14:51:31 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-05-10 14:51:31 -0700 |
| commit | 39f23ad4868482f395d2e210490a2d73545a9d84 (patch) | |
| tree | c702d67585f72cddf55932411e7100133bc58452 /imports/codemirror/theme/elegant.css | |
| parent | 733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff) | |
| parent | 632a53278826a33506b302b573ee0681840f2d6c (diff) | |
| download | ninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
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;} |