add highlight for -o-min-device-pixel-ratio, fix font shorthand regex

i-akhmadullin · Sep 1, 2014 · 5d24a49 · 5d24a49
1 parent 5ef3e44
commit 5d24a49
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/CSS3.tmLanguage b/CSS3.tmLanguage
@@ -639,7 +639,7 @@
 					<key>begin</key>
 					<string>(?x)
                         (
-                            (-webkit-)?
+                            (-webkit-|-o-)?
                             ((min|max)-)?
                             (-moz-)?
                             (
@@ -1348,7 +1348,7 @@
 						|will-change|word-break|writing-mode|
 						|background-attachment|background-color|background-image|background-position|background-repeat|background|box-shadow|border-radius|border-bottom-color|border-bottom-style|border-bottom-width|border-bottom|border-collapse|border-color|border-left-color|border-left-style|border-left-width|border-left|border-right-color|border-right-style|border-right-width|border-right|border-spacing|border-style|border-top-color|border-top-style|border-top-width|border-top|border-width|border|bottom|caption-side|clear|clip|color|content|counter-increment|counter-reset|cue-after|cue-before|cue|cursor|direction|display|elevation|empty-cells|float|
 						|osx-font-smoothing|
-						|font(?:-)(?:effect|emphasize(-position|-style)?|family|feature-settings|kerning|language-override|size(?:-adjust)?|smoothing|stretch|style|synthesis|variant(?:-alternates|-caps|-east-asian|-ligatures|-numeric|-position)?|weight)?|
+						|font(?:(?:-)(?:effect|emphasize(-position|-style)?|family|feature-settings|kerning|language-override|size(?:-adjust)?|smoothing|stretch|style|synthesis|variant(?:-alternates|-caps|-east-asian|-ligatures|-numeric|-position)?|weight))?|
 						|height|image-rendering|left|letter-spacing|line-height|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|marker-offset|margin|marks|max-height|max-width|min-height|min-width|opacity|orphans|outline-color|outline-style|outline-width|outline|overflow(-[xy])?|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page|pause-after|pause-before|pause|pitch-range|pitch|play-during|pointer-events|position|quotes|resize|richness|right|size|
 						|speak-header|speak-numeral|speak-punctuation|speech-rate|speak|src|stress|table-layout|text-(align|decoration|indent|rendering|shadow|transform)|top|
 						|unicode-(?:bidi|range)|

diff --git a/src/repository/media-query.xml b/src/repository/media-query.xml
@@ -46,7 +46,7 @@
 					<key>begin</key>
 					<string>(?x)
                         (
-                            (-webkit-)?
+                            (-webkit-|-o-)?
                             ((min|max)-)?
                             (-moz-)?
                             (

diff --git a/src/repository/rule-list.xml b/src/repository/rule-list.xml
@@ -125,7 +125,7 @@
 						|will-change|word-break|writing-mode|
 						|background-attachment|background-color|background-image|background-position|background-repeat|background|box-shadow|border-radius|border-bottom-color|border-bottom-style|border-bottom-width|border-bottom|border-collapse|border-color|border-left-color|border-left-style|border-left-width|border-left|border-right-color|border-right-style|border-right-width|border-right|border-spacing|border-style|border-top-color|border-top-style|border-top-width|border-top|border-width|border|bottom|caption-side|clear|clip|color|content|counter-increment|counter-reset|cue-after|cue-before|cue|cursor|direction|display|elevation|empty-cells|float|
 						|osx-font-smoothing|
-						|font(?:-)(?:effect|emphasize(-position|-style)?|family|feature-settings|kerning|language-override|size(?:-adjust)?|smoothing|stretch|style|synthesis|variant(?:-alternates|-caps|-east-asian|-ligatures|-numeric|-position)?|weight)?|
+						|font(?:(?:-)(?:effect|emphasize(-position|-style)?|family|feature-settings|kerning|language-override|size(?:-adjust)?|smoothing|stretch|style|synthesis|variant(?:-alternates|-caps|-east-asian|-ligatures|-numeric|-position)?|weight))?|
 						|height|image-rendering|left|letter-spacing|line-height|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|marker-offset|margin|marks|max-height|max-width|min-height|min-width|opacity|orphans|outline-color|outline-style|outline-width|outline|overflow(-[xy])?|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page|pause-after|pause-before|pause|pitch-range|pitch|play-during|pointer-events|position|quotes|resize|richness|right|size|
 						|speak-header|speak-numeral|speak-punctuation|speech-rate|speak|src|stress|table-layout|text-(align|decoration|indent|rendering|shadow|transform)|top|
 						|unicode-(?:bidi|range)|

diff --git a/test.css b/test.css
@@ -519,6 +519,7 @@ dialog::backdrop{}
 /* http://www.w3.org/TR/css3-fonts/ */
 /* @font-feature-values support not implemented */
 .css3-fonts {
+    font: normal;
     font-stretch:
         ultra-condensed, extra-condensed, condensed, semi-condensed,
         semi-expanded, expanded, extra-expanded, ultra-expanded;