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/eclipse.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/eclipse.css')
-rw-r--r-- | imports/codemirror/theme/eclipse.css | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/imports/codemirror/theme/eclipse.css b/imports/codemirror/theme/eclipse.css index 41f6fcbd..47d66a01 100644 --- a/imports/codemirror/theme/eclipse.css +++ b/imports/codemirror/theme/eclipse.css | |||
@@ -1,5 +1,5 @@ | |||
1 | .cm-s-eclipse span.cm-meta {color: #FF1717;} | 1 | .cm-s-eclipse span.cm-meta {color: #FF1717;} |
2 | .cm-s-eclipse span.cm-keyword { font-weight: bold; color: #7F0055; } | 2 | .cm-s-eclipse span.cm-keyword { line-height: 1em; font-weight: bold; color: #7F0055; } |
3 | .cm-s-eclipse span.cm-atom {color: #219;} | 3 | .cm-s-eclipse span.cm-atom {color: #219;} |
4 | .cm-s-eclipse span.cm-number {color: #164;} | 4 | .cm-s-eclipse span.cm-number {color: #164;} |
5 | .cm-s-eclipse span.cm-def {color: #00f;} | 5 | .cm-s-eclipse span.cm-def {color: #00f;} |