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/mode/tiddlywiki/tiddlywiki.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/mode/tiddlywiki/tiddlywiki.css')
| -rw-r--r-- | imports/codemirror/mode/tiddlywiki/tiddlywiki.css | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/imports/codemirror/mode/tiddlywiki/tiddlywiki.css b/imports/codemirror/mode/tiddlywiki/tiddlywiki.css index 767f3de2..dba05c0f 100644 --- a/imports/codemirror/mode/tiddlywiki/tiddlywiki.css +++ b/imports/codemirror/mode/tiddlywiki/tiddlywiki.css | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | .cm-s-default span.cm-link-external {color: blue;} | 11 | .cm-s-default span.cm-link-external {color: blue;} |
| 12 | .cm-s-default span.cm-brace {color: #170; font-weight: bold;} | 12 | .cm-s-default span.cm-brace {color: #170; font-weight: bold;} |
| 13 | .cm-s-default span.cm-macro {color: #9E3825;} | 13 | .cm-s-default span.cm-macro {color: #9E3825;} |
| 14 | .cm-s-default span.cm-table {color: blue;} | 14 | .cm-s-default span.cm-table {color: blue; font-weight: bold;} |
| 15 | .cm-s-default span.cm-warning {color: red; font-weight: bold;} | 15 | .cm-s-default span.cm-warning {color: red; font-weight: bold;} |
| 16 | 16 | ||
| 17 | .cm-s-default span.cm-underlined {text-decoration: underline;} | 17 | .cm-s-default span.cm-underlined {text-decoration: underline;} |