aboutsummaryrefslogtreecommitdiff
path: root/imports/codemirror/mode/css
diff options
context:
space:
mode:
authorJon Reid2012-05-15 11:24:53 -0700
committerJon Reid2012-05-15 11:24:53 -0700
commit3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
treed6dcab6756e3da0038a39527cfe0f9ca89e92310 /imports/codemirror/mode/css
parent53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parente33a4e58c271a9507082694a5268b840fdd05968 (diff)
downloadninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz
Merge branch 'timeline-local' into timeline-multiselect
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
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";