ybakos · minusfive · May 31, 2010 · May 31, 2010 · May 31, 2010 · May 31, 2010
diff --git a/Snippets/: ; (autocompletion + space.tmSnippet b/Snippets/: ; (autocompletion + space.tmSnippet
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>bundleUUID</key>
 	<string>4675F24E-6227-11D9-BFB1-000D93589AF6</string>
 	<key>content</key>
-	<string>: $0;</string>
+	<string>: $0</string>
 	<key>keyEquivalent</key>
 	<string>:</string>
 	<key>name</key>

diff --git a/Snippets/background-color: sass.tmSnippet b/Snippets/background-color: sass.tmSnippet
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>content</key>
-	<string>background-color: = !${1:sass_color}$0</string>
+	<string>background-color = !${1:sass_color}$0</string>
 	<key>name</key>
 	<string>background-color: sass</string>
 	<key>scope</key>

diff --git a/Snippets/border-bottom-color: sass.tmSnippet b/Snippets/border-bottom-color: sass.tmSnippet
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>content</key>
-	<string>border-bottom-color: = !${2:sass_color}
+	<string>border-bottom-color = !${2:sass_color}
 </string>
 	<key>name</key>
 	<string>border-bottom-color: sass</string>

diff --git a/Snippets/border-left-color: sass.tmSnippet b/Snippets/border-left-color: sass.tmSnippet
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>content</key>
-	<string>border-left-color: = !${2:sass_color}
+	<string>border-left-color = !${2:sass_color}
 </string>
 	<key>name</key>
 	<string>border-left-color: sass</string>

diff --git a/Snippets/border-right-color: sass.tmSnippet b/Snippets/border-right-color: sass.tmSnippet
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>content</key>
-	<string>border-right-color: = !${2:sass_color}
+	<string>border-right-color = !${2:sass_color}
 </string>
 	<key>name</key>
 	<string>border-right-color: sass</string>

diff --git a/Snippets/border-top-color: sass.tmSnippet b/Snippets/border-top-color: sass.tmSnippet
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>content</key>
-	<string>border-top-color: = !${2:sass_color}
+	<string>border-top-color = !${2:sass_color}
 </string>
 	<key>name</key>
 	<string>border-top-color: sass</string>

diff --git a/Snippets/border: all.tmSnippet b/Snippets/border: all.tmSnippet
@@ -4,8 +4,8 @@
 <dict>
 	<key>content</key>
 	<string>border-style: ${1:solid }
-:border-color = !${2:sass_color}
-:border-width ${131:1}${14:px}$0</string>
+border-color = !${2:sass_color}
+border-width: ${131:1}${14:px}$0</string>
 	<key>name</key>
 	<string>border: all</string>
 	<key>scope</key>

diff --git a/Snippets/box-shadow.tmSnippet b/Snippets/box-shadow.tmSnippet
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>content</key>
+	<string>-webkit-box-shadow= ${1:0} ${2:0} ${3:5px} ${4:#000}
+-moz-box-shadow= $1 $2 $3 $4
+-box-shadow= $1 $2 $3 $4</string>
+	<key>name</key>
+	<string>box-shadow</string>
+	<key>scope</key>
+	<string>source.sass</string>
+	<key>tabTrigger</key>
+	<string>bs</string>
+	<key>uuid</key>
+	<string>650F6FA1-F849-4CB0-BA0B-BCB05D0ACD07</string>
+</dict>
+</plist>
diff --git a/Snippets/clearfix 2.tmSnippet b/Snippets/clearfix 2.tmSnippet
@@ -5,12 +5,12 @@
 	<key>content</key>
 	<string>=clearfix
   &amp;:after
-    :content "${1:.}"
-    :display block
-    :clear both
-    :visibility hidden
-    :line-height 0
-    :height 0</string>
+    content: "${1:.}"
+    display: block
+    clear: both
+    visibility: hidden
+    line-height: 0
+    height: 0</string>
 	<key>name</key>
 	<string>=clearfix</string>
 	<key>scope</key>

diff --git a/Snippets/clearfix 3.tmSnippet b/Snippets/clearfix 3.tmSnippet
@@ -4,11 +4,11 @@
 <dict>
 	<key>content</key>
 	<string>content: "${1:.}"
-:display block
-:clear both
-:visibility hidden
-:line-height 0
-:height 0</string>
+display: block
+clear: both
+visibility: hidden
+line-height: 0
+height: 0</string>
 	<key>name</key>
 	<string>clearfix</string>
 	<key>scope</key>

diff --git a/Snippets/color: sass.tmSnippet b/Snippets/color: sass.tmSnippet
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>content</key>
-	<string>color: = !${1:sass_color}$0</string>
+	<string>color = !${1:sass_color}$0</string>
 	<key>name</key>
 	<string>color: sass</string>
 	<key>scope</key>

diff --git a/Snippets/empty-cells: hide.tmSnippet b/Snippets/empty-cells: hide.tmSnippet
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>content</key>
-	<string>;empty-cells hide$0</string>
+	<string>empty-cells: hide$0</string>
 	<key>name</key>
 	<string>empty-cells: hide</string>
 	<key>scope</key>

diff --git a/Snippets/margin:padding 0.tmSnippet b/Snippets/margin:padding 0.tmSnippet
@@ -4,7 +4,7 @@
 <dict>
 	<key>content</key>
 	<string>margin: 0
-:padding 0</string>
+padding: 0</string>
 	<key>name</key>
 	<string>margin+padding: 0</string>
 	<key>scope</key>

diff --git a/Snippets/rounded-corners-bottom.tmSnippet b/Snippets/rounded-corners-bottom.tmSnippet
@@ -3,16 +3,16 @@
 <plist version="1.0">
 <dict>
 	<key>content</key>
-	<string>-moz-border-radius-bottomright: ${2:.5em}
-:-webkit-border-bottom-right-radius $2
-:-moz-border-radius-bottomleft $2
-:-webkit-border-bottom-left-radius $2</string>
+	<string>-moz-border-radius-bottomright: 		${2:.5em}
+-webkit-border-bottom-right-radius: 	$2
+-moz-border-radius-bottomleft:		$2
+-webkit-border-bottom-left-radius:	$2</string>
 	<key>name</key>
-	<string>rounded-corners-bottom</string>
+	<string>border-radius-bottom</string>
 	<key>scope</key>
 	<string>source.sass</string>
 	<key>tabTrigger</key>
-	<string>rcb</string>
+	<string>brb</string>
 	<key>uuid</key>
 	<string>7A11F1F1-58AA-45BF-AED9-E46C952502D5</string>
 </dict>

diff --git a/Snippets/rounded-corners-top.tmSnippet b/Snippets/rounded-corners-top.tmSnippet
@@ -3,16 +3,16 @@
 <plist version="1.0">
 <dict>
 	<key>content</key>
-	<string>-moz-border-radius-topright: ${2:.5em}
-:-webkit-border-top-right-radius $2
-:-moz-border-radius-topleft $2
-:-webkit-border-top-left-radius $2</string>
+	<string>-moz-border-radius-topright: 		${2:.5em}
+-webkit-border-top-right-radius: 	$2
+-moz-border-radius-topleft:			$2
+-webkit-border-top-left-radius:		$2</string>
 	<key>name</key>
-	<string>rounded-corners-top</string>
+	<string>border-radius-top</string>
 	<key>scope</key>
 	<string>source.sass</string>
 	<key>tabTrigger</key>
-	<string>rct</string>
+	<string>brt</string>
 	<key>uuid</key>
 	<string>C6EA43C1-B7BD-4D02-903D-F1DF144D7724</string>
 </dict>

diff --git a/Snippets/rounded-corners.tmSnippet b/Snippets/rounded-corners.tmSnippet
@@ -4,13 +4,14 @@
 <dict>
 	<key>content</key>
 	<string>-moz-border-radius: ${2:.5em}
-:-webkit-border-radius $2</string>
+-webkit-border-radius: $2
+border-radius: $2</string>
 	<key>name</key>
-	<string>rounded-corners</string>
+	<string>border-radius</string>
 	<key>scope</key>
 	<string>source.sass</string>
 	<key>tabTrigger</key>
-	<string>rc</string>
+	<string>br</string>
 	<key>uuid</key>
 	<string>D6E82599-1911-46AE-9C2B-FDEE23423430</string>
 </dict>

diff --git a/Snippets/scrollbar.tmSnippet b/Snippets/scrollbar.tmSnippet
@@ -3,14 +3,14 @@
 <plist version="1.0">
 <dict>
 	<key>content</key>
-	<string>scrollbar-base-color:       ${1:#CCCCCC};${2:
-:scrollbar-arrow-color      ${3:#000000};
-:scrollbar-track-color      ${4:#999999};
-:scrollbar-3dlight-color    ${5:#EEEEEE};
-:scrollbar-highlight-color  ${6:#FFFFFF};
-:scrollbar-face-color       ${7:#CCCCCC};
-:scrollbar-shadow-color     ${9:#999999};
-:scrollbar-darkshadow-color ${8:#666666};}</string>
+	<string>scrollbar-base-color:       ${1:#CCCCCC}${2:
+scrollbar-arrow-color:      ${3:#000000}
+scrollbar-track-color:      ${4:#999999}
+scrollbar-3dlight-color:    ${5:#EEEEEE}
+scrollbar-highlight-color:  ${6:#FFFFFF}
+scrollbar-face-color:      ${7:#CCCCCC}
+scrollbar-shadow-color:     ${9:#999999}
+scrollbar-darkshadow-color: ${8:#666666}}</string>
 	<key>name</key>
 	<string>scrollbar</string>
 	<key>scope</key>

diff --git a/Syntaxes/SASS.tmLanguage b/Syntaxes/SASS.tmLanguage
@@ -3,7 +3,10 @@
 <plist version="1.0">
 <dict>
 	<key>fileTypes</key>
-	<array/>
+	<array>
+		<string>sass</string>
+		<string>scss</string>
+	</array>
 	<key>foldingStartMarker</key>
 	<string>/\*|^#|^\*|^\b|^\.</string>
 	<key>foldingStopMarker</key>
@@ -20,6 +23,12 @@
 			<key>name</key>
 			<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>
@@ -57,15 +66,15 @@
 		</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>
 		<dict>
 			<key>begin</key>
 			<string>/\*</string>
 			<key>end</key>
-			<string>\*/|$</string>
+			<string>\*/</string>
 			<key>name</key>
 			<string>comment.block.sass</string>
 		</dict>
@@ -77,12 +86,24 @@
 			<key>name</key>
 			<string>comment.line.double-slash.sass</string>
 		</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>
@@ -99,7 +120,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>

diff --git a/info.plist b/info.plist
@@ -339,6 +339,7 @@
 		<string>EB315E03-5E51-46CC-8B46-127718516558</string>
 		<string>A9BD1379-762B-43CF-8385-2053B0CCB259</string>
 		<string>930EA01A-1D65-4336-AAF9-8636F0510BE2</string>
+		<string>650F6FA1-F849-4CB0-BA0B-BCB05D0ACD07</string>
 		<string>5EC2643D-F008-44B5-9142-BC8962911C4C</string>
 		<string>98B51551-6D1B-49DF-A113-F251383B614D</string>
 		<string>1E72DD9B-678B-4E2F-8BF3-5B37643889F9</string>