diff options
| author | hwc487 | 2012-05-11 13:52:55 -0700 |
|---|---|---|
| committer | hwc487 | 2012-05-11 13:52:55 -0700 |
| commit | 137bfc9d4c41cc918d969565bec28a834fe10472 (patch) | |
| tree | e9fa109fc65218f45e386df48b713ff5858f3d62 /imports/codemirror/theme/rubyblue.css | |
| parent | d21aaca3d7093b6af968b7f9f764ab54e004f02b (diff) | |
| parent | 27f4cacb39de1c2e3910748dadc9fc16d0655480 (diff) | |
| download | ninja-137bfc9d4c41cc918d969565bec28a834fe10472.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/geom/geom-obj.js
js/lib/geom/rectangle.js
js/tools/TagTool.js
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; } |