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/theme/neat.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/theme/neat.css')
| -rw-r--r-- | imports/codemirror/theme/neat.css | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/imports/codemirror/theme/neat.css b/imports/codemirror/theme/neat.css index 6d2dbf5f..8a307f80 100644 --- a/imports/codemirror/theme/neat.css +++ b/imports/codemirror/theme/neat.css | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | .cm-s-neat span.cm-comment { color: #a86; } | 1 | .cm-s-neat span.cm-comment { color: #a86; } |
| 2 | .cm-s-neat span.cm-keyword { font-weight: bold; color: blue; } | 2 | .cm-s-neat span.cm-keyword { line-height: 1em; font-weight: bold; color: blue; } |
| 3 | .cm-s-neat span.cm-string { color: #a22; } | 3 | .cm-s-neat span.cm-string { color: #a22; } |
| 4 | .cm-s-neat span.cm-builtin { font-weight: bold; color: #077; } | 4 | .cm-s-neat span.cm-builtin { line-height: 1em; font-weight: bold; color: #077; } |
| 5 | .cm-s-neat span.cm-special { font-weight: bold; color: #0aa; } | 5 | .cm-s-neat span.cm-special { line-height: 1em; font-weight: bold; color: #0aa; } |
| 6 | .cm-s-neat span.cm-variable { color: black; } | 6 | .cm-s-neat span.cm-variable { color: black; } |
| 7 | .cm-s-neat span.cm-number, .cm-s-neat span.cm-atom { color: #3a3; } | 7 | .cm-s-neat span.cm-number, .cm-s-neat span.cm-atom { color: #3a3; } |
| 8 | .cm-s-neat span.cm-meta {color: #555;} | 8 | .cm-s-neat span.cm-meta {color: #555;} |