Skip to content

Commit

Permalink
Merge pull request #35 from ptcong/patch-1
Browse files Browse the repository at this point in the history
fix css3-prefix argument length
  • Loading branch information
matthieua committed May 6, 2015
2 parents 2b83f4a + aa41fa4 commit 9cc4d7b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions css3-mixins.sass
Expand Up @@ -44,7 +44,7 @@
* - content: Animation css
* - animation - arguments: name duration timing-function delay iteration-count direction fill-mode play-state
(http://www.w3schools.com/cssref/css3_pr_animation.asp)

*-------------------------------------------------------------*/

/* ADDS A BROWSER PREFIX TO THE PROPERTY */
Expand Down Expand Up @@ -79,7 +79,7 @@
filter: progid:DXImageTransform.Microsoft.gradient(startColorStr='#{$startColor}', endColorStr='#{$endColor}', gradientType='1')

/* BACKGROUND RADIAL */
@mixin background-radial($startColor: #FFFFFF, $startPos: 0%, $endColor: #000000, $endPos:100%)
@mixin background-radial($startColor: #FFFFFF, $startPos: 0%, $endColor: #000000, $endPos:100%)
background: -moz-radial-gradient(center, ellipse cover, $startColor $startPos, $endColor $endPos)
background: -webkit-gradient(radial, center center, 0px, center center, 100%, color-stop($startPos,$startColor), color-stop($endPos,$endColor))
background: -webkit-radial-gradient(center, ellipse cover, $startColor $startPos,$endColor $endPos)
Expand Down Expand Up @@ -216,7 +216,7 @@
@if length($properties) >= 1
@include css3-prefix('transition', $properties)
@else
@include css3-prefix('transition', $what: all, $length: 1s, $easing: ease-in-out)
@include css3-prefix('transition', "all 0.2s ease-in-out 0s")


/* TRIPLE BORDERS */
Expand All @@ -225,11 +225,11 @@

@include border-radius($radius)

@include css3-prefix('box-shadow', 0 0 0 1px $colorTwo, 0 0 0 2px $colorThree)
@include css3-prefix('box-shadow', "0 0 0 1px #{$colorTwo}, 0 0 0 2px #{$colorThree}")


/* KEYFRAMES */
@mixin keyframes($animation-name)
@mixin keyframes($animation-name)
@-webkit-keyframes $animation-name
@content
@-moz-keyframes $animation-name
Expand Down
12 changes: 6 additions & 6 deletions css3-mixins.scss
Expand Up @@ -201,7 +201,7 @@
/* OPACITY */
@mixin opacity($opacity: 0.5) {
$opacityMultiplied: ($opacity * 100);

filter: alpha(opacity=$opacityMultiplied);
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=" + $opacityMultiplied + ")";
@include css3-prefix('opacity', $opacity);
Expand Down Expand Up @@ -243,13 +243,13 @@

/* TRANSITION */
@mixin transition($properties...) {

@if length($properties) >= 1 {
@include css3-prefix('transition', $properties);
}

@else {
@include css3-prefix('transition', $what: all, $length: 1s, $easing: ease-in-out);
@include css3-prefix('transition', "all 0.2s ease-in-out 0s");
}
}

Expand All @@ -259,7 +259,7 @@

@include border-radius($radius);

@include css3-prefix('box-shadow', 0 0 0 1px $colorTwo, 0 0 0 2px $colorThree);
@include css3-prefix('box-shadow', "0 0 0 1px #{$colorTwo}, 0 0 0 2px #{$colorThree}");
}

/* KEYFRAMES */
Expand All @@ -269,13 +269,13 @@
}
@-moz-keyframes #{$animation-name} {
@content;
}
}
@-ms-keyframes #{$animation-name} {
@content;
}
@-o-keyframes #{$animation-name} {
@content;
}
}
@keyframes #{$animation-name} {
@content;
}
Expand Down

0 comments on commit 9cc4d7b

Please sign in to comment.