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/rubyblue.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/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; } |