|
@@ -67,9 +67,9 @@ $red:#E60000;
|
|
|
// ===== SHORTCUTS =======================================================================================================
|
|
|
|
|
|
// padding
|
|
|
-@mixin p($p){ padding:$arguments; }
|
|
|
-@mixin p($v, $h){ padding:$arguments; }
|
|
|
-@mixin p($t, $l, $b, $l){ padding:$arguments; }
|
|
|
+// @mixin p($p){ padding:$arguments; }
|
|
|
+// @mixin p($v, $h){ padding:$arguments; }
|
|
|
+// @mixin p($t, $l, $b, $l){ padding:$arguments; }
|
|
|
|
|
|
@mixin pt($p){ padding-top:$p; }
|
|
|
@mixin pr($p){ padding-right:$p; }
|
|
@@ -77,9 +77,9 @@ $red:#E60000;
|
|
|
@mixin pl($p){ padding-left:$p; }
|
|
|
|
|
|
// margin
|
|
|
-@mixin m($p){ margin:$arguments; }
|
|
|
-@mixin m($v, $h){ margin:$arguments; }
|
|
|
-@mixin m($t, $l, $b, $l){ margin:$arguments; }
|
|
|
+// @mixin m($p){ margin:$arguments; }
|
|
|
+// @mixin m($v, $h){ margin:$arguments; }
|
|
|
+// @mixin m($t, $l, $b, $l){ margin:$arguments; }
|
|
|
|
|
|
@mixin mt($m){ margin-top:$m; }
|
|
|
@mixin mr($m){ margin-right:$m; }
|
|
@@ -89,11 +89,11 @@ $red:#E60000;
|
|
|
@mixin no-margin(){ margin:0; padding:0; }
|
|
|
|
|
|
// border
|
|
|
-@mixin b($b){ border: $b; }
|
|
|
-@mixin b($size, $color){ border: $size solid $color; }
|
|
|
+// @mixin b($b){ border: $b; }
|
|
|
+// @mixin b($size, $color){ border: $size solid $color; }
|
|
|
|
|
|
@mixin bt($b){ border-top: $b;}
|
|
|
-@mixin bt($size, $color){border-top: $size solid $color;}
|
|
|
+//@mixin bt($size, $color){border-top: $size solid $color;}
|
|
|
|
|
|
@mixin br($b){ border-right: $b;}
|
|
|
@mixin br($size, $color){border-right: $size solid $color;}
|
|
@@ -179,13 +179,12 @@ $red:#E60000;
|
|
|
// =
|
|
|
// =
|
|
|
// ===== DISPLAY UTILS ===================================================================================================
|
|
|
-
|
|
|
// Inline blocks
|
|
|
-@mixin inlineblock($top)
|
|
|
+@mixin inlineblock()
|
|
|
{
|
|
|
display:moz-inline-stack;
|
|
|
display:inline-block;
|
|
|
- vertical-align:$align;
|
|
|
+ vertical-align:top;
|
|
|
zoom:1;
|
|
|
*display:inline;
|
|
|
// .ie7 &, .ie8 &{display:block;float:left;}
|
|
@@ -401,26 +400,33 @@ $g:0;
|
|
|
// | 'linear , ease-out , linear , ease-out'
|
|
|
// | );
|
|
|
//
|
|
|
-@mixin transition($property: all)
|
|
|
+// $property: all;
|
|
|
+// $duration: 1s;
|
|
|
+// $transitiondelay:0s;
|
|
|
+// $timingfunction: "ease-out";
|
|
|
+@mixin transition($property)
|
|
|
{
|
|
|
-webkit-transition: $property;
|
|
|
-moz-transition: $property;
|
|
|
-o-transition: $property;
|
|
|
transition: $property;
|
|
|
}
|
|
|
-@mixin transition($property, $duration)
|
|
|
+$arguments:("all", 0s);
|
|
|
+@mixin transition($arguments)
|
|
|
{
|
|
|
-webkit-transition: $arguments;
|
|
|
-moz-transition: $arguments;
|
|
|
-o-transition: $arguments;
|
|
|
transition: $arguments;
|
|
|
}
|
|
|
-@mixin transition($property, $duration, $transitiondelay, $timingfunction:ease-out)
|
|
|
+//$parameters:($property, $duration, $transitiondelay, "ease-out");
|
|
|
+$parameters:("all", 0s, "ease-out");
|
|
|
+@mixin transition($parameters)
|
|
|
{
|
|
|
- -webkit-transition: $arguments;
|
|
|
- -moz-transition: $arguments;
|
|
|
- -o-transition: $arguments;
|
|
|
- transition: $arguments;
|
|
|
+ -webkit-transition: $parameters;
|
|
|
+ -moz-transition: $parameters;
|
|
|
+ -o-transition: $parameters;
|
|
|
+ transition: $parameters;
|
|
|
}
|
|
|
@mixin transitions($property: all, $duration:0s, $transitiondelay:0s, $timingfunction:ease-out)
|
|
|
{
|