Commit c1f60b0e56cc01740c6c14d26ce14e0e41b00406

Miles Johnson 2013-05-18T21:47:01

Minor changes

diff --git a/components/prism-css-extras.js b/components/prism-css-extras.js
index 457f889..d998ea4 100644
--- a/components/prism-css-extras.js
+++ b/components/prism-css-extras.js
@@ -2,9 +2,9 @@ Prism.languages.css.selector = {
 	pattern: /[^\{\}\s][^\{\}]*(?=\s*\{)/g,
 	inside: {
 		'pseudo-element': /::?(after|before|first-letter|first-line|selection)/g,
-		'pseudo-class': /:[-\w]+(\(.*\))?/g,
-		'selector-class': /\.[-:\.\w]+/g,
-		'selector-id': /#[-:\.\w]+/g
+		'pseudo-class': /:[-\w]+(?:\(.*\))?/g,
+		'class': /\.[-:\.\w]+/g,
+		'id': /#[-:\.\w]+/g
 	}
 };
 
diff --git a/components/prism-css-extras.min.js b/components/prism-css-extras.min.js
index 5345cad..4cd5a01 100644
--- a/components/prism-css-extras.min.js
+++ b/components/prism-css-extras.min.js
@@ -1 +1 @@
-Prism.languages.css.selector={pattern:/[^\{\}\s][^\{\}]*(?=\s*\{)/g,inside:{"pseudo-element":/::?(after|before|first-letter|first-line|selection)/g,"pseudo-class":/:[-\w]+(\(.*\))?/g,"selector-class":/\.[-:\.\w]+/g,"selector-id":/#[-:\.\w]+/g}};Prism.languages.insertBefore("css","ignore",{hexcode:/#[0-9a-f]{3,6}/gi,entity:/\\[\da-f]{1,8}/gi,number:/[0-9%\.]+/g,"function":/(attr|calc|cross-fade|cycle|element|hsl|hsla|image|lang|linear-gradient|matrix|matrix3d|perspective|radial-gradient|repeating-linear-gradient|repeating-radial-gradient|rgb|rgba|rotate|rotatex|rotatey|rotatez|rotate3d|scale|scalex|scaley|scalez|scale3d|skew|skewx|skewy|steps|translate|translatex|translatey|translatez|translate3d|url|var)/ig});
\ No newline at end of file
+Prism.languages.css.selector={pattern:/[^\{\}\s][^\{\}]*(?=\s*\{)/g,inside:{"pseudo-element":/::?(after|before|first-letter|first-line|selection)/g,"pseudo-class":/:[-\w]+(?:\(.*\))?/g,"class":/\.[-:\.\w]+/g,id:/#[-:\.\w]+/g}};Prism.languages.insertBefore("css","ignore",{hexcode:/#[0-9a-f]{3,6}/gi,entity:/\\[\da-f]{1,8}/gi,number:/[0-9%\.]+/g,"function":/(attr|calc|cross-fade|cycle|element|hsl|hsla|image|lang|linear-gradient|matrix|matrix3d|perspective|radial-gradient|repeating-linear-gradient|repeating-radial-gradient|rgb|rgba|rotate|rotatex|rotatey|rotatez|rotate3d|scale|scalex|scaley|scalez|scale3d|skew|skewx|skewy|steps|translate|translatex|translatey|translatez|translate3d|url|var)/ig});
\ No newline at end of file
diff --git a/prism.js b/prism.js
index 755e306..68d2d63 100644
--- a/prism.js
+++ b/prism.js
@@ -431,23 +431,6 @@ if (Prism.languages.markup) {
 	});
 }
 
-Prism.languages.css.selector = {
-	pattern: /[^\{\}\s][^\{\}]*(?=\s*\{)/g,
-	inside: {
-		'pseudo-element': /::?(after|before|first-letter|first-line|selection)/g,
-		'pseudo-class': /:[-\w]+(\(.*\))?/g,
-		'selector-class': /\.[-:\.\w]+/g,
-		'selector-id': /#[-:\.\w]+/g
-	}
-};
-
-Prism.languages.insertBefore('css', 'ignore', {
-	'hexcode': /#[0-9a-f]{3,6}/gi,
-	'entity': /\\[\da-f]{1,8}/gi,
-	'number': /[0-9%\.]+/g,
-	'function': /(attr|calc|cross-fade|cycle|element|hsl|hsla|image|lang|linear-gradient|matrix|matrix3d|perspective|radial-gradient|repeating-linear-gradient|repeating-radial-gradient|rgb|rgba|rotate|rotatex|rotatey|rotatez|rotate3d|scale|scalex|scaley|scalez|scale3d|skew|skewx|skewy|steps|translate|translatex|translatey|translatez|translate3d|url|var)/ig
-});
-
 /* **********************************************
      Begin prism-clike.js
 ********************************************** */