diff options
| author | John Mayhew | 2012-05-07 16:30:19 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-05-07 16:30:19 -0700 |
| commit | db4ba95f50148198759dde503ec1c778184d9dbe (patch) | |
| tree | 8b79ad58108af2f17d15abc8cdc33d35229ab20d /imports/codemirror/mode/tiddlywiki/tiddlywiki.css | |
| parent | 843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff) | |
| parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
| download | ninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/components/tools-properties/brush-properties.reel/brush-properties.html
js/components/tools-properties/fill-properties.reel/fill-properties.html
js/components/tools-properties/pen-properties.reel/pen-properties.html
js/components/tools-properties/pencil-properties.reel/pencil-properties.html
js/components/tools-properties/selection-properties.reel/selection-properties.html
js/components/tools-properties/shape-properties.reel/shape-properties.html
js/components/tools-properties/tag-properties.reel/tag-properties.html
js/components/tools-properties/text-properties.reel/text-properties.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;} |