Commit 93530f853fed660f9e951c7c70c5f8d4c3db5009
2014-12-12T08:54:55
Undo changes in css, just fix css-extras instead
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66
diff --git a/components/prism-css-extras.js b/components/prism-css-extras.js
index 0118287..e12c5b8 100644
--- a/components/prism-css-extras.js
+++ b/components/prism-css-extras.js
@@ -8,7 +8,7 @@ Prism.languages.css.selector = {
}
};
-Prism.languages.insertBefore('css', 'ignore', {
+Prism.languages.insertBefore('css', 'function', {
'hexcode': /#[\da-f]{3,6}/gi,
'entity': /\\[\da-f]{1,8}/gi,
'number': /[\d%\.]+/g
diff --git a/components/prism-css.js b/components/prism-css.js
index 3c97be7..5b027ee 100644
--- a/components/prism-css.js
+++ b/components/prism-css.js
@@ -12,17 +12,6 @@ Prism.languages.css = {
'string': /("|')(\\?.)*?\1/g,
'important': /\B!important\b/gi,
'punctuation': /[\{\};:]/g,
- 'color': [
- {
- pattern: /#(?:[0-9a-f]{3}){1,2}/ig,
- alias: 'builtin'
- },
- {
- pattern: /(?:rgb|hsl)a?\(\s*\d+\s*(?:,\s*(?:\d+(?:\.\d*)?|\.\d+)%?\s*)+\)/,
- alias: 'builtin'
- }
- ],
- 'number': /(?:\d+(?:\.\d*)?|\.\d+)(?:%|ch|cm|deg|dpcm|dpi|dppx|ex|grad|k?Hz|in|mm|m?s|pc|pt|px|rad|r?em|turn|vh|vw|vmin|vmax)?/g,
'function': /[-a-z0-9]+(?=\()/ig
};
diff --git a/components/prism-css.min.js b/components/prism-css.min.js
index 1f4cc28..c07e428 100644
--- a/components/prism-css.min.js
+++ b/components/prism-css.min.js
@@ -1 +1 @@
-Prism.languages.css={comment:/\/\*[\w\W]*?\*\//g,atrule:{pattern:/@[\w-]+?.*?(;|(?=\s*{))/gi,inside:{punctuation:/[;:]/g}},url:/url\((["']?).*?\1\)/gi,selector:/[^\{\}\s][^\{\};]*(?=\s*\{)/g,property:/(\b|\B)[\w-]+(?=\s*:)/gi,string:/("|')(\\?.)*?\1/g,important:/\B!important\b/gi,punctuation:/[\{\};:]/g,color:[{pattern:/#(?:[0-9a-f]{3}){1,2}/gi,alias:"builtin"},{pattern:/(?:rgb|hsl)a?\(\s*\d+\s*(?:,\s*(?:\d+(?:\.\d*)?|\.\d+)%?\s*)+\)/,alias:"builtin"}],number:/(?:\d+(?:\.\d*)?|\.\d+)(?:%|ch|cm|deg|dpcm|dpi|dppx|ex|grad|k?Hz|in|mm|m?s|pc|pt|px|rad|r?em|turn|vh|vw|vmin|vmax)?/g,"function":/[-a-z0-9]+(?=\()/gi},Prism.languages.markup&&(Prism.languages.insertBefore("markup","tag",{style:{pattern:/<style[\w\W]*?>[\w\W]*?<\/style>/gi,inside:{tag:{pattern:/<style[\w\W]*?>|<\/style>/gi,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.css},alias:"language-css"}}),Prism.languages.insertBefore("inside","attr-value",{"style-attr":{pattern:/\s*style=("|').+?\1/gi,inside:{"attr-name":{pattern:/^\s*style/gi,inside:Prism.languages.markup.tag.inside},punctuation:/^\s*=\s*['"]|['"]\s*$/,"attr-value":{pattern:/.+/gi,inside:Prism.languages.css}},alias:"language-css"}},Prism.languages.markup.tag));
\ No newline at end of file
+Prism.languages.css={comment:/\/\*[\w\W]*?\*\//g,atrule:{pattern:/@[\w-]+?.*?(;|(?=\s*{))/gi,inside:{punctuation:/[;:]/g}},url:/url\((["']?).*?\1\)/gi,selector:/[^\{\}\s][^\{\};]*(?=\s*\{)/g,property:/(\b|\B)[\w-]+(?=\s*:)/gi,string:/("|')(\\?.)*?\1/g,important:/\B!important\b/gi,punctuation:/[\{\};:]/g,"function":/[-a-z0-9]+(?=\()/gi},Prism.languages.markup&&(Prism.languages.insertBefore("markup","tag",{style:{pattern:/<style[\w\W]*?>[\w\W]*?<\/style>/gi,inside:{tag:{pattern:/<style[\w\W]*?>|<\/style>/gi,inside:Prism.languages.markup.tag.inside},rest:Prism.languages.css},alias:"language-css"}}),Prism.languages.insertBefore("inside","attr-value",{"style-attr":{pattern:/\s*style=("|').+?\1/gi,inside:{"attr-name":{pattern:/^\s*style/gi,inside:Prism.languages.markup.tag.inside},punctuation:/^\s*=\s*['"]|['"]\s*$/,"attr-value":{pattern:/.+/gi,inside:Prism.languages.css}},alias:"language-css"}},Prism.languages.markup.tag));
\ No newline at end of file
diff --git a/prism.js b/prism.js
index edb75cf..6e610df 100644
--- a/prism.js
+++ b/prism.js
@@ -494,17 +494,6 @@ Prism.languages.css = {
'string': /("|')(\\?.)*?\1/g,
'important': /\B!important\b/gi,
'punctuation': /[\{\};:]/g,
- 'color': [
- {
- pattern: /#(?:[0-9a-f]{3}){1,2}/ig,
- alias: 'builtin'
- },
- {
- pattern: /(?:rgb|hsl)a?\(\s*\d+\s*(?:,\s*(?:\d+(?:\.\d*)?|\.\d+)%?\s*)+\)/,
- alias: 'builtin'
- }
- ],
- 'number': /(?:\d+(?:\.\d*)?|\.\d+)(?:%|ch|cm|deg|dpcm|dpi|dppx|ex|grad|k?Hz|in|mm|m?s|pc|pt|px|rad|r?em|turn|vh|vw|vmin|vmax)?/g,
'function': /[-a-z0-9]+(?=\()/ig
};