diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /imports/codemirror/mode/tiddlywiki/tiddlywiki.css | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz | |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
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;} |