Permalink
Browse files

Move import to correct alphabetical place

  • Loading branch information...
2 parents d5727d5 + 4f8f909 commit d037656900fa253eab85d73fb6ee5fa6590cdf4b Phil LaPier committed May 10, 2012
@@ -22,6 +22,7 @@
@import "css3/flex-box";
@import "css3/inline-block";
@import "css3/linear-gradient";
+@import "css3/prefixer";
@import "css3/radial-gradient";
@import "css3/transform";
@import "css3/transition";
@@ -11,9 +11,7 @@
$full: compact($animation-1, $animation-2, $animation-3, $animation-4,
$animation-5, $animation-6, $animation-7, $animation-8, $animation-9);
- -webkit-animation: $full;
- -moz-animation: $full;
- animation: $full;
+ @include prefixer(animation, $full);
}
// Individual Animation Properties
@@ -26,9 +24,7 @@
$full: compact($name-1, $name-2, $name-3, $name-4,
$name-5, $name-6, $name-7, $name-8, $name-9);
- -webkit-animation-name: $full;
- -moz-animation-name: $full;
- animation-name: $full;
+ @include prefixer(animation-name, $full);
}
@@ -41,9 +37,7 @@
$full: compact($time-1, $time-2, $time-3, $time-4,
$time-5, $time-6, $time-7, $time-8, $time-9);
- -webkit-animation-duration: $full;
- -moz-animation-duration: $full;
- animation-duration: $full;
+ @include prefixer(animation-duration, $full);
}
@@ -57,9 +51,7 @@
$full: compact($motion-1, $motion-2, $motion-3, $motion-4,
$motion-5, $motion-6, $motion-7, $motion-8, $motion-9);
- -webkit-animation-timing-function: $full;
- -moz-animation-timing-function: $full;
- animation-timing-function: $full;
+ @include prefixer(animation-timing-function, $full);
}
@@ -73,9 +65,7 @@
$full: compact($value-1, $value-2, $value-3, $value-4,
$value-5, $value-6, $value-7, $value-8, $value-9);
- -webkit-animation-iteration-count: $full;
- -moz-animation-iteration-count: $full;
- animation-iteration-count: $full;
+ @include prefixer(animation-iteration-count, $full);
}
@@ -89,9 +79,7 @@
$full: compact($direction-1, $direction-2, $direction-3, $direction-4,
$direction-5, $direction-6, $direction-7, $direction-8, $direction-9);
- -webkit-animation-direction: $full;
- -moz-animation-direction: $full;
- animation-direction: $full;
+ @include prefixer(animation-direction, $full);
}
@@ -105,9 +93,7 @@
$full: compact($state-1, $state-2, $state-3, $state-4,
$state-5, $state-6, $state-7, $state-8, $state-9);
- -webkit-animation-play-state: $full;
- -moz-animation-play-state: $full;
- animation-play-state: $full;
+ @include prefixer(animation-play-state, $full);
}
@@ -120,9 +106,7 @@
$full: compact($time-1, $time-2, $time-3, $time-4,
$time-5, $time-6, $time-7, $time-8, $time-9);
- -webkit-animation-delay: $full;
- -moz-animation-delay: $full;
- animation-delay: $full;
+ @include prefixer(animation-delay, $full);
}
@@ -137,7 +121,5 @@
$full: compact($mode-1, $mode-2, $mode-3, $mode-4,
$mode-5, $mode-6, $mode-7, $mode-8, $mode-9);
- -webkit-animation-fill-mode: $full;
- -moz-animation-fill-mode: $full;
- animation-fill-mode: $full;
+ @include prefixer(animation-fill-mode, $full);
}
@@ -1,7 +1,3 @@
@mixin appearance ($value) {
- -webkit-appearance: $value;
- -moz-appearance: $value;
- -ms-appearance: $value;
- -o-appearance: $value;
- appearance: $value;
+ @include prefixer(appearance, $value, webkit, moz, ms, o);
}
@@ -7,9 +7,5 @@
$full: compact($length-1, $length-2, $length-3, $length-4,
$length-5, $length-6, $length-7, $length-8, $length-9);
- -webkit-background-size: $full;
- -moz-background-size: $full;
- -ms-background-size: $full;
- -o-background-size: $full;
- background-size: $full;
+@include prefixer(background-size, $full, webkit, moz, ms, o);
}
@@ -1,35 +1,24 @@
@mixin border-radius ($radii) {
- -webkit-border-radius: $radii;
- -moz-border-radius: $radii;
- border-radius: $radii;
+ @include prefixer(border-radius, $radii);
}
@mixin border-top-left-radius($radii) {
- -webkit-border-top-left-radius: $radii;
- -moz-border-top-left-radius: $radii;
- -moz-border-radius-topleft: $radii;
- border-top-left-radius: $radii;
+ -moz-border-radius-topleft: $radii;
+ @include prefixer(border-top-left-radius, $radii);
}
@mixin border-top-right-radius($radii) {
- -webkit-border-top-right-radius: $radii;
- -moz-border-top-right-radius: $radii;
- -moz-border-radius-topright: $radii;
- border-top-right-radius: $radii;
+ -moz-border-radius-topright: $radii;
+ @include prefixer(border-top-right-radius, $radii);
}
@mixin border-bottom-left-radius($radii) {
- -webkit-border-bottom-left-radius: $radii;
- -moz-border-bottom-left-radius: $radii;
- -moz-border-radius-bottomleft: $radii;
- border-bottom-left-radius: $radii;
+ -moz-border-radius-bottomleft: $radii;
+ @include prefixer(border-bottom-left-radius, $radii);
}
@mixin border-bottom-right-radius($radii) {
- -webkit-border-bottom-right-radius: $radii;
- -moz-border-bottom-right-radius: $radii;
- -moz-border-radius-bottomright: $radii;
- border-bottom-right-radius: $radii;
+ @include prefixer(border-bottom-right-radius, $radii);
}
@mixin border-top-radius($radii) {
@@ -8,7 +8,5 @@
$full: compact($shadow-1, $shadow-2, $shadow-3, $shadow-4,
$shadow-5, $shadow-6, $shadow-7, $shadow-8, $shadow-9);
- -webkit-box-shadow: $full;
- -moz-box-shadow: $full;
- box-shadow: $full;
+ @include prefixer(box-shadow, $full);
}
@@ -1,6 +1,4 @@
@mixin box-sizing ($box) {
// content-box | border-box | inherit
- -webkit-box-sizing: $box;
- -moz-box-sizing: $box;
- box-sizing: $box;
+ @include prefixer(box-sizing, $box);
}
@@ -1,67 +1,47 @@
@mixin columns($arg: auto) {
// <column-count> || <column-width>
- -webkit-columns: $arg;
- -moz-columns: $arg;
- columns: $arg;
+ @include prefixer(columns, $arg);
}
@mixin column-count($int: auto) {
// auto || integer
- -webkit-column-count: $int;
- -moz-column-count: $int;
- column-count: $int;
+ @include prefixer(column-count, $int);
}
@mixin column-gap($length: normal) {
// normal || length
- -webkit-column-gap: $length;
- -moz-column-gap: $length;
- column-gap: $length;
+ @include prefixer(column-gap, $length);
}
@mixin column-fill($arg: auto) {
// auto || length
- -webkit-columns-fill: $arg;
- -moz-columns-fill: $arg;
- columns-fill: $arg;
+ @include prefixer(columns-fill, $arg);
}
@mixin column-rule($arg) {
// <border-width> || <border-style> || <color>
- -webkit-column-rule: $arg;
- -moz-column-rule: $arg;
- column-rule: $arg;
+ @include prefixer(column-rule, $arg);
}
@mixin column-rule-color($color) {
- -webkit-column-rule-color: $color;
- -moz-column-rule-color: $color;
- column-rule-color: $color;
+ @include prefixer(column-rule-color, $color);
}
@mixin column-rule-style($style: none) {
// none | hidden | dashed | dotted | double | groove | inset | inset | outset | ridge | solid
- -webkit-column-rule-style: $style;
- -moz-column-rule-style: $style;
- column-rule-style: $style;
+ @include prefixer(column-rule-style, $style);
}
@mixin column-rule-width ($width: none) {
- -webkit-column-rule-width: $width;
- -moz-column-rule-width: $width;
- column-rule-width: $width;
+ @include prefixer(column-rule-width, $width);
}
@mixin column-span($arg: none) {
// none || all
- -webkit-column-span: $arg;
- -moz-column-span: $arg;
- column-span: $arg;
+ @include prefixer(column-span, $arg);
}
@mixin column-width($length: auto) {
// auto || length
- -webkit-column-width: $length;
- -moz-column-width: $length;
- column-width: $length;
+ @include prefixer(column-width, $length);
}
@@ -16,52 +16,37 @@
@mixin box-orient($orient: inline-axis) {
// horizontal|vertical|inline-axis|block-axis|inherit
- -webkit-box-orient: $orient;
- -moz-box-orient: $orient;
- box-orient: $orient;
+ @include prefixer(box-orient, $orient);
}
@mixin box-pack($pack: start) {
// start|end|center|justify
- -webkit-box-pack: $pack;
- -moz-box-pack: $pack;
- box-pack: $pack;
+ @include prefixer(box-pack, $pack);
}
@mixin box-align($align: stretch) {
// start|end|center|baseline|stretch
- -webkit-box-align: $align;
- -moz-box-align: $align;
- box-align: $align;
+ @include prefixer(box-align, $align);
}
@mixin box-direction($direction: normal) {
// normal|reverse|inherit
- -webkit-box-direction: $direction;
- -moz-box-direction: $direction;
- box-direction: $direction;
+ @include prefixer(box-direction, $direction);
}
+
@mixin box-lines($lines: single) {
// single|multiple
- -webkit-box-lines: $lines;
- -moz-box-lines: $lines;
- box-lines: $lines;
+ @include prefixer(box-lines, $lines);
}
-@mixin box-ordinal-group($integer: 1) {
- -webkit-box-ordinal-group: $integer;
- -moz-box-ordinal-group: $integer;
- box-ordinal-group: $integer;
+@mixin box-ordinal-group($int: 1) {
+ @include prefixer(box-ordinal-group, $int);
}
@mixin box-flex($value: 0.0) {
- -webkit-box-flex: $value;
- -moz-box-flex: $value;
- box-flex: $value;
+ @include prefixer(box-flex, $value);
}
-@mixin box-flex-group($integer: 1) {
- -webkit-box-flex-group: $integer;
- -moz-box-flex-group: $integer;
- box-flex-group: $integer;
+@mixin box-flex-group($int: 1) {
+ @include prefixer(box-flex-group, $int);
}
@@ -0,0 +1,12 @@
+@mixin prefixer ($property, $value,
+ $webkit: true,
+ $moz: true,
+ $ms: false,
+ $o: false,
+ $spec: true) {
+ @if $webkit { -webkit-#{$property}: $value; }
+ @if $moz { -moz-#{$property}: $value; }
+ @if $ms { -ms-#{$property}: $value; }
+ @if $o { -o-#{$property}: $value; }
+ @if $spec { #{$property}: $value; }
+}
@@ -1,19 +1,11 @@
@mixin transform($property: none) {
// none | <transform-function>
- -webkit-transform: $property;
- -moz-transform: $property;
- -ms-transform: $property;
- -o-transform: $property;
- transform: $property;
+ @include prefixer(transform, $property, webkit, moz, ms, o);
}
@mixin transform-origin($axes: 50%) {
// x-axis - left | center | right | length | %
// y-axis - top | center | bottom | length | %
// z-axis - length
- -webkit-transform-origin: $axes;
- -moz-transform-origin: $axes;
- -ms-transform-origin: $axes;
- -o-transform-origin: $axes;
- transform-origin: $axes;
+ @include prefixer(transform-origin, $axes, webkit, moz, ms, o);
}
Oops, something went wrong.

0 comments on commit d037656

Please sign in to comment.