diff options
| author | Eric Guzman | 2012-05-10 14:51:31 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-05-10 14:51:31 -0700 |
| commit | 39f23ad4868482f395d2e210490a2d73545a9d84 (patch) | |
| tree | c702d67585f72cddf55932411e7100133bc58452 /imports/codemirror/mode/tiddlywiki/tiddlywiki.css | |
| parent | 733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff) | |
| parent | 632a53278826a33506b302b573ee0681840f2d6c (diff) | |
| download | ninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
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;} |