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