diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /imports/codemirror/theme/elegant.css | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz | |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
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;} |