aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/css
diff options
context:
space:
mode:
authorArmen Kesablyan2012-05-08 16:43:43 -0700
committerArmen Kesablyan2012-05-08 16:43:43 -0700
commitdc075ffcc6dd03c090d90fad999eee9b924d56ee (patch)
tree867f8bdd588c8f9076979233ca46a688ff70523e /imports/codemirror/mode/css
parent5d7e470351fd150d5e70a97332fa2f2553797499 (diff)
parent4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff)
downloadninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts: js/components/layout/tools-properties.reel/tools-properties.html Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'imports/codemirror/mode/css')
-rw-r--r--imports/codemirror/mode/css/css.js2
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";