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/rubyblue.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/rubyblue.css')
| -rw-r--r-- | imports/codemirror/theme/rubyblue.css | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/imports/codemirror/theme/rubyblue.css b/imports/codemirror/theme/rubyblue.css index 3c67762b..502817ae 100644 --- a/imports/codemirror/theme/rubyblue.css +++ b/imports/codemirror/theme/rubyblue.css | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | .cm-s-rubyblue .CodeMirror-gutter-text { color: white; } | 6 | .cm-s-rubyblue .CodeMirror-gutter-text { color: white; } |
| 7 | .cm-s-rubyblue .CodeMirror-cursor { border-left: 1px solid white !important; } | 7 | .cm-s-rubyblue .CodeMirror-cursor { border-left: 1px solid white !important; } |
| 8 | 8 | ||
| 9 | .cm-s-rubyblue span.cm-comment { color: #999; font-style:italic; } | 9 | .cm-s-rubyblue span.cm-comment { color: #999; font-style:italic; line-height: 1em; } |
| 10 | .cm-s-rubyblue span.cm-atom { color: #F4C20B; } | 10 | .cm-s-rubyblue span.cm-atom { color: #F4C20B; } |
| 11 | .cm-s-rubyblue span.cm-number, .cm-s-rubyblue span.cm-attribute { color: #82C6E0; } | 11 | .cm-s-rubyblue span.cm-number, .cm-s-rubyblue span.cm-attribute { color: #82C6E0; } |
| 12 | .cm-s-rubyblue span.cm-keyword { color: #F0F; } | 12 | .cm-s-rubyblue span.cm-keyword { color: #F0F; } |