Permalink
Browse files

[css mode] Partially move back to old look

  • Loading branch information...
1 parent d0a4a67 commit fdfba6db20ad626fdd5a71fc6273c503b3b3839f @marijnh marijnh committed Sep 10, 2012
Showing with 4 additions and 12 deletions.
  1. +0 −7 mode/css/css.css
  2. +2 −2 mode/css/css.js
  3. +0 −1 mode/css/index.html
  4. +2 −2 mode/css/test.js
View
@@ -1,7 +0,0 @@
-/* Change error (warning) so it's not so scary */
-.cm-s-default span.cm-property {font-weight: bold;}
-.cm-s-default span.cm-property.cm-error {color: black; font-weight: normal;}
-
-/* Differentiate color from .cm-def and change error (warning) so it's not so scary */
-.cm-s-default span.cm-attribute {color: #c0c; font-weight: bold;}
-.cm-s-default span.cm-attribute.cm-error {color: #c0c; font-weight: normal;}
View
@@ -211,7 +211,7 @@ CodeMirror.defineMode("css", function(config) {
}
else if (ch == "!") {
stream.match(/^\s*\w*/);
- return ret("builtin", "important");
+ return ret("keyword", "important");
}
else if (/\d/.test(ch)) {
stream.eatWhile(/[\w.%]/);
@@ -399,7 +399,7 @@ CodeMirror.defineMode("css", function(config) {
}
} else if (style == "atom") {
if(!context || context == "@media{") {
- style = "header";
+ style = "builtin";
} else if (context == "propertyValue") {
if (!/^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/.test(stream.current())) {
style += " error";
View
@@ -6,7 +6,6 @@
<link rel="stylesheet" href="../../lib/codemirror.css">
<script src="../../lib/codemirror.js"></script>
<script src="css.js"></script>
- <link rel="stylesheet" href="css.css">
<style>.CodeMirror {background: #f8f8f8;}</style>
<link rel="stylesheet" href="../../doc/docs.css">
</head>
View
@@ -228,7 +228,7 @@ MT.testMode(
'idSelector',
'#foo { #foo }',
[
- 'header', '#foo',
+ 'builtin', '#foo',
null, ' { ',
'error', '#foo',
null, ' }'
@@ -472,7 +472,7 @@ MT.testMode(
// null, ' ',
// 'keyword', 'black',
// null, ' ',
-// 'builtin', '!important',
+// 'keyword', '!important',
// null, '; ',
// 'property', 'background',
// 'operator', ':',

0 comments on commit fdfba6d

Please sign in to comment.