diff options
| author | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
| commit | 01dbc1f329a95bc7e3b93224543d88ad5bdbd315 (patch) | |
| tree | ceb527713554f506c537168e36a10452cd09ad10 /imports/codemirror/mode/css | |
| parent | b9262c831952e77135b79c2de7c455d5e7ff0589 (diff) | |
| parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
| download | ninja-01dbc1f329a95bc7e3b93224543d88ad5bdbd315.tar.gz | |
Merge branch 'master' into brushtool
Diffstat (limited to 'imports/codemirror/mode/css')
| -rw-r--r-- | imports/codemirror/mode/css/css.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/imports/codemirror/mode/css/css.js b/imports/codemirror/mode/css/css.js index 45170a3d..050e1124 100644 --- a/imports/codemirror/mode/css/css.js +++ b/imports/codemirror/mode/css/css.js | |||
| @@ -92,7 +92,7 @@ CodeMirror.defineMode("css", function(config) { | |||
| 92 | var style = state.tokenize(stream, state); | 92 | var style = state.tokenize(stream, state); |
| 93 | 93 | ||
| 94 | var context = state.stack[state.stack.length-1]; | 94 | var context = state.stack[state.stack.length-1]; |
| 95 | if (type == "hash" && context == "rule") style = "atom"; | 95 | if (type == "hash" && context != "rule") style = "string-2"; |
| 96 | else if (style == "variable") { | 96 | else if (style == "variable") { |
| 97 | if (context == "rule") style = "number"; | 97 | if (context == "rule") style = "number"; |
| 98 | else if (!context || context == "@media{") style = "tag"; | 98 | else if (!context || context == "@media{") style = "tag"; |