Merge branch 'master' into test

Author: peteboere

CssCrush/CssCrush.aliases

@@ -1,4 +1,3 @@
-
 ;----------------------------------------------------------------------------
 ;-- Property aliases
 
@@ -35,6 +34,10 @@
 	transition-delay[] = -moz-transition-delay
 	transition-delay[] = -ms-transition-delay
 	transition-delay[] = -o-transition-delay
+	transition-duration[] = -webkit-transition-duration
+	transition-duration[] = -moz-transition-duration
+	transition-duration[] = -ms-transition-duration
+	transition-duration[] = -o-transition-duration
 	transition-property[] = -webkit-transition-property
 	transition-property[] = -moz-transition-property
 	transition-property[] = -ms-transition-property
@@ -43,10 +46,6 @@
 	transition-timing-function[] = -moz-transition-timing-function
 	transition-timing-function[] = -ms-transition-timing-function
 	transition-timing-function[] = -o-transition-timing-function
-	transition-duration[] = -webkit-transition-duration
-	transition-duration[] = -moz-transition-duration
-	transition-duration[] = -ms-transition-duration
-	transition-duration[] = -o-transition-duration
 
 	; Animations
 	animation[] = -webkit-animation
@@ -61,6 +60,9 @@
 	animation-duration[] = -webkit-animation-duration
 	animation-duration[] = -moz-animation-duration
 	animation-duration[] = -ms-animation-duration
+	animation-fill-mode[] = -webkit-animation-fill-mode
+	animation-fill-mode[] = -moz-animation-fill-mode
+	animation-fill-mode[] = -ms-animation-fill-mode
 	animation-iteration-count[] = -webkit-animation-iteration-count
 	animation-iteration-count[] = -moz-animation-iteration-count
 	animation-iteration-count[] = -ms-animation-iteration-count
@@ -73,9 +75,7 @@
 	animation-timing-function[] = -webkit-animation-timing-function
 	animation-timing-function[] = -moz-animation-timing-function
 	animation-timing-function[] = -ms-animation-timing-function
-	animation-fill-mode[] = -webkit-animation-fill-mode
-	animation-fill-mode[] = -moz-animation-fill-mode
-	animation-fill-mode[] = -ms-animation-fill-mode
+
 
 	; Background size
 	background-size[] = -webkit-background-size
@@ -131,6 +131,12 @@
 	text-decoration-line[] = -moz-text-decoration-line
 	text-decoration-style[] = -moz-text-decoration-style
 
+	; User select (non standard)
+	user-select[] = -webkit-user-select
+	user-select[] = -moz-user-select
+	user-select[] = -o-user-select
+	user-select[] = user-select
+
 
 ;----------------------------------------------------------------------------
 ;-- Value aliases

CssCrush/CssCrush.php

@@ -3,7 +3,7 @@
  *
  * CSS Crush
  * 
- * @version    1.3
+ * @version    1.3.1
  * @license    http://www.opensource.org/licenses/mit-license.php (MIT)
  * @copyright  Copyright 2010-2011 Pete Boere
  * 

CssCrush/lib/Function.php

@@ -213,6 +213,8 @@ public static function css_fn__data_uri ( $input ) {
 		$allowed_file_extensions = array(
 			'woff' => 'font/woff;charset=utf-8',
 			'ttf'  => 'font/truetype;charset=utf-8',
+			'svg'  => 'image/svg+xml',
+			'svgz' => 'image/svg+xml',
 			'gif'  => 'image/gif',
 			'jpeg' => 'image/jpg',
 			'jpg'  => 'image/jpg',