Merge pull request #1042 from iliman/develop

CSS prefixes order fixes & 'suffix' output argument support in Multicolor control
themeum · Jul 11, 2016 · ce59ac3 · ce59ac3
2 parents 7b4e4c0 + de12821
commit ce59ac3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/includes/output/field/class-kirki-output-field-multicolor.php b/includes/output/field/class-kirki-output-field-multicolor.php
@@ -52,8 +52,11 @@ protected function process_output( $output, $value ) {
 					$output['media_query'] = 'global';
 				}
 
+				// If "suffix" is defined, add it to the value.
+				$output['suffix'] = ( isset( $output['suffix'] ) ) ? $output['suffix'] : '';
+
 				// Create the styles.
-				$this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = $sub_value;
+				$this->styles[ $output['media_query'] ][ $output['element'] ][ $output['property'] ] = $sub_value . $output['suffix'];
 
 			}
 		}

diff --git a/includes/styles/class-kirki-styles-output-css.php b/includes/styles/class-kirki-styles-output-css.php
@@ -225,7 +225,7 @@ public static function add_prefixes( $css ) {
 					foreach ( $elements as $element => $style_array ) {
 						foreach ( $style_array as $property => $value ) {
 
-							// Add -webkit-* and -mod-*.
+							// Add -webkit-* and -moz-*.
 							if ( is_string( $property ) && in_array( $property, array(
 								'border-radius',
 								'box-shadow',
@@ -236,8 +236,10 @@ public static function add_prefixes( $css ) {
 								'transition',
 								'transition-property',
 							) ) ) {
+								unset( $css[ $media_query ][ $element ][ $property ] );
 								$css[ $media_query ][ $element ][ '-webkit-' . $property ] = $value;
 								$css[ $media_query ][ $element ][ '-moz-' . $property ]    = $value;
+								$css[ $media_query ][ $element ][ $property ]              = $value;
 							}
 
 							// Add -ms-* and -o-*.
@@ -247,8 +249,10 @@ public static function add_prefixes( $css ) {
 								'transition',
 								'transition-property',
 							) ) ) {
+								unset( $css[ $media_query ][ $element ][ $property ] );
 								$css[ $media_query ][ $element ][ '-ms-' . $property ] = $value;
 								$css[ $media_query ][ $element ][ '-o-' . $property ]  = $value;
+								$css[ $media_query ][ $element ][ $property ]          = $value;
 							}
 						}
 					}