Permalink
Browse files

Merge branch 'master' of github.com:seaofclouds/sass-textmate-bundle

  • Loading branch information...
2 parents 79ff3ec + 6167f75 commit 1299dcc253f374543e7b94624952a03f2d22fee0 Todd Matthews committed Jun 25, 2010
Showing with 32 additions and 2 deletions.
  1. +32 −2 Syntaxes/SASS.tmLanguage
View
@@ -21,6 +21,12 @@
<string>keyword.control.untitled</string>
</dict>
<dict>
+ <key>match</key>
+ <string>@(import|mixin|include|charset|import|media|page|font-face|namespace) [\/\.\w-]*\b</string>
+ <key>name</key>
+ <string>keyword.control.at-rule.sass</string>
+ </dict>
+ <dict>
<key>begin</key>
<string>"</string>
<key>end</key>
@@ -57,7 +63,7 @@
</dict>
<dict>
<key>match</key>
- <string>![a-zA-Z0-9_-]+</string>
+ <string>[!\$][a-zA-Z0-9_-]+</string>
<key>name</key>
<string>variable.parameter.sass</string>
</dict>
@@ -79,12 +85,24 @@
</dict>
<dict>
<key>match</key>
+ <string>\+[-\w]+</string>
+ <key>name</key>
+ <string>entity.other.attribute-name.tag.pseudo-class</string>
+ </dict>
+ <dict>
+ <key>match</key>
<string>(-|\+)?\s*[0-9]+(\.[0-9]+)?</string>
<key>name</key>
<string>constant.numeric.sass</string>
</dict>
<dict>
<key>match</key>
+ <string>(left|right|true|false|top|bottom)(?!:)</string>
+ <key>name</key>
+ <string>constant.string.sass</string>
+ </dict>
+ <dict>
+ <key>match</key>
<string>(?&lt;=[\d])(px|pt|cm|mm|in|em|ex|pc)\b|%</string>
<key>name</key>
<string>constant.other.unit.sass</string>
@@ -99,7 +117,19 @@
</dict>
<dict>
<key>match</key>
- <string>(:)(azimuth|background-attachment|background-color|background-image|background-position|background-repeat|background|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|font-family|font-size-adjust|font-size|font-stretch|font-style|font-variant|font-weight|font|height|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|-moz-border-radius|orphans|outline-color|outline-style|outline-width|outline|overflow|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|position|quotes|richness|right|size|speak-header|speak-numeral|speak-punctuation|speech-rate|speak|stress|table-layout|text-align|text-decoration|text-indent|text-shadow|text-transform|top|unicode-bidi|vertical-align|visibility|voice-family|volume|white-space|widows|width|word-spacing|z-index)\b</string>
+ <string>&amp;</string>
+ <key>name</key>
+ <string>keyword.control.untitled</string>
+ </dict>
+ <dict>
+ <key>match</key>
+ <string>:(before|after|first-child|last-child|first-line|first-letter|link|focus|lang|hover|active|visited)</string>
+ <key>name</key>
+ <string>entity.other.attribute-name.tag.pseudo-class</string>
+ </dict>
+ <dict>
+ <key>match</key>
+ <string>\b(azimuth|background-attachment|background-color|background-image|background-position|background-repeat|background|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|font-family|font-size-adjust|font-size|font-stretch|font-style|font-variant|font-weight|font|height|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|-moz-border-radius|orphans|outline-color|outline-style|outline-width|outline|overflow|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|position|quotes|richness|right|size|speak-header|speak-numeral|speak-punctuation|speech-rate|speak|stress|table-layout|text-align|text-decoration|text-indent|text-shadow|text-transform|top|unicode-bidi|vertical-align|visibility|voice-family|volume|white-space|widows|width|word-spacing|z-index)\b</string>
<key>name</key>
<string>support.type.property-name.sass</string>
</dict>

0 comments on commit 1299dcc

Please sign in to comment.