Skip to content

Commit

Permalink
Merge pull request #11812 from edx/PERF-276
Browse files Browse the repository at this point in the history
Clear out usages of deprecated vendor prefixes.
  • Loading branch information
tobz committed Mar 18, 2016
2 parents 658348d + e2b8df7 commit f3d000e
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 83 deletions.
18 changes: 9 additions & 9 deletions common/static/sass/bourbon/css3/_animation.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,50 +3,50 @@

// Official animation shorthand property.
@mixin animation ($animations...) {
@include prefixer(animation, $animations, webkit moz spec);
@include prefixer(animation, $animations, spec);
}

// Individual Animation Properties
@mixin animation-name ($names...) {
@include prefixer(animation-name, $names, webkit moz spec);
@include prefixer(animation-name, $names, spec);
}


@mixin animation-duration ($times...) {
@include prefixer(animation-duration, $times, webkit moz spec);
@include prefixer(animation-duration, $times, spec);
}


@mixin animation-timing-function ($motions...) {
// ease | linear | ease-in | ease-out | ease-in-out
@include prefixer(animation-timing-function, $motions, webkit moz spec);
@include prefixer(animation-timing-function, $motions, spec);
}


@mixin animation-iteration-count ($values...) {
// infinite | <number>
@include prefixer(animation-iteration-count, $values, webkit moz spec);
@include prefixer(animation-iteration-count, $values, spec);
}


@mixin animation-direction ($directions...) {
// normal | alternate
@include prefixer(animation-direction, $directions, webkit moz spec);
@include prefixer(animation-direction, $directions, spec);
}


@mixin animation-play-state ($states...) {
// running | paused
@include prefixer(animation-play-state, $states, webkit moz spec);
@include prefixer(animation-play-state, $states, spec);
}


@mixin animation-delay ($times...) {
@include prefixer(animation-delay, $times, webkit moz spec);
@include prefixer(animation-delay, $times, spec);
}


@mixin animation-fill-mode ($modes...) {
// none | forwards | backwards | both
@include prefixer(animation-fill-mode, $modes, webkit moz spec);
@include prefixer(animation-fill-mode, $modes, spec);
}
2 changes: 1 addition & 1 deletion common/static/sass/bourbon/css3/_backface-visibility.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
// Backface-visibility mixin
//************************************************************************//
@mixin backface-visibility($visibility) {
@include prefixer(backface-visibility, $visibility, webkit spec);
@include prefixer(backface-visibility, $visibility, spec);
}
15 changes: 3 additions & 12 deletions common/static/sass/bourbon/css3/_background.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@
//************************************************************************//

@mixin background($backgrounds...) {
$webkit-backgrounds: ();
$spec-backgrounds: ();

@each $background in $backgrounds {
$webkit-background: ();
$spec-background: ();
$background-type: type-of($background);

Expand All @@ -19,37 +17,30 @@
$gradient-type: str-slice($background-str, 0, 6);

@if $url-str == "url" {
$webkit-background: $background;
$spec-background: $background;
}

@else if $gradient-type == "linear" {
$gradients: _linear-gradient-parser("#{$background}");
$webkit-background: map-get($gradients, webkit-image);
$spec-background: map-get($gradients, spec-image);
$spec-background: map-get($gradients, spec-image);
}

@else if $gradient-type == "radial" {
$gradients: _radial-gradient-parser("#{$background}");
$webkit-background: map-get($gradients, webkit-image);
$spec-background: map-get($gradients, spec-image);
$spec-background: map-get($gradients, spec-image);
}

@else {
$webkit-background: $background;
$spec-background: $background;
}
}

@else {
$webkit-background: $background;
$spec-background: $background;
}

$webkit-backgrounds: append($webkit-backgrounds, $webkit-background, comma);
$spec-backgrounds: append($spec-backgrounds, $spec-background, comma);
$spec-backgrounds: append($spec-backgrounds, $spec-background, comma);
}

background: $webkit-backgrounds;
background: $spec-backgrounds;
}
2 changes: 1 addition & 1 deletion common/static/sass/bourbon/css3/_box-sizing.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@mixin box-sizing ($box) {
// content-box | border-box | inherit
@include prefixer(box-sizing, $box, webkit moz spec);
@include prefixer(box-sizing, $box, spec);
}
4 changes: 2 additions & 2 deletions common/static/sass/bourbon/css3/_perspective.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
@mixin perspective($depth: none) {
// none | <length>
@include prefixer(perspective, $depth, webkit moz spec);
@include prefixer(perspective, $depth, spec);
}

@mixin perspective-origin($value: 50% 50%) {
@include prefixer(perspective-origin, $value, webkit moz spec);
@include prefixer(perspective-origin, $value, spec);
}
1 change: 0 additions & 1 deletion common/static/sass/bourbon/css3/_radial-gradient.scss
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,5 @@
$shape-size-spec: if(($shape-size-spec != ' ') and ($pos == null), '#{$shape-size-spec}, ', '#{$shape-size-spec} ');

background-color: $fallback-color;
background-image: -webkit-radial-gradient(unquote(#{$pos}#{$shape-size}#{$full}));
background-image: unquote("radial-gradient(#{$shape-size-spec}#{$pos-spec}#{$full})");
}
6 changes: 3 additions & 3 deletions common/static/sass/bourbon/css3/_transform.scss
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
@mixin transform($property: none) {
// none | <transform-function>
@include prefixer(transform, $property, webkit moz ms o spec);
@include prefixer(transform, $property, spec);
}

@mixin transform-origin($axes: 50%) {
// x-axis - left | center | right | length | %
// y-axis - top | center | bottom | length | %
// z-axis - length
@include prefixer(transform-origin, $axes, webkit moz ms o spec);
@include prefixer(transform-origin, $axes, spec);
}

@mixin transform-style ($style: flat) {
@include prefixer(transform-style, $style, webkit moz ms o spec);
@include prefixer(transform-style, $style, spec);
}
61 changes: 8 additions & 53 deletions common/static/sass/bourbon/css3/_transition.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,74 +4,29 @@
// @include transition-property (transform, opacity);

@mixin transition ($properties...) {
// Fix for vendor-prefix transform property
$needs-prefixes: false;
$webkit: ();
$moz: ();
$spec: ();

// Create lists for vendor-prefixed transform
@each $list in $properties {
@if nth($list, 1) == "transform" {
$needs-prefixes: true;
$list1: -webkit-transform;
$list2: -moz-transform;
$list3: ();

@each $var in $list {
$list3: join($list3, $var);

@if $var != "transform" {
$list1: join($list1, $var);
$list2: join($list2, $var);
}
}

$webkit: append($webkit, $list1);
$moz: append($moz, $list2);
$spec: append($spec, $list3);
}

// Create lists for non-prefixed transition properties
@else {
$webkit: append($webkit, $list, comma);
$moz: append($moz, $list, comma);
$spec: append($spec, $list, comma);
}
@if length($properties) >= 1 {
@include prefixer(transition, $properties, spec);
}

@if $needs-prefixes {
-webkit-transition: $webkit;
-moz-transition: $moz;
transition: $spec;
}
@else {
@if length($properties) >= 1 {
@include prefixer(transition, $properties, webkit moz spec);
}

@else {
$properties: all 0.15s ease-out 0s;
@include prefixer(transition, $properties, webkit moz spec);
}
$properties: all 0.15s ease-out 0s;
@include prefixer(transition, $properties, spec);
}
}

@mixin transition-property ($properties...) {
-webkit-transition-property: transition-property-names($properties, 'webkit');
-moz-transition-property: transition-property-names($properties, 'moz');
transition-property: transition-property-names($properties, false);
transition-property: transition-property-names($properties, false);
}

@mixin transition-duration ($times...) {
@include prefixer(transition-duration, $times, webkit moz spec);
@include prefixer(transition-duration, $times, spec);
}

@mixin transition-timing-function ($motions...) {
// ease | linear | ease-in | ease-out | ease-in-out | cubic-bezier()
@include prefixer(transition-timing-function, $motions, webkit moz spec);
@include prefixer(transition-timing-function, $motions, spec);
}

@mixin transition-delay ($times...) {
@include prefixer(transition-delay, $times, webkit moz spec);
@include prefixer(transition-delay, $times, spec);
}
2 changes: 1 addition & 1 deletion common/static/sass/bourbon/css3/_user-select.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
@mixin user-select($arg: none) {
@include prefixer(user-select, $arg, webkit moz ms spec);
@include prefixer(user-select, $arg, spec);
}

0 comments on commit f3d000e

Please sign in to comment.