Browse Source

Merge pull request #86 from xzyfer/patch-1

Always define compact
master
Michael Mifsud 9 years ago
parent
commit
e3d7d67a5f
  1. 6
      lib/compass/css3/_transition.scss
  2. 8
      lib/compass/functions/_lists.scss

6
lib/compass/css3/_transition.scss

@ -176,9 +176,9 @@ $transitionable-prefixed-values: transform, transform-origin !default;
// Keep a list of delays in case one is specified // Keep a list of delays in case one is specified
$delays: append($delays, if($delay, $delay, 0s)); $delays: append($delays, if($delay, $delay, 0s));
$webkit-value: append($webkit-value, compact(prefixed-for-transition(-webkit, $property) $duration $timing-function)); $webkit-value: append($webkit-value, compact((prefixed-for-transition(-webkit, $property) $duration $timing-function)...));
$moz-value: append( $moz-value, compact(prefixed-for-transition( -moz, $property) $duration $timing-function $delay)); $moz-value: append( $moz-value, compact((prefixed-for-transition( -moz, $property) $duration $timing-function $delay)...));
$o-value: append( $o-value, compact(prefixed-for-transition( -o, $property) $duration $timing-function $delay)); $o-value: append( $o-value, compact((prefixed-for-transition( -o, $property) $duration $timing-function $delay)...));
} }
@if $experimental-support-for-webkit { -webkit-transition : $webkit-value; @if $experimental-support-for-webkit { -webkit-transition : $webkit-value;

8
lib/compass/functions/_lists.scss

@ -20,6 +20,7 @@
// compass_list can't be implemented in sass script // compass_list can't be implemented in sass script
@function -compass-space-list($item1, $item2:null, $item3:null, $item4:null, $item5:null, $item6:null, $item7:null, $item8:null, $item9:null) { @function -compass-space-list($item1, $item2:null, $item3:null, $item4:null, $item5:null, $item6:null, $item7:null, $item8:null, $item9:null) {
$items: ();
// Support for polymorphism. // Support for polymorphism.
@if type-of($item1) == 'list' { @if type-of($item1) == 'list' {
// Passing a single array of properties. // Passing a single array of properties.
@ -77,14 +78,13 @@
@return nth($list, 1); @return nth($list, 1);
} }
@if not(function-exists(compact)) { @function compact($vars...) {
@function compact($vars...) { $separator: list-separator($vars);
$list: (); $list: ();
@each $var in $vars { @each $var in $vars {
@if $var { @if $var {
$list: append($list, $var, comma); $list: append($list, $var, $separator);
} }
} }
@return $list; @return $list;
}
} }

Loading…
Cancel
Save