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/elegant.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/elegant.css')
| -rw-r--r-- | imports/codemirror/theme/elegant.css | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/imports/codemirror/theme/elegant.css b/imports/codemirror/theme/elegant.css index 29afa982..d0ce0cb5 100644 --- a/imports/codemirror/theme/elegant.css +++ b/imports/codemirror/theme/elegant.css | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | .cm-s-elegant span.cm-number, .cm-s-elegant span.cm-string, .cm-s-elegant span.cm-atom {color: #762;} | 1 | .cm-s-elegant span.cm-number, .cm-s-elegant span.cm-string, .cm-s-elegant span.cm-atom {color: #762;} |
| 2 | .cm-s-elegant span.cm-comment {color: #262;font-style: italic;} | 2 | .cm-s-elegant span.cm-comment {color: #262; font-style: italic; line-height: 1em;} |
| 3 | .cm-s-elegant span.cm-meta {color: #555;font-style: italic;} | 3 | .cm-s-elegant span.cm-meta {color: #555; font-style: italic; line-height: 1em;} |
| 4 | .cm-s-elegant span.cm-variable {color: black;} | 4 | .cm-s-elegant span.cm-variable {color: black;} |
| 5 | .cm-s-elegant span.cm-variable-2 {color: #b11;} | 5 | .cm-s-elegant span.cm-variable-2 {color: #b11;} |
| 6 | .cm-s-elegant span.cm-qualifier {color: #555;} | 6 | .cm-s-elegant span.cm-qualifier {color: #555;} |