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/neat.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/neat.css')
| -rw-r--r-- | imports/codemirror/theme/neat.css | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/imports/codemirror/theme/neat.css b/imports/codemirror/theme/neat.css index 6d2dbf5f..8a307f80 100644 --- a/imports/codemirror/theme/neat.css +++ b/imports/codemirror/theme/neat.css | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | .cm-s-neat span.cm-comment { color: #a86; } | 1 | .cm-s-neat span.cm-comment { color: #a86; } |
| 2 | .cm-s-neat span.cm-keyword { font-weight: bold; color: blue; } | 2 | .cm-s-neat span.cm-keyword { line-height: 1em; font-weight: bold; color: blue; } |
| 3 | .cm-s-neat span.cm-string { color: #a22; } | 3 | .cm-s-neat span.cm-string { color: #a22; } |
| 4 | .cm-s-neat span.cm-builtin { font-weight: bold; color: #077; } | 4 | .cm-s-neat span.cm-builtin { line-height: 1em; font-weight: bold; color: #077; } |
| 5 | .cm-s-neat span.cm-special { font-weight: bold; color: #0aa; } | 5 | .cm-s-neat span.cm-special { line-height: 1em; font-weight: bold; color: #0aa; } |
| 6 | .cm-s-neat span.cm-variable { color: black; } | 6 | .cm-s-neat span.cm-variable { color: black; } |
| 7 | .cm-s-neat span.cm-number, .cm-s-neat span.cm-atom { color: #3a3; } | 7 | .cm-s-neat span.cm-number, .cm-s-neat span.cm-atom { color: #3a3; } |
| 8 | .cm-s-neat span.cm-meta {color: #555;} | 8 | .cm-s-neat span.cm-meta {color: #555;} |