aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/css/css.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-05-03 17:09:07 -0700
committerNivesh Rajbhandari2012-05-03 17:09:07 -0700
commit8be6e94b57f4bd6e28754a6113b4d6a401365e13 (patch)
tree19f48f969ab872b9ef46cc4e7d6c2b9d2544cd4d /imports/codemirror/mode/css/css.js
parentc14b8d9fd1acde98ffc427b0bbdba7d1442c39a4 (diff)
parentfec9ccee11ea21ffc95edce6e89d0d302b63e3d8 (diff)
downloadninja-8be6e94b57f4bd6e28754a6113b4d6a401365e13.tar.gz
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'imports/codemirror/mode/css/css.js')
-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";