Skip to content

Commit

Permalink
add pixel-ratio mq, sort props, cleaning
Browse files Browse the repository at this point in the history
  • Loading branch information
@i-akhmadullin
i-akhmadullin committed Jun 21, 2014
1 parent a408da5 commit 0d5e650
Show file tree
Hide file tree
Showing 4 changed files with 142 additions and 183 deletions.
152 changes: 68 additions & 84 deletions CSS3.tmLanguage
View file
Original file line number Diff line number Diff line change
Expand Up @@ -589,9 +589,11 @@
<key>begin</key>
<string>(?x)
(
(-webkit-)?
((min|max)-)?
(-moz-)?
(
((device-)?(height|width|aspect-ratio))|
((device-)?(height|width|aspect-ratio|pixel-ratio))|
(color(-index)?)|monochrome|resolution
)
)|grid|scan|orientation
Expand All @@ -603,6 +605,16 @@
<key>name</key>
<string>support.type.property-name.media.css</string>
</dict>
<key>2</key>
<dict>
<key>name</key>
<string>support.type.vendor-prefix.css</string>
</dict>
<key>5</key>
<dict>
<key>name</key>
<string>support.type.vendor-prefix.css</string>
</dict>
</dict>
<key>end</key>
<string>(:)|(?=\))</string>
Expand Down Expand Up @@ -712,104 +724,76 @@
<key>match</key>
<string>\b(all|
|background(-color|-image|-position|-size)?|
|border-radius|
|border-spacing|
|border-(bottom-|top-)?(right-|left-)?radius|
|border(-bottom|-left|-right|-top)?-color|
|border(-bottom|-left|-right|-top)?-width|
|border(-bottom|-left|-right|-top|-width)|
|bottom|
|box-shadow|
|clip|
|color|
|column(-count|-gap|-rule-color|-rule-width|-rule|-width)|
|columns|
|crop|
|fill(-opacity)?|
|flex(-grow|-shrink|-basis)|
|flood-color|
|border-(bottom-|top-)?(right-|left-)radius|
|border-(bottom|left|right|top)-color|
|border-(bottom|left|right|top)-width|
|border-(bottom|color|left|radius|right|spacing|top|width)|
|bottom|box-shadow|
|clip|color|column(-count|-gap|-rule-color|-rule-width|-rule|-width)|columns|crop|
|fill(-opacity)?|flex(-grow|-shrink|-basis)|flood-color|
|font(-size-adjust|-size|-stretch|-weight)?|
|height|
|left|
|letter-spacing|
|lighting-color|
|line-height|
|margin-box|
|margin(-bottom|-left|-right|-top)?|
|marker-offset|
|max-height|
|max-lines|
|max-width|
|min-height|
|min-width|
|offset(-after|-before|-end|-start)?|
|opacity|
|order|
|outline(-color|-offset|-width)?|
|padding-box|
|padding(-bottom|-left|-right|-top)?|
|perspective(-origin)?|
|left|letter-spacing|lighting-color|line-height|
|margin(-box|-bottom|-left|-right|-top)|margin|marker-offset|
|max-(height|lines|width)|min-(height|width)|
|offset(-after|-before|-end|-start)?|opacity|order|outline(-color|-offset|-width)?|
|padding-(box|bottom|left|right|top)|perspective(-origin)?|
|right|
|stop-color|
|stop-opacity|
|stroke(-dasharray|-dashoffset|-miterlimit|-opacity|-width)?|
|text(-decoration-color|-emphasis-color|-indent|-shadow|-size-adjust)?|
|top|
|transform(-origin)?|
|vertical-align|
|visibility|
|width|
|word-spacing|
|z-index|
|zoom|
|viewport-fill(-opacity)?)\b</string>
|stop-(color|opacity)|stroke(-dasharray|-dashoffset|-miterlimit|-opacity|-width)?|
|text(-decoration-color|-emphasis-color|-indent|-shadow|-size-adjust)?|top|transform(-origin)?|
|vertical-align|visibility|viewport-fill(-opacity)?|
|width|word-spacing|
|z-index|zoom)\b</string>
<key>name</key>
<string>support.constant.property-value.css</string>
</dict>
<dict>
<key>match</key>
<string>\b(absolute|all-scroll|always|armenian|auto|avoid|baseline|below|bidi-override|block|bold|bolder|both|bottom|break-all|break-word|capitalize|center|char|cjk-ideographic|col-resize|collapse|crosshair|dashed|decimal-leading-zero|decimal|default|disabled|disc|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ellipsis|fixed|geometricPrecision|georgian|groove|hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|inactive|inherit|initial|unset|
<string>\b(absolute|all-scroll|always|armenian|at|auto|avoid|
|baseline|below|bicubic|bidi-override|block|bold|bolder|both|bottom|break-all|break-word|
|capitalize|center|char|cjk-ideographic|col-resize|collapse|crosshair|currentColor|
|dashed|decimal-leading-zero|decimal|default|disabled|disc|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|
|e-resize|ellipsis|
|fixed|from|
|geometricPrecision|georgian|groove|
|hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|
|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|inactive|inherit|initial|
|inline-block|inline-flex|inline-flexbox|inline-table|inline|
|inside|inter-ideograph|inter-word|italic|justify|katakana-iroha|katakana|keep-all|left|lighter|line-edge|line-through|line|list-item|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|medium|middle|move|n-resize|ne-resize|newspaper|no-drop|no-repeat|nw-resize|none|normal|not-allowed|nowrap|oblique|optimize(Legibility|Quality|Speed)|outset|outside|overline|pointer|pre(-(wrap|line))?|progress|relative|repeat-x|repeat-y|repeat|right|ridge|row-resize|rtl|s-resize|scroll-position|scroll|se-resize|separate|small-caps|solid|square|static|strict|sub|super|sw-resize|
|inside|inter-ideograph|inter-word|italic|
|justify|
|katakana-iroha|katakana|keep-all|
|left|lighter|line-edge|line-through|line|list-item|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|
|medium|middle|move|
|n-resize|ne-resize|newspaper|no-drop|no-repeat|nw-resize|none|normal|not-allowed|nowrap|
|oblique|optimize(Legibility|Quality|Speed)|outset|outside|overline|
|pointer|pre(-(wrap|line))?|progress|
|relative|repeat-x|repeat-y|repeat|right|ridge|row-resize|rtl|
|s-resize|scroll-position|scroll|se-resize|separate|small-caps|solid|square|static|strict|sub|super|sw-resize|
|table(-footer-group|-header-group|-cell|-caption|-column-group|-column|-row-group|-row)?|
|tb-rl|text-bottom|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|vertical(-(ideographic|text))?|visible(Painted|Fill|Stroke)?|w-resize|wait|whitespace|zero|smaller|larger|((xx?-)?(small|large))|painted|fill|stroke|
|bicubic|
|border-box|content-box|
|padding|border|content|infinite|
|repeating-(linear|radial)-gradient|
|border-box|
|content-box|
|radial-gradient|
|repeating-radial-gradient|
|linear-gradient|
|repeating-linear-gradient|
|padding|
|alpha|alternate-reverse|alternate|antialiased|
|backwards|blink|border|box|
|closest-(side|corner)|color-stop|cover|contain|content|contents|
|ease-in-out|ease-out|ease-in|ease|end|
|farthest-corner|farthest-side|
|forwards|flexbox|flex(-start|-end)?|
|gradient|
|transform|
|image-set|
|linear|
|color-stop|
|translate(X|Y|Z|3d)?|
|rotate(X|Y|Z|3d)?|
|grayscale|
|image-set|infinite|
|linear|local|
|matrix(3d)?|
|scale(X|Y|Z|3d)?|
|skew(X|Y)?|
|preserve-3d|
|closest-side|
|closest-corner|
|farthest-side|
|farthest-corner|
|at|
|round|
|currentColor|
|textfield|
|antialiased|grayscale|
|blink|
|touch|
|ease-in-out|ease-out|ease-in|ease|
|from|to|
|progid:DXImageTransform.Microsoft.(Alpha|Blur|dropshadow|gradient|Shadow)|
|alpha|
|cover|contain|local|
|alternate-reverse|alternate|backwards|forwards|end|paused|reverse|running|step-end|step-start|
|contents|
|box|flexbox|flex(-start|-end)?|space-between|space-around|stretch|(column|row|wrap)(-reverse)?|start|
|paused|preserve-3d|progid:DXImageTransform.Microsoft.(Alpha|Blur|dropshadow|gradient|Shadow)|
|reverse|round|rotate(X|Y|Z|3d)?|running|
|scale(X|Y|Z|3d)?|skew(X|Y)?|space-between|space-around|stretch|start|step-(end|start)|
|textfield|to|touch|transform|translate(X|Y|Z|3d)?|
|unset|
|(column|row|wrap)(-reverse)?|
|startColorStr|EndColorStr)\b</string>
<key>name</key>
<string>support.constant.property-value.css</string>
Expand Down
14 changes: 13 additions & 1 deletion src/repository/media-query.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,11 @@
<key>begin</key>
<string>(?x)
(
(-webkit-)?
((min|max)-)?
(-moz-)?
(
((device-)?(height|width|aspect-ratio))|
((device-)?(height|width|aspect-ratio|pixel-ratio))|
(color(-index)?)|monochrome|resolution
)
)|grid|scan|orientation
Expand All @@ -60,6 +62,16 @@
<key>name</key>
<string>support.type.property-name.media.css</string>
</dict>
<key>2</key>
<dict>
<key>name</key>
<string>support.type.vendor-prefix.css</string>
</dict>
<key>5</key>
<dict>
<key>name</key>
<string>support.type.vendor-prefix.css</string>
</dict>
</dict>
<key>end</key>
<string>(:)|(?=\))</string>
Expand Down
138 changes: 55 additions & 83 deletions src/repository/property-values.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,104 +22,76 @@
<key>match</key>
<string>\b(all|
|background(-color|-image|-position|-size)?|
|border-radius|
|border-spacing|
|border-(bottom-|top-)?(right-|left-)?radius|
|border(-bottom|-left|-right|-top)?-color|
|border(-bottom|-left|-right|-top)?-width|
|border(-bottom|-left|-right|-top|-width)|
|bottom|
|box-shadow|
|clip|
|color|
|column(-count|-gap|-rule-color|-rule-width|-rule|-width)|
|columns|
|crop|
|fill(-opacity)?|
|flex(-grow|-shrink|-basis)|
|flood-color|
|border-(bottom-|top-)?(right-|left-)radius|
|border-(bottom|left|right|top)-color|
|border-(bottom|left|right|top)-width|
|border-(bottom|color|left|radius|right|spacing|top|width)|
|bottom|box-shadow|
|clip|color|column(-count|-gap|-rule-color|-rule-width|-rule|-width)|columns|crop|
|fill(-opacity)?|flex(-grow|-shrink|-basis)|flood-color|
|font(-size-adjust|-size|-stretch|-weight)?|
|height|
|left|
|letter-spacing|
|lighting-color|
|line-height|
|margin-box|
|margin(-bottom|-left|-right|-top)?|
|marker-offset|
|max-height|
|max-lines|
|max-width|
|min-height|
|min-width|
|offset(-after|-before|-end|-start)?|
|opacity|
|order|
|outline(-color|-offset|-width)?|
|padding-box|
|padding(-bottom|-left|-right|-top)?|
|perspective(-origin)?|
|left|letter-spacing|lighting-color|line-height|
|margin(-box|-bottom|-left|-right|-top)|margin|marker-offset|
|max-(height|lines|width)|min-(height|width)|
|offset(-after|-before|-end|-start)?|opacity|order|outline(-color|-offset|-width)?|
|padding-(box|bottom|left|right|top)|perspective(-origin)?|
|right|
|stop-color|
|stop-opacity|
|stroke(-dasharray|-dashoffset|-miterlimit|-opacity|-width)?|
|text(-decoration-color|-emphasis-color|-indent|-shadow|-size-adjust)?|
|top|
|transform(-origin)?|
|vertical-align|
|visibility|
|width|
|word-spacing|
|z-index|
|zoom|
|viewport-fill(-opacity)?)\b</string>
|stop-(color|opacity)|stroke(-dasharray|-dashoffset|-miterlimit|-opacity|-width)?|
|text(-decoration-color|-emphasis-color|-indent|-shadow|-size-adjust)?|top|transform(-origin)?|
|vertical-align|visibility|viewport-fill(-opacity)?|
|width|word-spacing|
|z-index|zoom)\b</string>
<key>name</key>
<string>support.constant.property-value.css</string>
</dict>
<dict>
<key>match</key>
<string>\b(absolute|all-scroll|always|armenian|auto|avoid|baseline|below|bidi-override|block|bold|bolder|both|bottom|break-all|break-word|capitalize|center|char|cjk-ideographic|col-resize|collapse|crosshair|dashed|decimal-leading-zero|decimal|default|disabled|disc|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ellipsis|fixed|geometricPrecision|georgian|groove|hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|inactive|inherit|initial|unset|
<string>\b(absolute|all-scroll|always|armenian|at|auto|avoid|
|baseline|below|bicubic|bidi-override|block|bold|bolder|both|bottom|break-all|break-word|
|capitalize|center|char|cjk-ideographic|col-resize|collapse|crosshair|currentColor|
|dashed|decimal-leading-zero|decimal|default|disabled|disc|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|
|e-resize|ellipsis|
|fixed|from|
|geometricPrecision|georgian|groove|
|hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|
|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|inactive|inherit|initial|
|inline-block|inline-flex|inline-flexbox|inline-table|inline|
|inside|inter-ideograph|inter-word|italic|justify|katakana-iroha|katakana|keep-all|left|lighter|line-edge|line-through|line|list-item|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|medium|middle|move|n-resize|ne-resize|newspaper|no-drop|no-repeat|nw-resize|none|normal|not-allowed|nowrap|oblique|optimize(Legibility|Quality|Speed)|outset|outside|overline|pointer|pre(-(wrap|line))?|progress|relative|repeat-x|repeat-y|repeat|right|ridge|row-resize|rtl|s-resize|scroll-position|scroll|se-resize|separate|small-caps|solid|square|static|strict|sub|super|sw-resize|
|inside|inter-ideograph|inter-word|italic|
|justify|
|katakana-iroha|katakana|keep-all|
|left|lighter|line-edge|line-through|line|list-item|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|
|medium|middle|move|
|n-resize|ne-resize|newspaper|no-drop|no-repeat|nw-resize|none|normal|not-allowed|nowrap|
|oblique|optimize(Legibility|Quality|Speed)|outset|outside|overline|
|pointer|pre(-(wrap|line))?|progress|
|relative|repeat-x|repeat-y|repeat|right|ridge|row-resize|rtl|
|s-resize|scroll-position|scroll|se-resize|separate|small-caps|solid|square|static|strict|sub|super|sw-resize|
|table(-footer-group|-header-group|-cell|-caption|-column-group|-column|-row-group|-row)?|
|tb-rl|text-bottom|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|vertical(-(ideographic|text))?|visible(Painted|Fill|Stroke)?|w-resize|wait|whitespace|zero|smaller|larger|((xx?-)?(small|large))|painted|fill|stroke|
|bicubic|
|border-box|content-box|
|padding|border|content|infinite|
|repeating-(linear|radial)-gradient|
|border-box|
|content-box|
|radial-gradient|
|repeating-radial-gradient|
|linear-gradient|
|repeating-linear-gradient|
|padding|
|alpha|alternate-reverse|alternate|antialiased|
|backwards|blink|border|box|
|closest-(side|corner)|color-stop|cover|contain|content|contents|
|ease-in-out|ease-out|ease-in|ease|end|
|farthest-corner|farthest-side|
|forwards|flexbox|flex(-start|-end)?|
|gradient|
|transform|
|image-set|
|linear|
|color-stop|
|translate(X|Y|Z|3d)?|
|rotate(X|Y|Z|3d)?|
|grayscale|
|image-set|infinite|
|linear|local|
|matrix(3d)?|
|scale(X|Y|Z|3d)?|
|skew(X|Y)?|
|preserve-3d|
|closest-side|
|closest-corner|
|farthest-side|
|farthest-corner|
|at|
|round|
|currentColor|
|textfield|
|antialiased|grayscale|
|blink|
|touch|
|ease-in-out|ease-out|ease-in|ease|
|from|to|
|progid:DXImageTransform.Microsoft.(Alpha|Blur|dropshadow|gradient|Shadow)|
|alpha|
|cover|contain|local|
|alternate-reverse|alternate|backwards|forwards|end|paused|reverse|running|step-end|step-start|
|contents|
|box|flexbox|flex(-start|-end)?|space-between|space-around|stretch|(column|row|wrap)(-reverse)?|start|
|paused|preserve-3d|progid:DXImageTransform.Microsoft.(Alpha|Blur|dropshadow|gradient|Shadow)|
|reverse|round|rotate(X|Y|Z|3d)?|running|
|scale(X|Y|Z|3d)?|skew(X|Y)?|space-between|space-around|stretch|start|step-(end|start)|
|textfield|to|touch|transform|translate(X|Y|Z|3d)?|
|unset|
|(column|row|wrap)(-reverse)?|
|startColorStr|EndColorStr)\b</string>
<key>name</key>
<string>support.constant.property-value.css</string>
Expand Down
Loading

0 comments on commit 0d5e650

Please sign in to comment.