diff --git a/Extensions/Compass/Compass.php b/Extensions/Compass/Compass.php
index 0da84b2..06faf48 100755
--- a/Extensions/Compass/Compass.php
+++ b/Extensions/Compass/Compass.php
@@ -89,12 +89,12 @@ public static function getFilesArray($root)
$root = ($last_letter == '\\' || $last_letter == '/') ? $root : $root . DIRECTORY_SEPARATOR;
$directories[] = $root;
-
+
while (sizeof($directories)) {
$dir = array_pop($directories);
if ($handle = opendir($dir)) {
while (false !== ($file = readdir($handle))) {
- if ($file == '.' || $file == '..') {
+ if ($file == '.' || $file == '..' || substr($file,0,1)=='.') {
continue;
}
$file = $dir . $file;
@@ -152,7 +152,7 @@ public static function compassResolvePath($file)
if ($path) {
return $path;
}
-
+
return false;
}
@@ -444,10 +444,101 @@ public static function compassCommaList()
print_r(func_get_args());
die;
}
-
- public static function compassPrefixedForTransition($prefix, $property)
- {
-
+
+ public static function compassPrefixed ($prefix, $list) {
+ $list = static::compassList( $list );
+ $prefix = trim ( preg_replace ( '/[^a-z]/', '', strtolower ( $prefix ) ) );
+
+ $reqs = array (
+ 'pie' => array (
+ 'border-radius',
+ 'box-shadow',
+ 'border-image',
+ 'background',
+ 'linear-gradient'
+ ),
+ 'webkit' => array (
+ 'background-clip',
+ 'background-origin',
+ 'border-radius',
+ 'box-shadow',
+ 'box-sizing',
+ 'columns',
+ 'gradient',
+ 'linear-gradient',
+ 'text-stroke'
+ ),
+ 'moz' => array (
+ 'background-size',
+ 'border-radius',
+ 'box-shadow',
+ 'box-sizing',
+ 'columns',
+ 'gradient',
+ 'linear-gradient'
+ ),
+ 'o' => array (
+ 'background-origin',
+ 'text-overflow'
+ )
+ );
+ foreach ( $list as $item ) {
+ $aspect = trim ( current ( explode ( '(', $item ) ) );
+ if (isset ( $reqs [$prefix] ) && in_array ( $aspect, $reqs [$prefix] )) {
+ return new SassBoolean ( TRUE );
+ }
+ }
+ return new SassBoolean ( FALSE );
+ }
+
+ public static function compassPrefix ($vendor, $input) {
+ if (is_object($vendor)) {
+ $vendor = $vendor->value;
+ }
+
+ $list = static::compassList($input, ',');
+ $output = '';
+ foreach($list as $key=>$value) {
+ $list[$key] = '-' . $vendor . '-' . $value;
+ }
+ return new SassString(implode(', ', $list));
+ }
+
+ public static function compassWebkit ($input) {
+ return static::compassPrefix('webkit', $input);
+ }
+
+ public static function compassMoz ($input) {
+ return static::compassPrefix('moz', $input);
+ }
+
+ public static function compassO ($input) {
+ return static::compassPrefix('o', $input);
+ }
+
+ public static function compassMs ($input) {
+ return static::compassPrefix('ms', $input);
+ }
+
+ public static function compassSvg ($input) {
+ return static::compassPrefix('svg', $input);
+ }
+
+ public static function compassPie ($input) {
+ return static::compassPrefix('ms', $input);
+ }
+
+ public static function compassCss2 ($input) {
+ return static::compassPrefix('ms', $input);
+ }
+
+ public static function compassOwg ($input) {
+ return static::compassPrefix('ms', $input);
+ }
+
+ public static function compassPrefixedForTransition($prefix, $list)
+ {
+
}
public static function compassPi()
diff --git a/Extensions/Compass/stylesheets/_compass.scss b/Extensions/Compass/stylesheets/_compass.scss
old mode 100755
new mode 100644
index 6fa644e..9b741c0
--- a/Extensions/Compass/stylesheets/_compass.scss
+++ b/Extensions/Compass/stylesheets/_compass.scss
@@ -1,3 +1,3 @@
-@import "compass/compass/utilities";
-@import "compass/compass/_typography";
-@import "compass/compass/_css3";
+@import "compass/utilities";
+@import "compass/typography";
+@import "compass/css3";
diff --git a/Extensions/Compass/stylesheets/_lemonade.scss b/Extensions/Compass/stylesheets/_lemonade.scss
old mode 100755
new mode 100644
index 38a30bd..226d926
--- a/Extensions/Compass/stylesheets/_lemonade.scss
+++ b/Extensions/Compass/stylesheets/_lemonade.scss
@@ -8,7 +8,7 @@
}
@mixin sized-sprite-image($file) {
- background: sprite-image($file);
+ background: sprite-image($file);
@include image-dimensions($file);
}
@@ -16,7 +16,8 @@
.#{$folder} {
@if $image-dimensions {
background: sprite-url($folder);
- } @else {
+ }
+ @else {
background: sprite-url($folder) no-repeat;
}
}
diff --git a/Extensions/Compass/stylesheets/compass/_css3.scss b/Extensions/Compass/stylesheets/compass/_css3.scss
old mode 100755
new mode 100644
index a4a88b7..a4aaf73
--- a/Extensions/Compass/stylesheets/compass/_css3.scss
+++ b/Extensions/Compass/stylesheets/compass/_css3.scss
@@ -1,20 +1,20 @@
-@import "css3/css3/_border-radius";
-@import "css3/css3/_inline-block";
-@import "css3/css3/_opacity";
-@import "css3/css3/_box-shadow";
-@import "css3/css3/_text-shadow";
-@import "css3/css3/_columns";
-@import "css3/css3/_box-sizing";
-@import "css3/css3/_box";
-@import "css3/css3/_images";
-@import "css3/css3/_background-clip";
-@import "css3/css3/_background-origin";
-@import "css3/css3/_background-size";
-@import "css3/css3/_font-face";
-@import "css3/css3/_transform";
-@import "css3/css3/_transition";
-@import "css3/css3/_appearance";
-@import "css3/css3/_regions";
-@import "css3/css3/_hyphenation";
-@import "css3/css3/_filter";
-@import "css3/css3/_user-interface";
+@import "css3/border-radius";
+@import "css3/inline-block";
+@import "css3/opacity";
+@import "css3/box-shadow";
+@import "css3/text-shadow";
+@import "css3/columns";
+@import "css3/box-sizing";
+@import "css3/box";
+@import "css3/images";
+@import "css3/background-clip";
+@import "css3/background-origin";
+@import "css3/background-size";
+@import "css3/font-face";
+@import "css3/transform";
+@import "css3/transition";
+@import "css3/appearance";
+@import "css3/regions";
+@import "css3/hyphenation";
+@import "css3/filter";
+@import "css3/user-interface";
diff --git a/Extensions/Compass/stylesheets/compass/_layout.scss b/Extensions/Compass/stylesheets/compass/_layout.scss
old mode 100755
new mode 100644
index 411a85b..55bf9ee
--- a/Extensions/Compass/stylesheets/compass/_layout.scss
+++ b/Extensions/Compass/stylesheets/compass/_layout.scss
@@ -1,3 +1,3 @@
-@import "layout/layout/_grid-background";
-@import "layout/layout/_sticky-footer";
-@import "layout/layout/_stretching";
+@import "layout/grid-background";
+@import "layout/sticky-footer";
+@import "layout/stretching";
diff --git a/Extensions/Compass/stylesheets/compass/_reset-legacy.scss b/Extensions/Compass/stylesheets/compass/_reset-legacy.scss
old mode 100755
new mode 100644
index 15448ac..f11f07a
--- a/Extensions/Compass/stylesheets/compass/_reset-legacy.scss
+++ b/Extensions/Compass/stylesheets/compass/_reset-legacy.scss
@@ -1,3 +1,3 @@
-@import "reset/reset/_utilities-legacy";
+@import "reset/utilities-legacy";
@include global-reset;
diff --git a/Extensions/Compass/stylesheets/compass/_reset.scss b/Extensions/Compass/stylesheets/compass/_reset.scss
old mode 100755
new mode 100644
index e44fb0b..e181dd7
--- a/Extensions/Compass/stylesheets/compass/_reset.scss
+++ b/Extensions/Compass/stylesheets/compass/_reset.scss
@@ -1,3 +1,3 @@
-@import "reset/reset/_utilities";
+@import "reset/utilities";
@include global-reset;
diff --git a/Extensions/Compass/stylesheets/compass/_support.scss b/Extensions/Compass/stylesheets/compass/_support.scss
old mode 100755
new mode 100644
index ab858c3..37b6e17
--- a/Extensions/Compass/stylesheets/compass/_support.scss
+++ b/Extensions/Compass/stylesheets/compass/_support.scss
@@ -21,20 +21,20 @@ $legacy-support-for-ie: $legacy-support-for-ie6 or $legacy-support-for-ie7 or $l
$legacy-support-for-mozilla: true;
// Support for mozilla in experimental css3 properties (-moz).
-$experimental-support-for-mozilla: true !default;
+$experimental-support-for-mozilla : true !default;
// Support for webkit in experimental css3 properties (-webkit).
-$experimental-support-for-webkit: true !default;
+$experimental-support-for-webkit : true !default;
// Support for webkit's original (non-standard) gradient syntax.
-$support-for-original-webkit-gradients: true !default;
+$support-for-original-webkit-gradients : true !default;
// Support for opera in experimental css3 properties (-o).
-$experimental-support-for-opera: true !default;
+$experimental-support-for-opera : true !default;
// Support for microsoft in experimental css3 properties (-ms).
-$experimental-support-for-microsoft: true !default;
+$experimental-support-for-microsoft : true !default;
// Support for khtml in experimental css3 properties (-khtml).
-$experimental-support-for-khtml: false !default;
+$experimental-support-for-khtml : false !default;
// Support for svg in experimental css3 properties.
// Setting this to true might add significant size to your
// generated stylesheets.
-$experimental-support-for-svg: false !default;
+$experimental-support-for-svg : false !default;
// Support for CSS PIE in experimental css3 properties (-pie).
-$experimental-support-for-pie: false !default;
+$experimental-support-for-pie : false !default;
diff --git a/Extensions/Compass/stylesheets/compass/_typography.scss b/Extensions/Compass/stylesheets/compass/_typography.scss
old mode 100755
new mode 100644
index c448372..4d9cb5d
--- a/Extensions/Compass/stylesheets/compass/_typography.scss
+++ b/Extensions/Compass/stylesheets/compass/_typography.scss
@@ -1,4 +1,4 @@
-@import "typography/typography/_links";
-@import "typography/typography/lists";
-@import "typography/typography/_text";
-@import "typography/typography/_vertical_rhythm";
+@import "typography/links";
+@import "typography/lists";
+@import "typography/text";
+@import "typography/vertical_rhythm";
diff --git a/Extensions/Compass/stylesheets/compass/_utilities.scss b/Extensions/Compass/stylesheets/compass/_utilities.scss
old mode 100755
new mode 100644
index e7fd462..53a0244
--- a/Extensions/Compass/stylesheets/compass/_utilities.scss
+++ b/Extensions/Compass/stylesheets/compass/_utilities.scss
@@ -1,8 +1,9 @@
-@import "utilities/utilities/_color";
-@import "utilities/utilities/_general";
-@import "utilities/utilities/_sprites";
-@import "utilities/utilities/tables";
+@import "utilities/color";
+@import "utilities/general";
+@import "utilities/sprites";
+@import "utilities/tables";
+
// deprecated
-@import "typography/typography/_links";
-@import "typography/typography/lists";
-@import "typography/typography/_text";
+@import "typography/links";
+@import "typography/lists";
+@import "typography/text";
diff --git a/Extensions/Compass/stylesheets/compass/css3/_appearance.scss b/Extensions/Compass/stylesheets/compass/css3/_appearance.scss
old mode 100755
new mode 100644
index 9b0dcaa..c6e6533
--- a/Extensions/Compass/stylesheets/compass/css3/_appearance.scss
+++ b/Extensions/Compass/stylesheets/compass/css3/_appearance.scss
@@ -11,5 +11,7 @@
@mixin appearance($ap) {
$ap: unquote($ap);
- @include experimental(appearance, $ap, -moz, -webkit, not -o, not -ms, not -khtml, official);
+ @include experimental(appearance, $ap,
+ -moz, -webkit, not -o, not -ms, not -khtml, official
+ );
}
diff --git a/Extensions/Compass/stylesheets/compass/css3/_background-clip.scss b/Extensions/Compass/stylesheets/compass/css3/_background-clip.scss
old mode 100755
new mode 100644
index e1e5590..6ce473f
--- a/Extensions/Compass/stylesheets/compass/css3/_background-clip.scss
+++ b/Extensions/Compass/stylesheets/compass/css3/_background-clip.scss
@@ -18,16 +18,26 @@ $default-background-clip: padding-box !default;
// * text
@mixin background-clip($clip: $default-background-clip) {
-// webkit and mozilla use the deprecated short [border | padding]
+ // webkit and mozilla use the deprecated short [border | padding]
$clip: unquote($clip);
$deprecated: $clip;
- @if $clip == padding-box {
- $deprecated: padding;
- }
- @if $clip == border-box {
- $deprecated: border;
- }
-// Support for webkit and mozilla's use of the deprecated short form
- @include experimental(background-clip, $deprecated, -moz, -webkit, not -o, not -ms, not -khtml, not official);
- @include experimental(background-clip, $clip, not -moz, not -webkit, not -o, not -ms, -khtml, official);
+ @if $clip == padding-box { $deprecated: padding; }
+ @if $clip == border-box { $deprecated: border; }
+ // Support for webkit and mozilla's use of the deprecated short form
+ @include experimental(background-clip, $deprecated,
+ -moz,
+ -webkit,
+ not -o,
+ not -ms,
+ not -khtml,
+ not official
+ );
+ @include experimental(background-clip, $clip,
+ not -moz,
+ not -webkit,
+ not -o,
+ not -ms,
+ -khtml,
+ official
+ );
}
diff --git a/Extensions/Compass/stylesheets/compass/css3/_background-origin.scss b/Extensions/Compass/stylesheets/compass/css3/_background-origin.scss
old mode 100755
new mode 100644
index 4a73cde..bc8eaa8
--- a/Extensions/Compass/stylesheets/compass/css3/_background-origin.scss
+++ b/Extensions/Compass/stylesheets/compass/css3/_background-origin.scss
@@ -13,21 +13,30 @@ $default-background-origin: content-box !default;
// * browser defaults to `padding-box`
// * mixin defaults to `content-box`
+
@mixin background-origin($origin: $default-background-origin) {
$origin: unquote($origin);
-// webkit and mozilla use the deprecated short [border | padding | content]
+ // webkit and mozilla use the deprecated short [border | padding | content]
$deprecated: $origin;
- @if $origin == padding-box {
- $deprecated: padding;
- }
- @if $origin == border-box {
- $deprecated: border;
- }
- @if $origin == content-box {
- $deprecated: content;
- }
+ @if $origin == padding-box { $deprecated: padding; }
+ @if $origin == border-box { $deprecated: border; }
+ @if $origin == content-box { $deprecated: content; }
-// Support for webkit and mozilla's use of the deprecated short form
- @include experimental(background-origin, $deprecated, -moz, -webkit, not -o, not -ms, not -khtml, not official);
- @include experimental(background-origin, $origin, not -moz, not -webkit, -o, -ms, -khtml, official);
+ // Support for webkit and mozilla's use of the deprecated short form
+ @include experimental(background-origin, $deprecated,
+ -moz,
+ -webkit,
+ not -o,
+ not -ms,
+ not -khtml,
+ not official
+ );
+ @include experimental(background-origin, $origin,
+ not -moz,
+ not -webkit,
+ -o,
+ -ms,
+ -khtml,
+ official
+ );
}
diff --git a/Extensions/Compass/stylesheets/compass/css3/_background-size.scss b/Extensions/Compass/stylesheets/compass/css3/_background-size.scss
old mode 100755
new mode 100644
index 79ce16f..9d36447
--- a/Extensions/Compass/stylesheets/compass/css3/_background-size.scss
+++ b/Extensions/Compass/stylesheets/compass/css3/_background-size.scss
@@ -8,16 +8,18 @@ $default-background-size: 100% auto !default;
//
// * percentages are relative to the background-origin (default = padding-box)
// * mixin defaults to: `$default-background-size`
-@mixin background-size($size-1: $default-background-size,
-$size-2: false,
-$size-3: false,
-$size-4: false,
-$size-5: false,
-$size-6: false,
-$size-7: false,
-$size-8: false,
-$size-9: false,
-$size-10: false) {
+@mixin background-size(
+ $size-1: $default-background-size,
+ $size-2: false,
+ $size-3: false,
+ $size-4: false,
+ $size-5: false,
+ $size-6: false,
+ $size-7: false,
+ $size-8: false,
+ $size-9: false,
+ $size-10: false
+) {
$size-1: if(type-of($size-1) == string, unquote($size-1), $size-1);
$sizes: compact($size-1, $size-2, $size-3, $size-4, $size-5, $size-6, $size-7, $size-8, $size-9, $size-10);
@include experimental(background-size, $sizes, -moz, -webkit, -o, not -ms, not -khtml);
diff --git a/Extensions/Compass/stylesheets/compass/css3/_border-radius.scss b/Extensions/Compass/stylesheets/compass/css3/_border-radius.scss
old mode 100755
new mode 100644
index 19d33cf..2da9022
--- a/Extensions/Compass/stylesheets/compass/css3/_border-radius.scss
+++ b/Extensions/Compass/stylesheets/compass/css3/_border-radius.scss
@@ -39,11 +39,26 @@ $default-border-radius: 5px !default;
@mixin border-radius($radius: $default-border-radius, $vertical-radius: false) {
@if $vertical-radius {
- // Webkit doesn't understand the official shorthand syntax for specifying
- // a vertical radius unless so in case there's several we only take the first.
- @include experimental(border-radius, first-value-of($radius) first-value-of($vertical-radius), not -moz, -webkit, not -o, not -ms, not -khtml, not official);
- @include experimental("border-radius", $radius unquote("/") $vertical-radius, -moz, not -webkit, not -o, not -ms, -khtml, official);
- } @else {
+ // Webkit doesn't understand the official shorthand syntax for specifying
+ // a vertical radius unless so in case there's several we only take the first.
+ @include experimental(border-radius, first-value-of($radius) first-value-of($vertical-radius),
+ not -moz,
+ -webkit,
+ not -o,
+ not -ms,
+ not -khtml,
+ not official
+ );
+ @include experimental("border-radius", $radius unquote("/") $vertical-radius,
+ -moz,
+ not -webkit,
+ not -o,
+ not -ms,
+ -khtml,
+ official
+ );
+ }
+ @else {
@include experimental(border-radius, $radius);
}
}
@@ -54,56 +69,62 @@ $default-border-radius: 5px !default;
// * legal values for `$horz`: `left`, `right`
@mixin border-corner-radius($vert, $horz, $radius: $default-border-radius) {
-// Support for mozilla's syntax for specifying a corner
- @include experimental("border-radius-#{$vert}#{$horz}", $radius, -moz, not -webkit, not -o, not -ms, not -khtml, not official);
- @include experimental("border-#{$vert}-#{$horz}-radius", $radius, not -moz, -webkit, not -o, not -ms, -khtml, official);
-
+ // Support for mozilla's syntax for specifying a corner
+ @include experimental("border-radius-#{$vert}#{$horz}", $radius,
+ -moz,
+ not -webkit,
+ not -o,
+ not -ms,
+ not -khtml,
+ not official
+ );
+ @include experimental("border-#{$vert}-#{$horz}-radius", $radius,
+ not -moz,
+ -webkit,
+ not -o,
+ not -ms,
+ -khtml,
+ official
+ );
+
}
// Round top-left corner only
@mixin border-top-left-radius($radius: $default-border-radius) {
- @include border-corner-radius(top, left, $radius);
-}
+ @include border-corner-radius(top, left, $radius); }
// Round top-right corner only
@mixin border-top-right-radius($radius: $default-border-radius) {
- @include border-corner-radius(top, right, $radius);
-}
+ @include border-corner-radius(top, right, $radius); }
// Round bottom-left corner only
@mixin border-bottom-left-radius($radius: $default-border-radius) {
- @include border-corner-radius(bottom, left, $radius);
-}
+ @include border-corner-radius(bottom, left, $radius); }
// Round bottom-right corner only
@mixin border-bottom-right-radius($radius: $default-border-radius) {
- @include border-corner-radius(bottom, right, $radius);
-}
+ @include border-corner-radius(bottom, right, $radius); }
// Round both top corners by amount
@mixin border-top-radius($radius: $default-border-radius) {
@include border-top-left-radius($radius);
- @include border-top-right-radius($radius);
-}
+ @include border-top-right-radius($radius); }
// Round both right corners by amount
@mixin border-right-radius($radius: $default-border-radius) {
@include border-top-right-radius($radius);
- @include border-bottom-right-radius($radius);
-}
+ @include border-bottom-right-radius($radius); }
// Round both bottom corners by amount
@mixin border-bottom-radius($radius: $default-border-radius) {
@include border-bottom-left-radius($radius);
- @include border-bottom-right-radius($radius);
-}
+ @include border-bottom-right-radius($radius); }
// Round both left corners by amount
@mixin border-left-radius($radius: $default-border-radius) {
@include border-top-left-radius($radius);
- @include border-bottom-left-radius($radius);
-}
+ @include border-bottom-left-radius($radius); }
diff --git a/Extensions/Compass/stylesheets/compass/css3/_box-shadow.scss b/Extensions/Compass/stylesheets/compass/css3/_box-shadow.scss
old mode 100755
new mode 100644
index 5bf8af8..ea47dc9
--- a/Extensions/Compass/stylesheets/compass/css3/_box-shadow.scss
+++ b/Extensions/Compass/stylesheets/compass/css3/_box-shadow.scss
@@ -5,6 +5,7 @@
@import "shared";
+
// The default color for box shadows
$default-box-shadow-color: #333333 !default;
@@ -18,40 +19,46 @@ $default-box-shadow-v-offset: 0px !default;
$default-box-shadow-blur: 5px !default;
// The default spread length.
-$default-box-shadow-spread: false !default;
+$default-box-shadow-spread : false !default;
// The default shadow inset: inset or false (for standard shadow).
-$default-box-shadow-inset: false !default;
+$default-box-shadow-inset : false !default;
// Provides cross-browser for Webkit, Gecko, and CSS3 box shadows when one or more box
// shadows are needed.
// Each shadow argument should adhere to the standard css3 syntax for the
// box-shadow property.
-@mixin box-shadow($shadow-1: default,
-$shadow-2: false,
-$shadow-3: false,
-$shadow-4: false,
-$shadow-5: false,
-$shadow-6: false,
-$shadow-7: false,
-$shadow-8: false,
-$shadow-9: false,
-$shadow-10: false) {
+@mixin box-shadow(
+ $shadow-1 : default,
+ $shadow-2 : false,
+ $shadow-3 : false,
+ $shadow-4 : false,
+ $shadow-5 : false,
+ $shadow-6 : false,
+ $shadow-7 : false,
+ $shadow-8 : false,
+ $shadow-9 : false,
+ $shadow-10: false
+) {
@if $shadow-1 == default {
- $shadow-1: -compass-space-list(compact(if($default-box-shadow-inset, inset, false), $default-box-shadow-h-offset, $default-box-shadow-v-offset, $default-box-shadow-blur, $default-box-shadow-spread, $default-box-shadow-color));
+ $shadow-1 : -compass-space-list(compact(if($default-box-shadow-inset, inset, false), $default-box-shadow-h-offset, $default-box-shadow-v-offset, $default-box-shadow-blur, $default-box-shadow-spread, $default-box-shadow-color));
}
- $shadow: compact($shadow-1, $shadow-2, $shadow-3, $shadow-4, $shadow-5, $shadow-6, $shadow-7, $shadow-8, $shadow-9, $shadow-10);
- @include experimental(box-shadow, $shadow, -moz, -webkit, not -o, not -ms, not -khtml, official);
+ $shadow : compact($shadow-1, $shadow-2, $shadow-3, $shadow-4, $shadow-5, $shadow-6, $shadow-7, $shadow-8, $shadow-9, $shadow-10);
+ @include experimental(box-shadow, $shadow,
+ -moz, -webkit, not -o, not -ms, not -khtml, official
+ );
}
// Provides a single cross-browser CSS box shadow for Webkit, Gecko, and CSS3.
// Includes default arguments for color, horizontal offset, vertical offset, blur length, spread length, and inset.
-@mixin single-box-shadow($color: $default-box-shadow-color,
-$hoff: $default-box-shadow-h-offset,
-$voff: $default-box-shadow-v-offset,
-$blur: $default-box-shadow-blur,
-$spread: $default-box-shadow-spread,
-$inset: $default-box-shadow-inset) {
+@mixin single-box-shadow(
+ $color : $default-box-shadow-color,
+ $hoff : $default-box-shadow-h-offset,
+ $voff : $default-box-shadow-v-offset,
+ $blur : $default-box-shadow-blur,
+ $spread : $default-box-shadow-spread,
+ $inset : $default-box-shadow-inset
+) {
@if not ($inset == true or $inset == false or $inset == inset) {
@warn "$inset expected to be true or the inset keyword. Got #{$inset} instead. Using: inset";
}
@@ -59,19 +66,11 @@ $inset: $default-box-shadow-inset) {
@if $color == none {
@include box-shadow(none);
} @else {
- $full: $hoff $voff;
- @if $blur {
- $full: $full $blur;
- }
- @if $spread {
- $full: $full $spread;
- }
- @if $color {
- $full: $full $color;
- }
- @if $inset {
- $full: inset $full;
- }
+ $full : $hoff $voff;
+ @if $blur { $full: $full $blur; }
+ @if $spread { $full: $full $spread; }
+ @if $color { $full: $full $color; }
+ @if $inset { $full: inset $full; }
@include box-shadow($full);
}
}
diff --git a/Extensions/Compass/stylesheets/compass/css3/_box-sizing.scss b/Extensions/Compass/stylesheets/compass/css3/_box-sizing.scss
old mode 100755
new mode 100644
index 695e377..93ff8ac
--- a/Extensions/Compass/stylesheets/compass/css3/_box-sizing.scss
+++ b/Extensions/Compass/stylesheets/compass/css3/_box-sizing.scss
@@ -7,5 +7,7 @@
@mixin box-sizing($bs) {
$bs: unquote($bs);
- @include experimental(box-sizing, $bs, -moz, -webkit, not -o, not -ms, not -khtml, official);
+ @include experimental(box-sizing, $bs,
+ -moz, -webkit, not -o, not -ms, not -khtml, official
+ );
}
diff --git a/Extensions/Compass/stylesheets/compass/css3/_box.scss b/Extensions/Compass/stylesheets/compass/css3/_box.scss
old mode 100755
new mode 100644
index a9f31d4..2abeef3
--- a/Extensions/Compass/stylesheets/compass/css3/_box.scss
+++ b/Extensions/Compass/stylesheets/compass/css3/_box.scss
@@ -2,25 +2,35 @@
// display:box; must be used for any of the other flexbox mixins to work properly
@mixin display-box {
- @include experimental-value(display, box, -moz, -webkit, not -o, -ms, not -khtml, official);
+ @include experimental-value(display, box,
+ -moz, -webkit, not -o, -ms, not -khtml, official
+ );
}
// Default box orientation, assuming that the user wants something less block-like
$default-box-orient: horizontal !default;
// Box orientation [ horizontal | vertical | inline-axis | block-axis | inherit ]
-@mixin box-orient($orientation: $default-box-orient) {
- $orientation: unquote($orientation);
- @include experimental(box-orient, $orientation, -moz, -webkit, not -o, -ms, not -khtml, official);
+@mixin box-orient(
+ $orientation: $default-box-orient
+) {
+ $orientation : unquote($orientation);
+ @include experimental(box-orient, $orientation,
+ -moz, -webkit, not -o, -ms, not -khtml, official
+ );
}
// Default box-align
$default-box-align: stretch !default;
// Box align [ start | end | center | baseline | stretch ]
-@mixin box-align($alignment: $default-box-align) {
- $alignment: unquote($alignment);
- @include experimental(box-align, $alignment, -moz, -webkit, not -o, -ms, not -khtml, official);
+@mixin box-align(
+ $alignment: $default-box-align
+) {
+ $alignment : unquote($alignment);
+ @include experimental(box-align, $alignment,
+ -moz, -webkit, not -o, -ms, not -khtml, official
+ );
}
// Default box flex
@@ -29,49 +39,73 @@ $default-box-flex: 0 !default;
// mixin which takes an int argument for box flex. Apply this to the children inside the box.
//
// For example: "div.display-box > div.child-box" would get the box flex mixin.
-@mixin box-flex($flex: $default-box-flex) {
- @include experimental(box-flex, $flex, -moz, -webkit, not -o, -ms, not -khtml, official);
+@mixin box-flex(
+ $flex: $default-box-flex
+) {
+ @include experimental(box-flex, $flex,
+ -moz, -webkit, not -o, -ms, not -khtml, official
+ );
}
// Default flex group
$default-box-flex-group: 1 !default;
// mixin which takes an int argument for flexible grouping
-@mixin box-flex-group($group: $default-box-flex-group) {
- @include experimental(box-flex-group, $group, -moz, -webkit, not -o, -ms, not -khtml, official);
+@mixin box-flex-group(
+ $group: $default-box-flex-group
+) {
+ @include experimental(box-flex-group, $group,
+ -moz, -webkit, not -o, -ms, not -khtml, official
+ );
}
// default for ordinal group
$default-box-ordinal-group: 1 !default;
// mixin which takes an int argument for ordinal grouping and rearranging the order
-@mixin box-ordinal-group($group: $default-ordinal-flex-group) {
- @include experimental(box-ordinal-group, $group, -moz, -webkit, not -o, -ms, not -khtml, official);
+@mixin box-ordinal-group(
+ $group: $default-box-ordinal-group
+) {
+ @include experimental(box-ordinal-group, $group,
+ -moz, -webkit, not -o, -ms, not -khtml, official
+ );
}
// Box direction default value
$default-box-direction: normal !default;
// mixin for box-direction [ normal | reverse | inherit ]
-@mixin box-direction($direction: $default-box-direction) {
+@mixin box-direction(
+ $direction: $default-box-direction
+) {
$direction: unquote($direction);
- @include experimental(box-direction, $direction, -moz, -webkit, not -o, -ms, not -khtml, official);
+ @include experimental(box-direction, $direction,
+ -moz, -webkit, not -o, -ms, not -khtml, official
+ );
}
// default for box lines
$default-box-lines: single !default;
// mixin for box lines [ single | multiple ]
-@mixin box-lines($lines: $default-box-lines) {
+@mixin box-lines(
+ $lines: $default-box-lines
+) {
$lines: unquote($lines);
- @include experimental(box-lines, $lines, -moz, -webkit, not -o, -ms, not -khtml, official);
+ @include experimental(box-lines, $lines,
+ -moz, -webkit, not -o, -ms, not -khtml, official
+ );
}
// default for box pack
$default-box-pack: start !default;
// mixin for box pack [ start | end | center | justify ]
-@mixin box-pack($pack: $default-box-pack) {
+@mixin box-pack(
+ $pack: $default-box-pack
+) {
$pack: unquote($pack);
- @include experimental(box-pack, $pack, -moz, -webkit, not -o, -ms, not -khtml, official);
-}
\ No newline at end of file
+ @include experimental(box-pack, $pack,
+ -moz, -webkit, not -o, -ms, not -khtml, official
+ );
+}
diff --git a/Extensions/Compass/stylesheets/compass/css3/_columns.scss b/Extensions/Compass/stylesheets/compass/css3/_columns.scss
old mode 100755
new mode 100644
index d23a894..dc79517
--- a/Extensions/Compass/stylesheets/compass/css3/_columns.scss
+++ b/Extensions/Compass/stylesheets/compass/css3/_columns.scss
@@ -6,39 +6,62 @@
//
// @include columns(20em 2)
@mixin columns($width-and-count) {
- @include experimental(columns, $width-and-count, -moz, -webkit, -o, -ms, not -khtml, official);
+ @include experimental(columns, $width-and-count,
+ -moz, -webkit, -o, -ms, not -khtml, official
+ );
}
// Specify the number of columns
@mixin column-count($count) {
- @include experimental(column-count, $count, -moz, -webkit, -o, -ms, not -khtml, official);
+ @include experimental(column-count, $count,
+ -moz, -webkit, -o, -ms, not -khtml, official
+ );
}
// Specify the gap between columns e.g. `20px`
@mixin column-gap($width) {
- @include experimental(column-gap, $width, -moz, -webkit, -o, -ms, not -khtml, official);
+ @include experimental(column-gap, $width,
+ -moz, -webkit, -o, -ms, not -khtml, official
+ );
}
// Specify the width of columns e.g. `100px`
@mixin column-width($width) {
- @include experimental(column-width, $width, -moz, -webkit, -o, -ms, not -khtml, official);
+ @include experimental(column-width, $width,
+ -moz, -webkit, -o, -ms, not -khtml, official
+ );
+}
+
+// Specify how many columns an element should span across.
+//
+// * legal values are 1, all
+@mixin column-span($columns) {
+ @include experimental(column-span, $columns,
+ -moz, -webkit, -o, -ms, not -khtml, official
+ );
}
// Specify the width of the rule between columns e.g. `1px`
@mixin column-rule-width($width) {
- @include experimental(column-rule-width, $width, -moz, -webkit, -o, -ms, not -khtml, official);
+ @include experimental(column-rule-width, $width,
+ -moz, -webkit, -o, -ms, not -khtml, official
+ );
}
// Specify the style of the rule between columns e.g. `dotted`.
// This works like border-style.
@mixin column-rule-style($style) {
- @include experimental(column-rule-style, unquote($style), -moz, -webkit, -o, -ms, not -khtml, official);
+ @include experimental(column-rule-style, unquote($style),
+ -moz, -webkit, -o, -ms, not -khtml, official
+ );
}
// Specify the color of the rule between columns e.g. `blue`.
// This works like border-color.
@mixin column-rule-color($color) {
- @include experimental(column-rule-color, $color, -moz, -webkit, -o, -ms, not -khtml, official);
+ @include experimental(column-rule-color, $color,
+ -moz, -webkit, -o, -ms, not -khtml, official
+ );
}
// Mixin encompassing all column rule properties
@@ -50,75 +73,77 @@
//
// @include column-rule(1px solid #c00)
@mixin column-rule($width, $style: false, $color: false) {
- $full: -compass-space-list(compact($width, $style, $color));
- @include experimental(column-rule, $full, -moz, -webkit, -o, -ms, not -khtml, official);
+ $full : -compass-space-list(compact($width, $style, $color));
+ @include experimental(column-rule, $full,
+ -moz, -webkit, -o, -ms, not -khtml, official
+ );
}
// Mixin for setting column-break-before
//
// * legal values are auto, always, avoid, left, right, page, column, avoid-page, avoid-column
//
-// Example:
+// Example:
// h2.before {@include column-break-before(always);}
//
-// Which generates:
+// Which generates:
//
-// h2.before {
+// h2.before {
// -webkit-column-break-before: always;
// column-break-before: always;}
-@mixin column-break-before($value: auto) {
- @include experimental(column-break-before, $value, not -moz, -webkit, not -o, not -ms, not -khtml, official);
+@mixin column-break-before($value: auto){
+ @include experimental(column-break-before, $value, not -moz, -webkit, not -o, not -ms, not -khtml, official );
}
// Mixin for setting column-break-after
//
// * legal values are auto, always, avoid, left, right, page, column, avoid-page, avoid-column
//
-// Example:
+// Example:
// h2.after {@include column-break-after(always); }
//
-// Which generates:
+// Which generates:
//
// h2.after {
// -webkit-column-break-after: always;
// column-break-after: always; }
-@mixin column-break-after($value: auto) {
- @include experimental(column-break-after, $value, not -moz, -webkit, not -o, not -ms, not -khtml, official);
+@mixin column-break-after($value: auto){
+ @include experimental(column-break-after, $value, not -moz, -webkit, not -o, not -ms, not -khtml, official );
}
// Mixin for setting column-break-inside
//
// * legal values are auto, avoid, avoid-page, avoid-column
//
-// Example:
+// Example:
// h2.inside {@include column-break-inside();}
-// Which generates:
-//
+// Which generates:
+//
// h2.inside {
// -webkit-column-break-inside: auto;
// column-break-inside: auto;}
-@mixin column-break-inside($value: auto) {
- @include experimental(column-break-inside, $value, not -moz, -webkit, not -o, not -ms, not -khtml, official);
+@mixin column-break-inside($value: auto){
+ @include experimental(column-break-inside, $value, not -moz, -webkit, not -o, not -ms, not -khtml, official );
}
// All-purpose mixin for setting column breaks.
//
-// * legal values for $type : before, after, inside
+// * legal values for $type : before, after, inside
// * legal values for '$value' are dependent on $type
// * when $type = before, legal values are auto, always, avoid, left, right, page, column, avoid-page, avoid-column
// * when $type = after, legal values are auto, always, avoid, left, right, page, column, avoid-page, avoid-column
// * when $type = inside, legal values are auto, avoid, avoid-page, avoid-column
-//
-// Examples:
+//
+// Examples:
// h2.before {@include column-break(before, always);}
// h2.after {@include column-break(after, always); }
// h2.inside {@include column-break(inside); }
//
-// Which generates:
-// h2.before {
+// Which generates:
+// h2.before {
// -webkit-column-break-before: always;
// column-break-before: always;}
-//
+//
// h2.after {
// -webkit-column-break-after: always;
// column-break-after: always; }
@@ -126,7 +151,7 @@
// h2.inside {
// -webkit-column-break-inside: auto;
// column-break-inside: auto;}
-
-@mixin column-break($type: before, $value: auto) {
- @include experimental("column-break-#{$type}", $value, not -moz, -webkit, not -o, not -ms, not -khtml, official);
-}
+
+@mixin column-break($type: before, $value: auto){
+ @include experimental("column-break-#{$type}", $value, not -moz, -webkit, not -o, not -ms, not -khtml, official );
+}
\ No newline at end of file
diff --git a/Extensions/Compass/stylesheets/compass/css3/_filter.scss b/Extensions/Compass/stylesheets/compass/css3/_filter.scss
old mode 100755
new mode 100644
index b77584b..cd6eb19
--- a/Extensions/Compass/stylesheets/compass/css3/_filter.scss
+++ b/Extensions/Compass/stylesheets/compass/css3/_filter.scss
@@ -4,12 +4,20 @@
//
// Each filter argument should adhere to the standard css3 syntax for the
// filter property.
-@mixin filter
-
-(
-$filter-1,
-$filter-2: false, $filter-3: false, $filter-4: false, $filter-5: false, $filter-6: false, $filter-7: false, $filter-8: false, $filter-9: false, $filter-10: false)
-{
- $filter: compact($filter-1, $filter-2, $filter-3, $filter-4, $filter-5, $filter-6, $filter-7, $filter-8, $filter-9, $filter-10);
- @include experimental(filter, $filter, -moz, -webkit, not -o, not -ms, not -khtml, official);
+@mixin filter (
+ $filter-1,
+ $filter-2 : false,
+ $filter-3 : false,
+ $filter-4 : false,
+ $filter-5 : false,
+ $filter-6 : false,
+ $filter-7 : false,
+ $filter-8 : false,
+ $filter-9 : false,
+ $filter-10: false
+) {
+ $filter : compact($filter-1, $filter-2, $filter-3, $filter-4, $filter-5, $filter-6, $filter-7, $filter-8, $filter-9, $filter-10);
+ @include experimental(filter, $filter,
+ -moz, -webkit, not -o, not -ms, not -khtml, official
+ );
}
diff --git a/Extensions/Compass/stylesheets/compass/css3/_font-face.scss b/Extensions/Compass/stylesheets/compass/css3/_font-face.scss
old mode 100755
new mode 100644
index 8d41055..f2a0ecd
--- a/Extensions/Compass/stylesheets/compass/css3/_font-face.scss
+++ b/Extensions/Compass/stylesheets/compass/css3/_font-face.scss
@@ -16,24 +16,26 @@
// [font generator](http://www.fontsquirrel.com/fontface/generator)
//
-// In order to refer to a specific style of the font in your stylesheets as
+// In order to refer to a specific style of the font in your stylesheets as
// e.g. "font-style: italic;", you may add a couple of @font-face includes
// containing the respective font files for each style and specying
// respective the $style parameter.
// Order of the includes matters, and it is: normal, bold, italic, bold+italic.
-@mixin font-face($name,
-$font-files,
-$eot: false,
-$weight: false,
-$style: false) {
+@mixin font-face(
+ $name,
+ $font-files,
+ $eot: false,
+ $weight: false,
+ $style: false
+) {
$iefont: unquote("#{$eot}?#iefix");
@font-face {
font-family: quote($name);
@if $eot {
src: font-url($eot);
- $font-files: font-url($iefont) unquote("format('eot')"), $font-files;
+ $font-files: font-url($iefont) unquote("format('embedded-opentype')"), $font-files;
}
src: $font-files;
@if $weight {
diff --git a/Extensions/Compass/stylesheets/compass/css3/_hyphenation.scss b/Extensions/Compass/stylesheets/compass/css3/_hyphenation.scss
old mode 100755
new mode 100644
index 874761c..a4f5808
--- a/Extensions/Compass/stylesheets/compass/css3/_hyphenation.scss
+++ b/Extensions/Compass/stylesheets/compass/css3/_hyphenation.scss
@@ -17,14 +17,21 @@
// word-break: break-all;
// word-break: break-word;}
//
-@mixin word-break($value: normal) {
+@mixin word-break($value: normal){
@if $value == break-all {
- //Most browsers handle the break-all case the same...
- @include experimental(word-break, $value, not -moz, not -webkit, not -o, -ms, not -khtml, official);
- //Webkit handles break-all differently... as break-word
- @include experimental(word-break, break-word, not -moz, not -webkit, not -o, not -ms, not -khtml, official);
- } @else {
- @include experimental(word-break, $value, not -moz, not -webkit, not -o, -ms, not -khtml, official);
+ //Most browsers handle the break-all case the same...
+ @include experimental(word-break, $value,
+ not -moz, not -webkit, not -o, -ms, not -khtml, official
+ );
+ //Webkit handles break-all differently... as break-word
+ @include experimental(word-break, break-word,
+ not -moz, not -webkit, not -o, not -ms, not -khtml, official
+ );
+ }
+ @else {
+ @include experimental(word-break, $value,
+ not -moz, not -webkit, not -o, -ms, not -khtml, official
+ );
}
}
@@ -42,8 +49,10 @@
// -webkit-hyphens: auto;
// hyphens: auto;}
//
-@mixin hyphens($value: auto) {
- @include experimental(hyphens, $value, -moz, -webkit, not -o, not -ms, not -khtml, official);
+@mixin hyphens($value: auto){
+ @include experimental(hyphens, $value,
+ -moz, -webkit, not -o, not -ms, not -khtml, official
+ );
}
// Mixin for x-browser hyphenation based on @auchenberg's post:
@@ -62,7 +71,7 @@
// -webkit-hyphens: auto;
// hyphens: auto;}
//
-@mixin hyphenation {
+@mixin hyphenation{
@include word-break(break-all);
@include hyphens;
}
diff --git a/Extensions/Compass/stylesheets/compass/css3/_images.scss b/Extensions/Compass/stylesheets/compass/css3/_images.scss
old mode 100755
new mode 100644
index 7d796f3..e241776
--- a/Extensions/Compass/stylesheets/compass/css3/_images.scss
+++ b/Extensions/Compass/stylesheets/compass/css3/_images.scss
@@ -2,93 +2,76 @@
@import "compass/utilities/general/hacks";
// Background property support for vendor prefixing within values.
-@mixin background($background-1,
-$background-2: false,
-$background-3: false,
-$background-4: false,
-$background-5: false,
-$background-6: false,
-$background-7: false,
-$background-8: false,
-$background-9: false,
-$background-10: false) {
- $backgrounds: compact($background-1, $background-2, $background-3, $background-4, $background-5, $background-6, $background-7, $background-8, $background-9, $background-10);
+@mixin background(
+ $background-1,
+ $background-2: false,
+ $background-3: false,
+ $background-4: false,
+ $background-5: false,
+ $background-6: false,
+ $background-7: false,
+ $background-8: false,
+ $background-9: false,
+ $background-10: false
+) {
+ $backgrounds: compact($background-1, $background-2, $background-3, $background-4, $background-5,
+ $background-6, $background-7, $background-8, $background-9, $background-10);
$mult-bgs: -compass-list-size($backgrounds) > 1;
$add-pie-bg: prefixed(-pie, $backgrounds) or $mult-bgs;
- @if $experimental-support-for-svg and prefixed(-svg, $backgrounds) {
- background: -svg($backgrounds);
- }
- @if $support-for-original-webkit-gradients and prefixed(-owg, $backgrounds) {
- background: -owg($backgrounds);
- }
- @if $experimental-support-for-webkit and prefixed(-webkit, $backgrounds) {
- background: -webkit($backgrounds);
- }
- @if $experimental-support-for-mozilla and prefixed(-moz, $backgrounds) {
- background: -moz($backgrounds);
- }
- @if $experimental-support-for-opera and prefixed(-o, $backgrounds) {
- background: -o($backgrounds);
- }
- @if $experimental-support-for-pie and $add-pie-bg {
- -pie-background: -pie($backgrounds);
- }
- background: $backgrounds;
+ @if $experimental-support-for-svg and prefixed(-svg, $backgrounds) { background: -svg($backgrounds); }
+ @if $support-for-original-webkit-gradients and prefixed(-owg, $backgrounds) { background: -owg($backgrounds); }
+ @if $experimental-support-for-webkit and prefixed(-webkit, $backgrounds) { background: -webkit($backgrounds); }
+ @if $experimental-support-for-mozilla and prefixed(-moz, $backgrounds) { background: -moz($backgrounds); }
+ @if $experimental-support-for-opera and prefixed(-o, $backgrounds) { background: -o($backgrounds); }
+ @if $experimental-support-for-pie and $add-pie-bg { -pie-background: -pie($backgrounds); }
+ background: $backgrounds ;
}
-@mixin background-with-css2-fallback($background-1,
-$background-2: false,
-$background-3: false,
-$background-4: false,
-$background-5: false,
-$background-6: false,
-$background-7: false,
-$background-8: false,
-$background-9: false,
-$background-10: false) {
- $backgrounds: compact($background-1, $background-2, $background-3, $background-4, $background-5, $background-6, $background-7, $background-8, $background-9, $background-10);
+@mixin background-with-css2-fallback(
+ $background-1,
+ $background-2: false,
+ $background-3: false,
+ $background-4: false,
+ $background-5: false,
+ $background-6: false,
+ $background-7: false,
+ $background-8: false,
+ $background-9: false,
+ $background-10: false
+) {
+ $backgrounds: compact($background-1, $background-2, $background-3, $background-4, $background-5,
+ $background-6, $background-7, $background-8, $background-9, $background-10);
$mult-bgs: -compass-list-size($backgrounds) > 1;
$simple-background: if($mult-bgs or prefixed(-css2, $backgrounds), -css2(-compass-nth($backgrounds, last)), false);
- @if not blank($simple-background) {
- background: $simple-background;
- }
- @include background($background-1, $background-2, $background-3, $background-4, $background-5, $background-6, $background-7, $background-8, $background-9, $background-10);
+ @if not blank($simple-background) { background: $simple-background; }
+ @include background($background-1, $background-2, $background-3, $background-4, $background-5,
+ $background-6, $background-7, $background-8, $background-9, $background-10);
}
+
// Background image property support for vendor prefixing within values.
-@mixin background-image($image-1,
-$image-2: false,
-$image-3: false,
-$image-4: false,
-$image-5: false,
-$image-6: false,
-$image-7: false,
-$image-8: false,
-$image-9: false,
-$image-10: false) {
+@mixin background-image(
+ $image-1,
+ $image-2: false,
+ $image-3: false,
+ $image-4: false,
+ $image-5: false,
+ $image-6: false,
+ $image-7: false,
+ $image-8: false,
+ $image-9: false,
+ $image-10: false
+) {
$images: compact($image-1, $image-2, $image-3, $image-4, $image-5, $image-6, $image-7, $image-8, $image-9, $image-10);
$add-pie-bg: prefixed(-pie, $images) or -compass-list-size($images) > 1;
- @if $experimental-support-for-svg and prefixed(-svg, $images) {
- background-image: -svg($images);
- background-size: 100%;
- }
- @if $support-for-original-webkit-gradients and prefixed(-owg, $images) {
- background-image: -owg($images);
- }
- @if $experimental-support-for-webkit and prefixed(-webkit, $images) {
- background-image: -webkit($images);
- }
- @if $experimental-support-for-mozilla and prefixed(-moz, $images) {
- background-image: -moz($images);
- }
- @if $experimental-support-for-opera and prefixed(-o, $images) {
- background-image: -o($images);
- }
- @if $experimental-support-for-pie and $add-pie-bg {
- @warn "PIE does not support background-image. Use @include background(#{$images}) instead."
- }
- background-image: $images;
+ @if $experimental-support-for-svg and prefixed(-svg, $images) { background-image: -svg($images); background-size: 100%; }
+ @if $support-for-original-webkit-gradients and prefixed(-owg, $images) { background-image: -owg($images); }
+ @if $experimental-support-for-webkit and prefixed(-webkit, $images) { background-image: -webkit($images); }
+ @if $experimental-support-for-mozilla and prefixed(-moz, $images) { background-image: -moz($images); }
+ @if $experimental-support-for-opera and prefixed(-o, $images) { background-image: -o($images); }
+ @if $experimental-support-for-pie and $add-pie-bg { @warn "PIE does not support background-image. Use @include background(#{$images}) instead." }
+ background-image: $images ;
}
// Emit a IE-Specific filters that renders a simple linear gradient.
@@ -101,89 +84,49 @@ $image-10: false) {
@include has-layout;
$gradient-type: if($orientation == vertical, 0, 1);
@if $legacy-support-for-ie6 or $legacy-support-for-ie7 or $legacy-support-for-ie8 {
- filter: progid:DXImageTransform.Microsoft.gradient
- (gradientType =#{$gradient-type}, startColorstr = '#{ie-hex-str($start-color)}', endColorstr = '#{ie-hex-str($end-color)}');
+ filter: progid:DXImageTransform.Microsoft.gradient(gradientType=#{$gradient-type}, startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}');
}
}
+
// Border image property support for vendor prefixing properties and values.
@mixin border-image($value) {
- @if $experimental-support-for-mozilla {
- -moz-border-image: -moz(reject(-compass-list($value), fill));
- }
- @if $support-for-original-webkit-gradients {
- -webkit-border-image: -owg(reject(-compass-list($value), fill));
- }
- @if $experimental-support-for-webkit {
- -webkit-border-image: -webkit(reject(-compass-list($value), fill));
- }
- @if $experimental-support-for-opera {
- -o-border-image: -o(reject(-compass-list($value), fill));
- }
- @if $experimental-support-for-svg {
- border-image: -svg(reject(-compass-list($value), fill));
- }
- border-image: $value;
+ @if $experimental-support-for-mozilla { -moz-border-image: -moz(reject(-compass-list($value), fill)); }
+ @if $support-for-original-webkit-gradients { -webkit-border-image: -owg(reject(-compass-list($value), fill)); }
+ @if $experimental-support-for-webkit { -webkit-border-image: -webkit(reject(-compass-list($value), fill)); }
+ @if $experimental-support-for-opera { -o-border-image: -o(reject(-compass-list($value), fill)); }
+ @if $experimental-support-for-svg { border-image: -svg(reject(-compass-list($value), fill)); }
+ border-image: $value;
}
// List style image property support for vendor prefixing within values.
@mixin list-style-image($image) {
- @if $experimental-support-for-mozilla and prefixed(-moz, $image) {
- list-style-image: -moz($image);
- }
- @if $support-for-original-webkit-gradients and prefixed(-owg, $image) {
- list-style-image: -owg($image);
- }
- @if $experimental-support-for-webkit and prefixed(-webkit, $image) {
- list-style-image: -webkit($image);
- }
- @if $experimental-support-for-opera and prefixed(-o, $image) {
- list-style-image: -o($image);
- }
- @if $experimental-support-for-svg and prefixed(-svg, $image) {
- list-style-image: -svg($image);
- }
- list-style-image: $image;
+ @if $experimental-support-for-mozilla and prefixed(-moz, $image) { list-style-image: -moz($image); }
+ @if $support-for-original-webkit-gradients and prefixed(-owg, $image) { list-style-image: -owg($image); }
+ @if $experimental-support-for-webkit and prefixed(-webkit, $image) { list-style-image: -webkit($image); }
+ @if $experimental-support-for-opera and prefixed(-o, $image) { list-style-image: -o($image); }
+ @if $experimental-support-for-svg and prefixed(-svg, $image) { list-style-image: -svg($image); }
+ list-style-image: $image ;
}
// List style property support for vendor prefixing within values.
@mixin list-style($value) {
$value: -compass-list($value);
- @if $experimental-support-for-mozilla and prefixed(-moz, $value) {
- list-style-image: -moz($value);
- }
- @if $support-for-original-webkit-gradients and prefixed(-owg, $value) {
- list-style-image: -owg($value);
- }
- @if $experimental-support-for-webkit and prefixed(-webkit, $value) {
- list-style-image: -webkit($value);
- }
- @if $experimental-support-for-opera and prefixed(-o, $value) {
- list-style-image: -o($value);
- }
- @if $experimental-support-for-svg and prefixed(-svg, $value) {
- list-style-image: -svg($value);
- }
- list-style-image: $value;
+ @if $experimental-support-for-mozilla and prefixed(-moz, $value) { list-style-image: -moz($value); }
+ @if $support-for-original-webkit-gradients and prefixed(-owg, $value) { list-style-image: -owg($value); }
+ @if $experimental-support-for-webkit and prefixed(-webkit, $value) { list-style-image: -webkit($value); }
+ @if $experimental-support-for-opera and prefixed(-o, $value) { list-style-image: -o($value); }
+ @if $experimental-support-for-svg and prefixed(-svg, $value) { list-style-image: -svg($value); }
+ list-style-image: $value ;
}
// content property support for vendor prefixing within values.
@mixin content($value) {
$value: -compass-list($value);
- @if $experimental-support-for-mozilla and prefixed(-moz, $value) {
- content: -moz($value);
- }
- @if $support-for-original-webkit-gradients and prefixed(-owg, $value) {
- content: -owg($value);
- }
- @if $experimental-support-for-webkit and prefixed(-webkit, $value) {
- content: -webkit($value);
- }
- @if $experimental-support-for-opera and prefixed(-o, $value) {
- content: -o($value);
- }
- @if $experimental-support-for-svg and prefixed(-svg, $value) {
- content: -svg($value);
- }
- content: $value;
+ @if $experimental-support-for-mozilla and prefixed(-moz, $value) { content: -moz($value); }
+ @if $support-for-original-webkit-gradients and prefixed(-owg, $value) { content: -owg($value); }
+ @if $experimental-support-for-webkit and prefixed(-webkit, $value) { content: -webkit($value); }
+ @if $experimental-support-for-opera and prefixed(-o, $value) { content: -o($value); }
+ @if $experimental-support-for-svg and prefixed(-svg, $value) { content: -svg($value); }
+ content: $value ;
}
diff --git a/Extensions/Compass/stylesheets/compass/css3/_inline-block.scss b/Extensions/Compass/stylesheets/compass/css3/_inline-block.scss
old mode 100755
new mode 100644
diff --git a/Extensions/Compass/stylesheets/compass/css3/_opacity.scss b/Extensions/Compass/stylesheets/compass/css3/_opacity.scss
old mode 100755
new mode 100644
index 15d17ec..fc497ff
--- a/Extensions/Compass/stylesheets/compass/css3/_opacity.scss
+++ b/Extensions/Compass/stylesheets/compass/css3/_opacity.scss
@@ -13,11 +13,7 @@
}
// Make an element completely transparent.
-@mixin transparent {
- @include opacity(0);
-}
+@mixin transparent { @include opacity(0); }
// Make an element completely opaque.
-@mixin opaque {
- @include opacity(1);
-}
+@mixin opaque { @include opacity(1); }
diff --git a/Extensions/Compass/stylesheets/compass/css3/_pie.scss b/Extensions/Compass/stylesheets/compass/css3/_pie.scss
old mode 100755
new mode 100644
index 48783bf..81e2e51
--- a/Extensions/Compass/stylesheets/compass/css3/_pie.scss
+++ b/Extensions/Compass/stylesheets/compass/css3/_pie.scss
@@ -42,12 +42,15 @@ $pie-behavior: stylesheet-url("PIE.htc") !default;
// * `$approach` - one of: relative, z-index, or none
// * `$z-index` - when using the z-index approach, this
// is the z-index that is applied.
-@mixin pie-element($approach: $pie-default-approach,
-$z-index: 0) {
+@mixin pie-element(
+ $approach: $pie-default-approach,
+ $z-index: 0
+) {
behavior: $pie-behavior;
@if $approach == relative {
position: relative;
- } @else if $approach == z-index {
+ }
+ @else if $approach == z-index {
z-index: $z-index;
}
}
@@ -57,7 +60,8 @@ $z-index: 0) {
@mixin pie($base-class: $pie-base-class) {
@if $base-class {
@extend .#{$base-class};
- } @else {
+ }
+ @else {
@include pie-element;
}
}
diff --git a/Extensions/Compass/stylesheets/compass/css3/_regions.scss b/Extensions/Compass/stylesheets/compass/css3/_regions.scss
old mode 100755
new mode 100644
index 6e4f2aa..9b2f27c
--- a/Extensions/Compass/stylesheets/compass/css3/_regions.scss
+++ b/Extensions/Compass/stylesheets/compass/css3/_regions.scss
@@ -9,10 +9,14 @@
@mixin flow-into($target) {
$target: unquote($target);
- @include experimental(flow-into, $target, not -moz, -webkit, not -o, -ms, not -khtml, not official);
+ @include experimental(flow-into, $target,
+ not -moz, -webkit, not -o, -ms, not -khtml, not official
+ );
}
@mixin flow-from($target) {
$target: unquote($target);
- @include experimental(flow-from, $target, not -moz, -webkit, not -o, -ms, not -khtml, not official);
+ @include experimental(flow-from, $target,
+ not -moz, -webkit, not -o, -ms, not -khtml, not official
+ );
}
\ No newline at end of file
diff --git a/Extensions/Compass/stylesheets/compass/css3/_shared.scss b/Extensions/Compass/stylesheets/compass/css3/_shared.scss
old mode 100755
new mode 100644
index b62f7ab..1f55cb5
--- a/Extensions/Compass/stylesheets/compass/css3/_shared.scss
+++ b/Extensions/Compass/stylesheets/compass/css3/_shared.scss
@@ -5,56 +5,34 @@
// the implementations are identical except for the property
// prefix.
@mixin experimental($property, $value,
-$moz: $experimental-support-for-mozilla,
-$webkit: $experimental-support-for-webkit,
-$o: $experimental-support-for-opera,
-$ms: $experimental-support-for-microsoft,
-$khtml: $experimental-support-for-khtml,
-$official: true) {
- @if $webkit and $experimental-support-for-webkit {
- -webkit-#{$property} : $value;
- }
- @if $khtml and $experimental-support-for-khtml {
- -khtml-#{$property} : $value;
- }
- @if $moz and $experimental-support-for-mozilla {
- -moz-#{$property} : $value;
- }
- @if $ms and $experimental-support-for-microsoft {
- -ms-#{$property} : $value;
- }
- @if $o and $experimental-support-for-opera {
- -o-#{$property} : $value;
- }
- @if $official {
- #{$property} : $value;
- }
+ $moz : $experimental-support-for-mozilla,
+ $webkit : $experimental-support-for-webkit,
+ $o : $experimental-support-for-opera,
+ $ms : $experimental-support-for-microsoft,
+ $khtml : $experimental-support-for-khtml,
+ $official : true
+) {
+ @if $webkit and $experimental-support-for-webkit { -webkit-#{$property} : $value; }
+ @if $khtml and $experimental-support-for-khtml { -khtml-#{$property} : $value; }
+ @if $moz and $experimental-support-for-mozilla { -moz-#{$property} : $value; }
+ @if $ms and $experimental-support-for-microsoft { -ms-#{$property} : $value; }
+ @if $o and $experimental-support-for-opera { -o-#{$property} : $value; }
+ @if $official { #{$property} : $value; }
}
// Same as experimental(), but for cases when the property is the same and the value is vendorized
@mixin experimental-value($property, $value,
-$moz: $experimental-support-for-mozilla,
-$webkit: $experimental-support-for-webkit,
-$o: $experimental-support-for-opera,
-$ms: $experimental-support-for-microsoft,
-$khtml: $experimental-support-for-khtml,
-$official: true) {
- @if $webkit and $experimental-support-for-webkit {
- #{$property} : -webkit-#{$value};
- }
- @if $khtml and $experimental-support-for-khtml {
- #{$property} : -khtml-#{$value};
- }
- @if $moz and $experimental-support-for-mozilla {
- #{$property} : -moz-#{$value};
- }
- @if $ms and $experimental-support-for-microsoft {
- #{$property} : -ms-#{$value};
- }
- @if $o and $experimental-support-for-opera {
- #{$property} : -o-#{$value};
- }
- @if $official {
- #{$property} : #{$value};
- }
+ $moz : $experimental-support-for-mozilla,
+ $webkit : $experimental-support-for-webkit,
+ $o : $experimental-support-for-opera,
+ $ms : $experimental-support-for-microsoft,
+ $khtml : $experimental-support-for-khtml,
+ $official : true
+) {
+ @if $webkit and $experimental-support-for-webkit { #{$property} : -webkit-#{$value}; }
+ @if $khtml and $experimental-support-for-khtml { #{$property} : -khtml-#{$value}; }
+ @if $moz and $experimental-support-for-mozilla { #{$property} : -moz-#{$value}; }
+ @if $ms and $experimental-support-for-microsoft { #{$property} : -ms-#{$value}; }
+ @if $o and $experimental-support-for-opera { #{$property} : -o-#{$value}; }
+ @if $official { #{$property} : #{$value}; }
}
diff --git a/Extensions/Compass/stylesheets/compass/css3/_text-shadow.scss b/Extensions/Compass/stylesheets/compass/css3/_text-shadow.scss
old mode 100755
new mode 100644
index 75a15b6..eab7636
--- a/Extensions/Compass/stylesheets/compass/css3/_text-shadow.scss
+++ b/Extensions/Compass/stylesheets/compass/css3/_text-shadow.scss
@@ -3,11 +3,11 @@
// These defaults make the arguments optional for this mixin
// If you like, set different defaults in your project
-$default-text-shadow-color: #aaa !default;
-$default-text-shadow-h-offset: 0px !default;
-$default-text-shadow-v-offset: 0px !default;
-$default-text-shadow-blur: 1px !default;
-$default-text-shadow-spread: false !default;
+$default-text-shadow-color: #aaa !default;
+$default-text-shadow-h-offset: 0px !default;
+$default-text-shadow-v-offset: 0px !default;
+$default-text-shadow-blur: 1px !default;
+$default-text-shadow-spread: false !default;
// Provides cross-browser text shadows when one or more shadows are needed.
// Each shadow argument should adhere to the standard css3 syntax for the
@@ -17,29 +17,31 @@ $default-text-shadow-spread: false !default;
// to emit the shadow declaration twice, first without the spread,
// then with the spread included. This allows you to progressively
// enhance the browsers that do support the spread parameter.
-@mixin text-shadow($shadow-1: default,
-$shadow-2: false,
-$shadow-3: false,
-$shadow-4: false,
-$shadow-5: false,
-$shadow-6: false,
-$shadow-7: false,
-$shadow-8: false,
-$shadow-9: false,
-$shadow-10: false) {
+@mixin text-shadow(
+ $shadow-1 : default,
+ $shadow-2 : false,
+ $shadow-3 : false,
+ $shadow-4 : false,
+ $shadow-5 : false,
+ $shadow-6 : false,
+ $shadow-7 : false,
+ $shadow-8 : false,
+ $shadow-9 : false,
+ $shadow-10: false
+) {
@if $shadow-1 == default {
$shadow-1: compact($default-text-shadow-h-offset $default-text-shadow-v-offset $default-text-shadow-blur $default-text-shadow-spread $default-text-shadow-color);
}
- $shadows-without-spread: join((),(), comma);
- $shadows: join((),(), comma);
+ $shadows-without-spread: join((),(),comma);
+ $shadows: join((),(),comma);
$has-spread: false;
- @each $shadow in compact($shadow-1, $shadow-2, $shadow-3, $shadow-4, $shadow-5, $shadow-6, $shadow-7, $shadow-8, $shadow-9, $shadow-10) {
+ @each $shadow in compact($shadow-1, $shadow-2, $shadow-3, $shadow-4, $shadow-5,
+ $shadow-6, $shadow-7, $shadow-8, $shadow-9, $shadow-10) {
@if length($shadow) > 4 {
$has-spread: true;
- $shadows-without-spread: append($shadows-without-spread, nth($shadow, 1) nth($shadow, 2) nth($shadow, 3) nth($shadow, 5));
+ $shadows-without-spread: append($shadows-without-spread, nth($shadow,1) nth($shadow,2) nth($shadow,3) nth($shadow,5));
$shadows: append($shadows, $shadow);
- }
- else {
+ } else {
$shadows-without-spread: append($shadows-without-spread, $shadow);
$shadows: append($shadows, $shadow);
}
@@ -54,12 +56,14 @@ $shadow-10: false) {
//
// Provides sensible defaults for the color, horizontal offset, vertical offset, blur, and spread
// according to the configuration defaults above.
-@mixin single-text-shadow($hoff: false,
-$voff: false,
-$blur: false,
-$spread: false,
-$color: false) {
-// A lot of people think the color comes first. It doesn't.
+@mixin single-text-shadow(
+ $hoff: false,
+ $voff: false,
+ $blur: false,
+ $spread: false,
+ $color: false
+) {
+ // A lot of people think the color comes first. It doesn't.
@if type-of($hoff) == color {
$temp-color: $hoff;
$hoff: $voff;
@@ -68,13 +72,13 @@ $color: false) {
$spread: $color;
$color: $temp-color;
}
-// Can't rely on default assignment with multiple supported argument orders.
- $hoff: if($hoff, $hoff, $default-text-shadow-h-offset);
- $voff: if($voff, $voff, $default-text-shadow-v-offset);
- $blur: if($blur, $blur, $default-text-shadow-blur);
- $spread: if($spread, $spread, $default-text-shadow-spread);
- $color: if($color, $color, $default-text-shadow-color);
-// We don't need experimental support for this property.
+ // Can't rely on default assignment with multiple supported argument orders.
+ $hoff: if($hoff, $hoff, $default-text-shadow-h-offset);
+ $voff: if($voff, $voff, $default-text-shadow-v-offset);
+ $blur: if($blur, $blur, $default-text-shadow-blur );
+ $spread: if($spread, $spread, $default-text-shadow-spread );
+ $color: if($color, $color, $default-text-shadow-color );
+ // We don't need experimental support for this property.
@if $color == none or $hoff == none {
@include text-shadow(none);
} @else {
diff --git a/Extensions/Compass/stylesheets/compass/css3/_transform-legacy.scss b/Extensions/Compass/stylesheets/compass/css3/_transform-legacy.scss
old mode 100755
new mode 100644
index c68416e..ac661da
--- a/Extensions/Compass/stylesheets/compass/css3/_transform-legacy.scss
+++ b/Extensions/Compass/stylesheets/compass/css3/_transform-legacy.scss
@@ -7,13 +7,17 @@
// Apply a transform sent as a complete string.
@mixin apply-transform($transform) {
- @include experimental(transform, $transform, -moz, -webkit, -o, not -ms, not -khtml, official);
+ @include experimental(transform, $transform,
+ -moz, -webkit, -o, not -ms, not -khtml, official
+ );
}
// Apply a transform-origin sent as a complete string.
@mixin apply-origin($origin) {
- @include experimental(transform-origin, $origin, -moz, -webkit, -o, not -ms, not -khtml, official);
+ @include experimental(transform-origin, $origin,
+ -moz, -webkit, -o, not -ms, not -khtml, official
+ );
}
// transform-origin requires x and y coordinates
@@ -23,12 +27,12 @@
@mixin transform-origin($originx: 50%, $originy: 50%) {
@if $originx or $originy {
@if $originy {
- @include apply-origin($originx or 50% $originy);
- } @else {
- @include apply-origin($originx);
- }
+ @include apply-origin($originx or 50% $originy);
+ } @else {
+ @include apply-origin($originx);
+ }
}
-}
+}
// A full transform mixin with everything you could want
//
@@ -36,15 +40,17 @@
// * scale, rotate and skew require units of degrees(deg)
// * scale takes a multiplier, rotate and skew take degrees
-@mixin transform($scale: 1,
-$rotate: 0deg,
-$transx: 0,
-$transy: 0,
-$skewx: 0deg,
-$skewy: 0deg,
-$originx: false,
-$originy: false) {
- $transform: scale($scale) rotate($rotate) translate($transx, $transy) skew($skewx, $skewy);
+@mixin transform(
+ $scale: 1,
+ $rotate: 0deg,
+ $transx: 0,
+ $transy: 0,
+ $skewx: 0deg,
+ $skewy: 0deg,
+ $originx: false,
+ $originy: false
+) {
+ $transform : scale($scale) rotate($rotate) translate($transx, $transy) skew($skewx, $skewy);
@include apply-transform($transform);
@include transform-origin($originx, $originy);
}
diff --git a/Extensions/Compass/stylesheets/compass/css3/_transform.scss b/Extensions/Compass/stylesheets/compass/css3/_transform.scss
old mode 100755
new mode 100644
index 22179ec..ecd50b7
--- a/Extensions/Compass/stylesheets/compass/css3/_transform.scss
+++ b/Extensions/Compass/stylesheets/compass/css3/_transform.scss
@@ -48,40 +48,46 @@
// @doc on
// The default x-origin for transforms
-$default-origin-x: 50% !default;
+$default-origin-x : 50% !default;
// The default y-origin for transforms
-$default-origin-y: 50% !default;
+$default-origin-y : 50% !default;
// The default z-origin for transforms
-$default-origin-z: 50% !default;
+$default-origin-z : 50% !default;
+
// The default x-multiplier for scaling
-$default-scale-x: 1.25 !default;
+$default-scale-x : 1.25 !default;
// The default y-multiplier for scaling
-$default-scale-y: $default-scale-x !default;
+$default-scale-y : $default-scale-x !default;
// The default z-multiplier for scaling
-$default-scale-z: $default-scale-x !default;
+$default-scale-z : $default-scale-x !default;
+
// The default angle for rotations
-$default-rotate: 45deg !default;
+$default-rotate : 45deg !default;
+
// The default x-vector for the axis of 3d rotations
-$default-vector-x: 1 !default;
+$default-vector-x : 1 !default;
// The default y-vector for the axis of 3d rotations
-$default-vector-y: 1 !default;
+$default-vector-y : 1 !default;
// The default z-vector for the axis of 3d rotations
-$default-vector-z: 1 !default;
+$default-vector-z : 1 !default;
+
// The default x-length for translations
-$default-translate-x: 1em !default;
+$default-translate-x : 1em !default;
// The default y-length for translations
-$default-translate-y: $default-translate-x !default;
+$default-translate-y : $default-translate-x !default;
// The default z-length for translations
-$default-translate-z: $default-translate-x !default;
+$default-translate-z : $default-translate-x !default;
+
// The default x-angle for skewing
-$default-skew-x: 5deg !default;
+$default-skew-x : 5deg !default;
// The default y-angle for skewing
-$default-skew-y: 5deg !default;
+$default-skew-y : 5deg !default;
+
// **Transform-origin**
// Transform-origin sent as a complete string
@@ -97,9 +103,13 @@ $default-skew-y: 5deg !default;
@mixin apply-origin($origin, $only3d) {
$only3d: $only3d or -compass-list-size(-compass-list($origin)) > 2;
@if $only3d {
- @include experimental(transform-origin, $origin, -moz, -webkit, -o, -ms, not -khtml, official);
+ @include experimental(transform-origin, $origin,
+ -moz, -webkit, -o, -ms, not -khtml, official
+ );
} @else {
- @include experimental(transform-origin, $origin, -moz, -webkit, -o, -ms, not -khtml, official);
+ @include experimental(transform-origin, $origin,
+ -moz, -webkit, -o, -ms, not -khtml, official
+ );
}
}
@@ -110,42 +120,39 @@ $default-skew-y: 5deg !default;
// where the 3 'origin-' arguments represent x/y/z coordinates.
//
// **NOTE:** setting z coordinates triggers 3D support list, leave false for 2D support
-@mixin transform-origin($origin-x: $default-origin-x,
-$origin-y: $default-origin-y,
-$origin-z: false,
-$only3d: if($origin-z, true, false)) {
+@mixin transform-origin(
+ $origin-x: $default-origin-x,
+ $origin-y: $default-origin-y,
+ $origin-z: false,
+ $only3d: if($origin-z, true, false)
+) {
$origin: unquote('');
@if $origin-x or $origin-y or $origin-z {
- @if $origin-x {
- $origin: $origin-x;
- } @else {
- $origin: 50%;
- }
- @if $origin-y {
- $origin: $origin $origin-y;
- } @else {
- @if $origin-z {
- $origin: $origin 50%;
- }
- }
- @if $origin-z {
- $origin: $origin $origin-z;
- }
+ @if $origin-x { $origin: $origin-x; } @else { $origin: 50%; }
+ @if $origin-y { $origin: $origin $origin-y; } @else { @if $origin-z { $origin: $origin 50%; }}
+ @if $origin-z { $origin: $origin $origin-z; }
@include apply-origin($origin, $only3d);
}
}
+
// Transform sent as a complete string:
//
// @include transform( transforms [, 3D-only ] )
//
// where 'transforms' is a space separated list of all the transforms to be applied.
-@mixin transform($transform,
-$only3d: false) {
+@mixin transform(
+ $transform,
+ $only3d: false
+) {
@if $only3d {
- @include experimental(transform, $transform, -moz, -webkit, -o, -ms, not -khtml, official);
+ @include experimental(transform, $transform,
+ -moz, -webkit, -o, -ms, not -khtml, official
+ );
} @else {
- @include experimental(transform, $transform, -moz, -webkit, -o, -ms, not -khtml, official);
+ @include experimental(transform, $transform,
+ -moz, -webkit, -o, -ms, not -khtml, official
+ );
}
}
@@ -171,7 +178,9 @@ $only3d: false) {
// z-axis. The higher the perspective, the more exaggerated the foreshortening.
// values from 500 to 1000 are more-or-less "normal" - a good starting-point.
@mixin perspective($p) {
- @include experimental(perspective, $p, -moz, -webkit, -o, -ms, not -khtml, official);
+ @include experimental(perspective, $p,
+ -moz, -webkit, -o, -ms, not -khtml, official
+ );
}
// Set the origin position for the perspective
@@ -180,7 +189,9 @@ $only3d: false) {
//
// where the two arguments represent x/y coordinates
@mixin perspective-origin($origin: 50%) {
- @include experimental(perspective-origin, $origin, -moz, -webkit, -o, -ms, not -khtml, official);
+ @include experimental(perspective-origin, $origin,
+ -moz, -webkit, -o, -ms, not -khtml, official
+ );
}
// Determine whether a 3D objects children also live in the given 3D space
@@ -190,7 +201,9 @@ $only3d: false) {
// where `style` can be either `flat` or `preserve-3d`.
// Browsers default to `flat`, mixin defaults to `preserve-3d`.
@mixin transform-style($style: preserve-3d) {
- @include experimental(transform-style, $style, -moz, -webkit, -o, -ms, not -khtml, official);
+ @include experimental(transform-style, $style,
+ -moz, -webkit, -o, -ms, not -khtml, official
+ );
}
// Determine the visibility of an element when it's back is turned
@@ -200,7 +213,9 @@ $only3d: false) {
// where `visibility` can be either `visible` or `hidden`.
// Browsers default to visible, mixin defaults to hidden
@mixin backface-visibility($visibility: hidden) {
- @include experimental(backface-visibility, $visibility, -moz, -webkit, -o, -ms, not -khtml, official);
+ @include experimental(backface-visibility, $visibility,
+ -moz, -webkit, -o, -ms, not -khtml, official
+ );
}
// @doc off
@@ -209,6 +224,7 @@ $only3d: false) {
// Use along with transform parameter mixins to adjust origin, perspective and style
// ---------------------------------------------------------------------------
+
// Scale ---------------------------------------------------------------------
// @doc on
@@ -221,14 +237,14 @@ $only3d: false) {
// but applies to the individual element (multiplied with any parent perspective)
//
// **Note** This mixin cannot be combined with other transform mixins.
-@mixin scale($scale-x: $default-scale-x,
-$scale-y: $scale-x,
-$perspective: false,
-$only3d: false) {
+@mixin scale(
+ $scale-x: $default-scale-x,
+ $scale-y: $scale-x,
+ $perspective: false,
+ $only3d: false
+) {
$trans: scale($scale-x, $scale-y);
- @if $perspective {
- $trans: perspective($perspective) $trans;
- }
+ @if $perspective { $trans: perspective($perspective) $trans; }
@include transform($trans, $only3d);
}
@@ -236,13 +252,13 @@ $only3d: false) {
// @include scaleX( [ scale-x, perspective, 3D-only ] )
//
// **Note** This mixin cannot be combined with other transform mixins.
-@mixin scaleX($scale: $default-scale-x,
-$perspective: false,
-$only3d: false) {
+@mixin scaleX(
+ $scale: $default-scale-x,
+ $perspective: false,
+ $only3d: false
+) {
$trans: scaleX($scale);
- @if $perspective {
- $trans: perspective($perspective) $trans;
- }
+ @if $perspective { $trans: perspective($perspective) $trans; }
@include transform($trans, $only3d);
}
@@ -250,13 +266,13 @@ $only3d: false) {
// @include scaleY( [ scale-y, perspective, 3D-only ] )
//
// **Note** This mixin cannot be combined with other transform mixins.
-@mixin scaleY($scale: $default-scale-y,
-$perspective: false,
-$only3d: false) {
+@mixin scaleY(
+ $scale: $default-scale-y,
+ $perspective: false,
+ $only3d: false
+) {
$trans: scaleY($scale);
- @if $perspective {
- $trans: perspective($perspective) $trans;
- }
+ @if $perspective { $trans: perspective($perspective) $trans; }
@include transform($trans, $only3d);
}
@@ -264,12 +280,12 @@ $only3d: false) {
// @include scaleZ( [ scale-z, perspective ] )
//
// **Note** This mixin cannot be combined with other transform mixins.
-@mixin scaleZ($scale: $default-scale-z,
-$perspective: false) {
+@mixin scaleZ(
+ $scale: $default-scale-z,
+ $perspective: false
+) {
$trans: scaleZ($scale);
- @if $perspective {
- $trans: perspective($perspective) $trans;
- }
+ @if $perspective { $trans: perspective($perspective) $trans; }
@include transform3d($trans);
}
@@ -277,14 +293,14 @@ $perspective: false) {
// @include scale3d( [ scale-x, scale-y, scale-z, perspective ] )
//
// **Note** This mixin cannot be combined with other transform mixins.
-@mixin scale3d($scale-x: $default-scale-x,
-$scale-y: $default-scale-y,
-$scale-z: $default-scale-z,
-$perspective: false) {
+@mixin scale3d(
+ $scale-x: $default-scale-x,
+ $scale-y: $default-scale-y,
+ $scale-z: $default-scale-z,
+ $perspective: false
+) {
$trans: scale3d($scale-x, $scale-y, $scale-z);
- @if $perspective {
- $trans: perspective($perspective) $trans;
- }
+ @if $perspective { $trans: perspective($perspective) $trans; }
@include transform3d($trans);
}
@@ -297,22 +313,24 @@ $perspective: false) {
// where 'rotation' is an angle set in degrees (deg) or radian (rad) units
//
// **Note** This mixin cannot be combined with other transform mixins.
-@mixin rotate($rotate: $default-rotate,
-$perspective: false,
-$only3d: false) {
+@mixin rotate(
+ $rotate: $default-rotate,
+ $perspective: false,
+ $only3d: false
+) {
$trans: rotate($rotate);
- @if $perspective {
- $trans: perspective($perspective) $trans;
- }
+ @if $perspective { $trans: perspective($perspective) $trans; }
@include transform($trans, $only3d);
}
// A longcut for 'rotate' in case you forget that 'z' is implied
//
// **Note** This mixin cannot be combined with other transform mixins.
-@mixin rotateZ($rotate: $default-rotate,
-$perspective: false,
-$only3d: false) {
+@mixin rotateZ(
+ $rotate: $default-rotate,
+ $perspective: false,
+ $only3d: false
+) {
@include rotate($rotate, $perspective, $only3d);
}
@@ -320,12 +338,12 @@ $only3d: false) {
// @include rotateX( [ rotation, perspective ] )
//
// **Note** This mixin cannot be combined with other transform mixins.
-@mixin rotateX($rotate: $default-rotate,
-$perspective: false) {
+@mixin rotateX(
+ $rotate: $default-rotate,
+ $perspective: false
+) {
$trans: rotateX($rotate);
- @if $perspective {
- $trans: perspective($perspective) $trans;
- }
+ @if $perspective { $trans: perspective($perspective) $trans; }
@include transform3d($trans);
}
@@ -333,12 +351,12 @@ $perspective: false) {
// @include rotate( [ rotation, perspective ] )
//
// **Note** This mixin cannot be combined with other transform mixins.
-@mixin rotateY($rotate: $default-rotate,
-$perspective: false) {
+@mixin rotateY(
+ $rotate: $default-rotate,
+ $perspective: false
+) {
$trans: rotateY($rotate);
- @if $perspective {
- $trans: perspective($perspective) $trans;
- }
+ @if $perspective { $trans: perspective($perspective) $trans; }
@include transform3d($trans);
}
@@ -349,15 +367,15 @@ $perspective: false) {
// creating an axis from your transform-origin, along the axis of Xx = Yy = Zz.
//
// **Note** This mixin cannot be combined with other transform mixins.
-@mixin rotate3d($vector-x: $default-vector-x,
-$vector-y: $default-vector-y,
-$vector-z: $default-vector-z,
-$rotate: $default-rotate,
-$perspective: false) {
+@mixin rotate3d(
+ $vector-x: $default-vector-x,
+ $vector-y: $default-vector-y,
+ $vector-z: $default-vector-z,
+ $rotate: $default-rotate,
+ $perspective: false
+) {
$trans: rotate3d($vector-x, $vector-y, $vector-z, $rotate);
- @if $perspective {
- $trans: perspective($perspective) $trans;
- }
+ @if $perspective { $trans: perspective($perspective) $trans; }
@include transform3d($trans);
}
@@ -370,14 +388,14 @@ $perspective: false) {
// where the 'translate-' arguments accept any distance in percentages or absolute (px, cm, in, em etc..) units.
//
// **Note** This mixin cannot be combined with other transform mixins.
-@mixin translate($translate-x: $default-translate-x,
-$translate-y: $default-translate-y,
-$perspective: false,
-$only3d: false) {
+@mixin translate(
+ $translate-x: $default-translate-x,
+ $translate-y: $default-translate-y,
+ $perspective: false,
+ $only3d: false
+) {
$trans: translate($translate-x, $translate-y);
- @if $perspective {
- $trans: perspective($perspective) $trans;
- }
+ @if $perspective { $trans: perspective($perspective) $trans; }
@include transform($trans, $only3d);
}
@@ -385,13 +403,13 @@ $only3d: false) {
// @include translate( [ translate-x, perspective, 3D-only ] )
//
// **Note** This mixin cannot be combined with other transform mixins.
-@mixin translateX($trans-x: $default-translate-x,
-$perspective: false,
-$only3d: false) {
+@mixin translateX(
+ $trans-x: $default-translate-x,
+ $perspective: false,
+ $only3d: false
+) {
$trans: translateX($trans-x);
- @if $perspective {
- $trans: perspective($perspective) $trans;
- }
+ @if $perspective { $trans: perspective($perspective) $trans; }
@include transform($trans, $only3d);
}
@@ -399,13 +417,13 @@ $only3d: false) {
// @include translate( [ translate-y, perspective, 3D-only ] )
//
// **Note** This mixin cannot be combined with other transform mixins.
-@mixin translateY($trans-y: $default-translate-y,
-$perspective: false,
-$only3d: false) {
+@mixin translateY(
+ $trans-y: $default-translate-y,
+ $perspective: false,
+ $only3d: false
+) {
$trans: translateY($trans-y);
- @if $perspective {
- $trans: perspective($perspective) $trans;
- }
+ @if $perspective { $trans: perspective($perspective) $trans; }
@include transform($trans, $only3d);
}
@@ -413,12 +431,12 @@ $only3d: false) {
// @include translate( [ translate-z, perspective ] )
//
// **Note** This mixin cannot be combined with other transform mixins.
-@mixin translateZ($trans-z: $default-translate-z,
-$perspective: false) {
+@mixin translateZ(
+ $trans-z: $default-translate-z,
+ $perspective: false
+) {
$trans: translateZ($trans-z);
- @if $perspective {
- $trans: perspective($perspective) $trans;
- }
+ @if $perspective { $trans: perspective($perspective) $trans; }
@include transform3d($trans);
}
@@ -426,14 +444,14 @@ $perspective: false) {
// @include translate( [ translate-x, translate-y, translate-z, perspective ] )
//
// **Note** This mixin cannot be combined with other transform mixins.
-@mixin translate3d($translate-x: $default-translate-x,
-$translate-y: $default-translate-y,
-$translate-z: $default-translate-z,
-$perspective: false) {
+@mixin translate3d(
+ $translate-x: $default-translate-x,
+ $translate-y: $default-translate-y,
+ $translate-z: $default-translate-z,
+ $perspective: false
+) {
$trans: translate3d($translate-x, $translate-y, $translate-z);
- @if $perspective {
- $trans: perspective($perspective) $trans;
- }
+ @if $perspective { $trans: perspective($perspective) $trans; }
@include transform3d($trans);
}
@@ -448,9 +466,11 @@ $perspective: false) {
// where the 'skew-' arguments accept css angles in degrees (deg) or radian (rad) units.
//
// **Note** This mixin cannot be combined with other transform mixins.
-@mixin skew($skew-x: $default-skew-x,
-$skew-y: $default-skew-y,
-$only3d: false) {
+@mixin skew(
+ $skew-x: $default-skew-x,
+ $skew-y: $default-skew-y,
+ $only3d: false
+) {
$trans: skew($skew-x, $skew-y);
@include transform($trans, $only3d);
}
@@ -460,8 +480,10 @@ $only3d: false) {
// @include skew( [ skew-x, 3D-only ] )
//
// **Note** This mixin cannot be combined with other transform mixins.
-@mixin skewX($skew-x: $default-skew-x,
-$only3d: false) {
+@mixin skewX(
+ $skew-x: $default-skew-x,
+ $only3d: false
+) {
$trans: skewX($skew-x);
@include transform($trans, $only3d);
}
@@ -471,12 +493,15 @@ $only3d: false) {
// @include skew( [ skew-y, 3D-only ] )
//
// **Note** This mixin cannot be combined with other transform mixins.
-@mixin skewY($skew-y: $default-skew-y,
-$only3d: false) {
+@mixin skewY(
+ $skew-y: $default-skew-y,
+ $only3d: false
+) {
$trans: skewY($skew-y);
@include transform($trans, $only3d);
}
+
// Full transform mixins
// For settings any combination of transforms as arguments
// These are complex and not highly recommended for daily use. They are mainly
@@ -486,108 +511,88 @@ $only3d: false) {
// * scale takes a multiplier (unitless), rotate and skew take degrees (deg)
//
// **Note** This mixin cannot be combined with other transform mixins.
-@mixin create-transform($perspective: false,
-$scale-x: false,
-$scale-y: false,
-$scale-z: false,
-$rotate-x: false,
-$rotate-y: false,
-$rotate-z: false,
-$rotate3d: false,
-$trans-x: false,
-$trans-y: false,
-$trans-z: false,
-$skew-x: false,
-$skew-y: false,
-$origin-x: false,
-$origin-y: false,
-$origin-z: false,
-$only3d: false) {
+@mixin create-transform(
+ $perspective: false,
+ $scale-x: false,
+ $scale-y: false,
+ $scale-z: false,
+ $rotate-x: false,
+ $rotate-y: false,
+ $rotate-z: false,
+ $rotate3d: false,
+ $trans-x: false,
+ $trans-y: false,
+ $trans-z: false,
+ $skew-x: false,
+ $skew-y: false,
+ $origin-x: false,
+ $origin-y: false,
+ $origin-z: false,
+ $only3d: false
+) {
$trans: unquote("");
-// perspective
- @if $perspective {
- $trans: perspective($perspective);
- }
+ // perspective
+ @if $perspective { $trans: perspective($perspective) ; }
-// scale
+ // scale
@if $scale-x and $scale-y {
- @if $scale-z {
- $trans: $trans scale3d($scale-x, $scale-y, $scale-z);
- } @else {
- $trans: $trans scale($scale-x, $scale-y);
- }
+ @if $scale-z { $trans: $trans scale3d($scale-x, $scale-y, $scale-z); }
+ @else { $trans: $trans scale($scale-x, $scale-y); }
} @else {
- @if $scale-x {
- $trans: $trans scaleX($scale-x);
- }
- @if $scale-y {
- $trans: $trans scaleY($scale-y);
- }
- @if $scale-z {
- $trans: $trans scaleZ($scale-z);
- }
+ @if $scale-x { $trans: $trans scaleX($scale-x); }
+ @if $scale-y { $trans: $trans scaleY($scale-y); }
+ @if $scale-z { $trans: $trans scaleZ($scale-z); }
}
-// rotate
- @if $rotate-x {
- $trans: $trans rotateX($rotate-x);
- }
- @if $rotate-y {
- $trans: $trans rotateY($rotate-y);
- }
- @if $rotate-z {
- $trans: $trans rotateZ($rotate-z);
- }
- @if $rotate3d {
- $trans: $trans rotate3d($rotate3d);
- }
+ // rotate
+ @if $rotate-x { $trans: $trans rotateX($rotate-x); }
+ @if $rotate-y { $trans: $trans rotateY($rotate-y); }
+ @if $rotate-z { $trans: $trans rotateZ($rotate-z); }
+ @if $rotate3d { $trans: $trans rotate3d($rotate3d); }
-// translate
+ // translate
@if $trans-x and $trans-y {
- @if $trans-z {
- $trans: $trans translate3d($trans-x, $trans-y, $trans-z);
- } @else {
- $trans: $trans translate($trans-x, $trans-y);
- }
+ @if $trans-z { $trans: $trans translate3d($trans-x, $trans-y, $trans-z); }
+ @else { $trans: $trans translate($trans-x, $trans-y); }
} @else {
- @if $trans-x {
- $trans: $trans translateX($trans-x);
- }
- @if $trans-y {
- $trans: $trans translateY($trans-y);
- }
- @if $trans-z {
- $trans: $trans translateZ($trans-z);
- }
+ @if $trans-x { $trans: $trans translateX($trans-x); }
+ @if $trans-y { $trans: $trans translateY($trans-y); }
+ @if $trans-z { $trans: $trans translateZ($trans-z); }
}
-// skew
- @if $skew-x and $skew-y {
- $trans: $trans skew($skew-x, $skew-y);
- } @else {
- @if $skew-x {
- $trans: $trans skewX($skew-x);
- }
- @if $skew-y {
- $trans: $trans skewY($skew-y);
- }
+ // skew
+ @if $skew-x and $skew-y { $trans: $trans skew($skew-x, $skew-y); }
+ @else {
+ @if $skew-x { $trans: $trans skewX($skew-x); }
+ @if $skew-y { $trans: $trans skewY($skew-y); }
}
-// apply it!
+ // apply it!
@include transform($trans, $only3d);
@include transform-origin($origin-x, $origin-y, $origin-z, $only3d);
}
+
// A simplified set of options
// backwards-compatible with the previous version of the 'transform' mixin
-@mixin simple-transform($scale: false,
-$rotate: false,
-$trans-x: false,
-$trans-y: false,
-$skew-x: false,
-$skew-y: false,
-$origin-x: false,
-$origin-y: false) {
- @include create-transform(false, $scale, $scale, false, false, false, $rotate, false, $trans-x, $trans-y, false, $skew-x, $skew-y, $origin-x, $origin-y, false, false);
+@mixin simple-transform(
+ $scale: false,
+ $rotate: false,
+ $trans-x: false,
+ $trans-y: false,
+ $skew-x: false,
+ $skew-y: false,
+ $origin-x: false,
+ $origin-y: false
+) {
+ @include create-transform(
+ false,
+ $scale, $scale, false,
+ false, false, $rotate, false,
+ $trans-x, $trans-y, false,
+ $skew-x, $skew-y,
+ $origin-x, $origin-y, false,
+ false
+ );
}
diff --git a/Extensions/Compass/stylesheets/compass/css3/_transition.scss b/Extensions/Compass/stylesheets/compass/css3/_transition.scss
old mode 100755
new mode 100644
index 9a52903..4c4cb8c
--- a/Extensions/Compass/stylesheets/compass/css3/_transition.scss
+++ b/Extensions/Compass/stylesheets/compass/css3/_transition.scss
@@ -31,29 +31,22 @@ $transitionable-prefixed-values: transform, transform-origin !default;
// * also accepts "all" or "none"
@mixin transition-property($property-1: $default-transition-property,
-$property-2: false,
-$property-3: false,
-$property-4: false,
-$property-5: false,
-$property-6: false,
-$property-7: false,
-$property-8: false,
-$property-9: false,
-$property-10: false) {
- @if type-of($property-1) == string {
- $property-1: unquote($property-1);
- }
+ $property-2 : false,
+ $property-3 : false,
+ $property-4 : false,
+ $property-5 : false,
+ $property-6 : false,
+ $property-7 : false,
+ $property-8 : false,
+ $property-9 : false,
+ $property-10: false
+) {
+ @if type-of($property-1) == string { $property-1: unquote($property-1); }
$properties: compact($property-1, $property-2, $property-3, $property-4, $property-5, $property-6, $property-7, $property-8, $property-9, $property-10);
- @if $experimental-support-for-webkit {
- -webkit-transition-property: prefixed-for-transition(-webkit, $properties);
- }
- @if $experimental-support-for-mozilla {
- -moz-transition-property: prefixed-for-transition(-moz, $properties);
- }
- @if $experimental-support-for-opera {
- -o-transition-property: prefixed-for-transition(-o, $properties);
- }
- transition-property: $properties;
+ @if $experimental-support-for-webkit { -webkit-transition-property : prefixed-for-transition(-webkit, $properties); }
+ @if $experimental-support-for-mozilla { -moz-transition-property : prefixed-for-transition(-moz, $properties); }
+ @if $experimental-support-for-opera { -o-transition-property : prefixed-for-transition(-o, $properties); }
+ transition-property : $properties;
}
// One or more durations in seconds
@@ -62,20 +55,21 @@ $property-10: false) {
// * these durations will affect the properties in the same list position
@mixin transition-duration($duration-1: $default-transition-duration,
-$duration-2: false,
-$duration-3: false,
-$duration-4: false,
-$duration-5: false,
-$duration-6: false,
-$duration-7: false,
-$duration-8: false,
-$duration-9: false,
-$duration-10: false) {
- @if type-of($duration-1) == string {
- $duration-1: unquote($duration-1);
- }
+ $duration-2 : false,
+ $duration-3 : false,
+ $duration-4 : false,
+ $duration-5 : false,
+ $duration-6 : false,
+ $duration-7 : false,
+ $duration-8 : false,
+ $duration-9 : false,
+ $duration-10: false
+) {
+ @if type-of($duration-1) == string { $duration-1: unquote($duration-1); }
$durations: compact($duration-1, $duration-2, $duration-3, $duration-4, $duration-5, $duration-6, $duration-7, $duration-8, $duration-9, $duration-10);
- @include experimental(transition-duration, $durations, -moz, -webkit, -o, not -ms, not -khtml, official);
+ @include experimental(transition-duration, $durations,
+ -moz, -webkit, -o, not -ms, not -khtml, official
+ );
}
// One or more timing functions
@@ -85,18 +79,21 @@ $duration-10: false) {
// * These functions will effect the properties in the same list position
@mixin transition-timing-function($function-1: $default-transition-function,
-$function-2: false,
-$function-3: false,
-$function-4: false,
-$function-5: false,
-$function-6: false,
-$function-7: false,
-$function-8: false,
-$function-9: false,
-$function-10: false) {
+ $function-2 : false,
+ $function-3 : false,
+ $function-4 : false,
+ $function-5 : false,
+ $function-6 : false,
+ $function-7 : false,
+ $function-8 : false,
+ $function-9 : false,
+ $function-10: false
+) {
$function-1: unquote($function-1);
$functions: compact($function-1, $function-2, $function-3, $function-4, $function-5, $function-6, $function-7, $function-8, $function-9, $function-10);
- @include experimental(transition-timing-function, $functions, -moz, -webkit, -o, not -ms, not -khtml, official);
+ @include experimental(transition-timing-function, $functions,
+ -moz, -webkit, -o, not -ms, not -khtml, official
+ );
}
// One or more transition-delays in seconds
@@ -105,49 +102,54 @@ $function-10: false) {
// * these delays will effect the properties in the same list position
@mixin transition-delay($delay-1: $default-transition-delay,
-$delay-2: false,
-$delay-3: false,
-$delay-4: false,
-$delay-5: false,
-$delay-6: false,
-$delay-7: false,
-$delay-8: false,
-$delay-9: false,
-$delay-10: false) {
- @if type-of($delay-1) == string {
- $delay-1: unquote($delay-1);
- }
+ $delay-2 : false,
+ $delay-3 : false,
+ $delay-4 : false,
+ $delay-5 : false,
+ $delay-6 : false,
+ $delay-7 : false,
+ $delay-8 : false,
+ $delay-9 : false,
+ $delay-10: false
+) {
+ @if type-of($delay-1) == string { $delay-1: unquote($delay-1); }
$delays: compact($delay-1, $delay-2, $delay-3, $delay-4, $delay-5, $delay-6, $delay-7, $delay-8, $delay-9, $delay-10);
- @include experimental(transition-delay, $delays, -moz, -webkit, -o, not -ms, not -khtml, official);
+ @include experimental(transition-delay, $delays,
+ -moz, -webkit, -o, not -ms, not -khtml, official
+ );
}
// Transition all-in-one shorthand
-@mixin single-transition($property: $default-transition-property,
-$duration: $default-transition-duration,
-$function: $default-transition-function,
-$delay: $default-transition-delay) {
+@mixin single-transition(
+ $property: $default-transition-property,
+ $duration: $default-transition-duration,
+ $function: $default-transition-function,
+ $delay: $default-transition-delay
+) {
@include transition(compact($property $duration $function $delay));
}
-@mixin transition($transition-1: default,
-$transition-2: false,
-$transition-3: false,
-$transition-4: false,
-$transition-5: false,
-$transition-6: false,
-$transition-7: false,
-$transition-8: false,
-$transition-9: false,
-$transition-10: false) {
+@mixin transition(
+ $transition-1 : default,
+ $transition-2 : false,
+ $transition-3 : false,
+ $transition-4 : false,
+ $transition-5 : false,
+ $transition-6 : false,
+ $transition-7 : false,
+ $transition-8 : false,
+ $transition-9 : false,
+ $transition-10: false
+) {
@if $transition-1 == default {
- $transition-1: compact($default-transition-property $default-transition-duration $default-transition-function $default-transition-delay);
+ $transition-1 : compact($default-transition-property $default-transition-duration $default-transition-function $default-transition-delay);
}
$transitions: false;
@if type-of($transition-1) == list and type-of(nth($transition-1,1)) == list {
$transitions: join($transition-1, compact($transition-2, $transition-3, $transition-4, $transition-5, $transition-6, $transition-7, $transition-8, $transition-9, $transition-10), comma);
} @else {
- $transitions: compact($transition-1, $transition-2, $transition-3, $transition-4, $transition-5, $transition-6, $transition-7, $transition-8, $transition-9, $transition-10);
+ $transitions : compact($transition-1, $transition-2, $transition-3, $transition-4, $transition-5, $transition-6, $transition-7, $transition-8, $transition-9, $transition-10);
}
$delays: comma-list();
$has-delays: false;
@@ -155,55 +157,36 @@ $transition-10: false) {
$moz-value: comma-list();
$o-value: comma-list();
-// This block can be made considerably simpler at the point in time that
-// we no longer need to deal with the differences in how delays are treated.
+ // This block can be made considerably simpler at the point in time that
+ // we no longer need to deal with the differences in how delays are treated.
@each $transition in $transitions {
- // Extract the values from the list
- // (this would be cleaner if nth took a 3rd argument to provide a default value).
+ // Extract the values from the list
+ // (this would be cleaner if nth took a 3rd argument to provide a default value).
$property: nth($transition, 1);
$duration: false;
$timing-function: false;
$delay: false;
- @if length($transition) > 1 {
- $duration: nth($transition, 2);
- }
- @if length($transition) > 2 {
- $timing-function: nth($transition, 3);
- }
- @if length($transition) > 3 {
- $delay: nth($transition, 4);
- $has-delays: true;
- }
+ @if length($transition) > 1 { $duration: nth($transition, 2); }
+ @if length($transition) > 2 { $timing-function: nth($transition, 3); }
+ @if length($transition) > 3 { $delay: nth($transition, 4); $has-delays: true; }
- // If a delay is provided without a timing function
- @if is-time($timing-function) and not $delay {
- $delay: $timing-function;
- $timing-function: false;
- $has-delays: true;
- }
+ // If a delay is provided without a timing function
+ @if is-time($timing-function) and not $delay { $delay: $timing-function; $timing-function: false; $has-delays: true; }
- // 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));
$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));
- $o-value: append($o-value, compact(prefixed-for-transition(-o, $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));
}
- @if $experimental-support-for-webkit {
- -webkit-transition: $webkit-value;
- // old webkit doesn't support the delay parameter in the shorthand so we progressively enhance it.
- @if $has-delays {
- -webkit-transition-delay: $delays;
- }
- }
- @if $experimental-support-for-mozilla {
- -moz-transition: $moz-value;
- }
- @if $experimental-support-for-opera {
- -o-transition: $o-value;
- }
- transition: $transitions;
+ @if $experimental-support-for-webkit { -webkit-transition : $webkit-value;
+ // old webkit doesn't support the delay parameter in the shorthand so we progressively enhance it.
+ @if $has-delays { -webkit-transition-delay : $delays; } }
+ @if $experimental-support-for-mozilla { -moz-transition : $moz-value; }
+ @if $experimental-support-for-opera { -o-transition : $o-value; }
+ transition : $transitions;
}
// coerce a list to be comma delimited or make a new, empty comma delimited list.
diff --git a/Extensions/Compass/stylesheets/compass/css3/_user-interface.scss b/Extensions/Compass/stylesheets/compass/css3/_user-interface.scss
old mode 100755
new mode 100644
index aa39789..e78b2fe
--- a/Extensions/Compass/stylesheets/compass/css3/_user-interface.scss
+++ b/Extensions/Compass/stylesheets/compass/css3/_user-interface.scss
@@ -4,11 +4,14 @@
// http://www.w3.org/TR/2000/WD-css3-userint-20000216
@import "shared";
+
// This property controls the selection model and granularity of an element.
//
// @param $select
// [ none | text | toggle | element | elements | all | inherit ]
@mixin user-select($select) {
$select: unquote($select);
- @include experimental(user-select, $select, -moz, -webkit, not -o, not -ms, -khtml, official);
+ @include experimental(user-select, $select,
+ -moz, -webkit, not -o, not -ms, -khtml, official
+ );
}
diff --git a/Extensions/Compass/stylesheets/compass/layout/_grid-background.scss b/Extensions/Compass/stylesheets/compass/layout/_grid-background.scss
old mode 100755
new mode 100644
index 1cfb487..e7e7306
--- a/Extensions/Compass/stylesheets/compass/layout/_grid-background.scss
+++ b/Extensions/Compass/stylesheets/compass/layout/_grid-background.scss
@@ -2,69 +2,72 @@
@import "compass/css3/background-size";
// Set the color of your columns
-$grid-background-column-color: rgba(100, 100, 225, 0.25) !default;
+$grid-background-column-color : rgba(100, 100, 225, 0.25) !default;
// Set the color of your gutters
-$grid-background-gutter-color: rgba(0, 0, 0, 0) !default;
+$grid-background-gutter-color : rgba(0, 0, 0, 0) !default;
// Set the total number of columns in your grid
-$grid-background-total-columns: 24 !default;
+$grid-background-total-columns : 24 !default;
// Set the width of your columns
-$grid-background-column-width: 30px !default;
+$grid-background-column-width : 30px !default;
// Set the width of your gutters
-$grid-background-gutter-width: 10px !default;
+$grid-background-gutter-width : 10px !default;
// Set the offset, if your columns are padded in from the container edge
-$grid-background-offset: 0px !default;
+$grid-background-offset : 0px !default;
// Set the color of your baseline
-$grid-background-baseline-color: rgba(0, 0, 0, 0.5) !default;
+$grid-background-baseline-color : rgba(0, 0, 0, 0.5) !default;
// Set the height of your baseline grid
-$grid-background-baseline-height: 1.5em !default;
+$grid-background-baseline-height : 1.5em !default;
// toggle your columns grids on and off
-$show-column-grid-backgrounds: true !default;
+$show-column-grid-backgrounds : true !default;
// toggle your vertical grids on and off
-$show-baseline-grid-backgrounds: true !default;
+$show-baseline-grid-backgrounds : true !default;
// toggle all your grids on and off
-$show-grid-backgrounds: true !default;
+$show-grid-backgrounds : true !default;
// optionally force your grid-image to remain fluid
// no matter what units you used to declared your grid.
-$grid-background-force-fluid: false !default;
+$grid-background-force-fluid : false !default;
+
// Create the gradient needed for baseline grids
-@function get-baseline-gradient($color: $grid-background-baseline-color) {
- $gradient: linear-gradient(bottom, $color 5%, rgba($color, 0) 5%);
+@function get-baseline-gradient(
+ $color : $grid-background-baseline-color
+) {
+ $gradient: linear-gradient(bottom, $color 5%, rgba($color,0) 5%);
@return $gradient;
}
// Create the color-stops needed for horizontal grids
-@function build-grid-background($total: $grid-background-total-columns,
-$column: $grid-background-column-width,
-$gutter: $grid-background-gutter-width,
-$offset: $grid-background-offset,
-$column-color: $grid-background-column-color,
-$gutter-color: $grid-background-gutter-color) {
+@function build-grid-background(
+ $total : $grid-background-total-columns,
+ $column : $grid-background-column-width,
+ $gutter : $grid-background-gutter-width,
+ $offset : $grid-background-offset,
+ $column-color : $grid-background-column-color,
+ $gutter-color : $grid-background-gutter-color
+) {
$grid: compact();
$grid: append($grid, $gutter-color $offset, comma);
@for $i from 0 to $total {
- // $a represents the start of this column, initially equal to the offset
+ // $a represents the start of this column, initially equal to the offset
$a: $offset;
- @if $i > 0 {
- $a: $a + (($column + $gutter) * $i);
- }
+ @if $i > 0 { $a: $a + (($column + $gutter) * $i); }
- // $g represents the start of this gutter, equal to $a plus one column-width
+ // $g represents the start of this gutter, equal to $a plus one column-width
$g: $a + $column;
- // $z represents the end of a gutter, equal to $g plus one gutter-width
+ // $z represents the end of a gutter, equal to $g plus one gutter-width
$z: $g + $gutter;
@if (unit($a) == "%") and ($i == ($total - 1)) {
$z: 100%;
}
- // and we add this column/gutter pair to our grid
+ // and we add this column/gutter pair to our grid
$grid: join($grid, ($column-color $a, $column-color $g, $gutter-color $g, $gutter-color $z));
}
@@ -72,51 +75,56 @@ $gutter-color: $grid-background-gutter-color) {
}
// Return the gradient needed for horizontal grids
-@function get-column-gradient($total: $grid-background-total-columns,
-$column: $grid-background-column-width,
-$gutter: $grid-background-gutter-width,
-$offset: $grid-background-offset,
-$column-color: $grid-background-column-color,
-$gutter-color: $grid-background-gutter-color,
-$force-fluid: $grid-background-force-fluid) {
+@function get-column-gradient(
+ $total : $grid-background-total-columns,
+ $column : $grid-background-column-width,
+ $gutter : $grid-background-gutter-width,
+ $offset : $grid-background-offset,
+ $column-color : $grid-background-column-color,
+ $gutter-color : $grid-background-gutter-color,
+ $force-fluid : $grid-background-force-fluid
+) {
$grid: unquote("");
-// don't force fluid grids when they are already fluid.
- @if unit($column) == "%" {
- $force-fluid: false;
- }
+ // don't force fluid grids when they are already fluid.
+ @if unit($column) == "%" { $force-fluid: false; }
@if $force-fluid {
- $grid: get-column-fluid-grid($total, $column, $gutter, $offset, $column-color, $gutter-color);
+ $grid: get-column-fluid-grid($total,$column,$gutter,$offset,$column-color,$gutter-color);
} @else {
- $grid: build-grid-background($total, $column, $gutter, $offset, $column-color, $gutter-color);
+ $grid: build-grid-background($total,$column,$gutter,$offset,$column-color,$gutter-color);
}
-// return the horizontal grid as a gradient
+ // return the horizontal grid as a gradient
$gradient: linear-gradient(left, $grid);
@return $gradient;
}
// Convert a grid from fixed units into percentages.
-@function get-column-fluid-grid($total: $grid-background-total-columns,
-$column: $grid-background-column-width,
-$gutter: $grid-background-gutter-width,
-$offset: $grid-background-offset,
-$column-color: $grid-background-column-color,
-$gutter-color: $grid-background-gutter-color) {
+@function get-column-fluid-grid(
+ $total : $grid-background-total-columns,
+ $column : $grid-background-column-width,
+ $gutter : $grid-background-gutter-width,
+ $offset : $grid-background-offset,
+ $column-color : $grid-background-column-color,
+ $gutter-color : $grid-background-gutter-color
+) {
$context: ($column * $total) + ($gutter * ($total - 1) + ($offset * 2));
$offset: $offset / $context * 100%;
$column: $column / $context * 100%;
$gutter: $gutter / $context * 100%;
-// return the horizontal grid as a set of color-stops
- $grid: build-grid-background($total, $column, $gutter, $offset, $column-color, $gutter-color);
+ // return the horizontal grid as a set of color-stops
+ $grid: build-grid-background($total,$column,$gutter,$offset,$column-color,$gutter-color);
@return $grid;
}
+
// Add just the baseline grid to an element's background
-@mixin baseline-grid-background($baseline: $grid-background-baseline-height,
-$color: $grid-background-baseline-color) {
+@mixin baseline-grid-background(
+ $baseline : $grid-background-baseline-height,
+ $color : $grid-background-baseline-color
+) {
@if $show-grid-backgrounds and $show-baseline-grid-backgrounds {
@include background-image(get-baseline-gradient($color));
@include background-size(100% $baseline);
@@ -125,37 +133,46 @@ $color: $grid-background-baseline-color) {
}
// Add just the horizontal grid to an element's background
-@mixin column-grid-background($total: $grid-background-total-columns,
-$column: $grid-background-column-width,
-$gutter: $grid-background-gutter-width,
-$offset: $grid-background-offset,
-$column-color: $grid-background-column-color,
-$gutter-color: $grid-background-gutter-color,
-$force-fluid: $grid-background-force-fluid) {
+@mixin column-grid-background(
+ $total : $grid-background-total-columns,
+ $column : $grid-background-column-width,
+ $gutter : $grid-background-gutter-width,
+ $offset : $grid-background-offset,
+ $column-color : $grid-background-column-color,
+ $gutter-color : $grid-background-gutter-color,
+ $force-fluid : $grid-background-force-fluid
+) {
@if $show-grid-backgrounds and $show-column-grid-backgrounds {
- @include background-image(get-column-gradient($total, $column, $gutter, $offset, $column-color, $gutter-color, $force-fluid));
+ @include background-image(
+ get-column-gradient($total,$column,$gutter,$offset,$column-color,$gutter-color, $force-fluid)
+ );
background-position: left top;
}
}
// Add both horizontal and baseline grids to an element's background
-@mixin grid-background($total: $grid-background-total-columns,
-$column: $grid-background-column-width,
-$gutter: $grid-background-gutter-width,
-$baseline: $grid-background-baseline-height,
-$offset: $grid-background-offset,
-$column-color: $grid-background-column-color,
-$gutter-color: $grid-background-gutter-color,
-$baseline-color: $grid-background-baseline-color,
-$force-fluid: $grid-background-force-fluid) {
+@mixin grid-background(
+ $total : $grid-background-total-columns,
+ $column : $grid-background-column-width,
+ $gutter : $grid-background-gutter-width,
+ $baseline : $grid-background-baseline-height,
+ $offset : $grid-background-offset,
+ $column-color : $grid-background-column-color,
+ $gutter-color : $grid-background-gutter-color,
+ $baseline-color : $grid-background-baseline-color,
+ $force-fluid : $grid-background-force-fluid
+) {
@if $show-grid-backgrounds {
@if $show-baseline-grid-backgrounds and $show-column-grid-backgrounds {
- @include background-image(get-baseline-gradient($baseline-color), get-column-gradient($total, $column, $gutter, $offset, $column-color, $gutter-color, $force-fluid));
+ @include background-image(
+ get-baseline-gradient($baseline-color),
+ get-column-gradient($total,$column,$gutter,$offset,$column-color,$gutter-color, $force-fluid)
+ );
@include background-size(100% $baseline, auto);
background-position: left top;
} @else {
@include baseline-grid-background($baseline, $baseline-color);
- @include column-grid-background($total, $column, $gutter, $offset, $column-color, $gutter-color, $force-fluid);
+ @include column-grid-background($total,$column,$gutter,$offset,$column-color,$gutter-color, $force-fluid);
}
}
}
diff --git a/Extensions/Compass/stylesheets/compass/layout/_sticky-footer.scss b/Extensions/Compass/stylesheets/compass/layout/_sticky-footer.scss
old mode 100755
new mode 100644
index d3b1f21..055f641
--- a/Extensions/Compass/stylesheets/compass/layout/_sticky-footer.scss
+++ b/Extensions/Compass/stylesheets/compass/layout/_sticky-footer.scss
@@ -8,8 +8,7 @@
@mixin sticky-footer($footer-height, $root-selector: unquote("#root"), $root-footer-selector: unquote("#root_footer"), $footer-selector: unquote("#footer")) {
html, body {
- height: 100%;
- }
+ height: 100%; }
#{$root-selector} {
clear: both;
min-height: 100%;
@@ -17,12 +16,8 @@
height: 100%;
margin-bottom: -$footer-height;
#{$root-footer-selector} {
- height: $footer-height;
- }
- }
+ height: $footer-height; } }
#{$footer-selector} {
clear: both;
position: relative;
- height: $footer-height;
- }
-}
+ height: $footer-height; } }
diff --git a/Extensions/Compass/stylesheets/compass/layout/_stretching.scss b/Extensions/Compass/stylesheets/compass/layout/_stretching.scss
old mode 100755
new mode 100644
index 201934d..c123e3d
--- a/Extensions/Compass/stylesheets/compass/layout/_stretching.scss
+++ b/Extensions/Compass/stylesheets/compass/layout/_stretching.scss
@@ -1,29 +1,24 @@
+
// stretch element height to specified top and bottom position
-@mixin stretch-y($offset-top: 0, $offset-bottom: 0) {
+@mixin stretch-y($offset-top:0, $offset-bottom:0) {
@include stretch($offset-top, false, $offset-bottom, false);
}
+
// stretch element width to specified left and right position
-@mixin stretch-x($offset-left: 0, $offset-right: 0) {
+@mixin stretch-x($offset-left:0, $offset-right:0) {
@include stretch(false, $offset-right, false, $offset-left);
}
+
// shorthand to stretch element height and width
-@mixin stretch($offset-top: 0, $offset-right: 0, $offset-bottom: 0, $offset-left: 0) {
+@mixin stretch($offset-top:0, $offset-right:0, $offset-bottom:0, $offset-left:0) {
position: absolute;
- @if $offset-top {
- top: $offset-top;
- }
- @if $offset-bottom {
- bottom: $offset-bottom;
- }
- @if $offset-left {
- left: $offset-left;
- }
- @if $offset-right {
- right: $offset-right;
- }
+ @if $offset-top { top: $offset-top; }
+ @if $offset-bottom { bottom: $offset-bottom; }
+ @if $offset-left { left: $offset-left; }
+ @if $offset-right { right: $offset-right; }
}
\ No newline at end of file
diff --git a/Extensions/Compass/stylesheets/compass/reset/_utilities-legacy.scss b/Extensions/Compass/stylesheets/compass/reset/_utilities-legacy.scss
old mode 100755
new mode 100644
index 4d5a12e..8273ca3
--- a/Extensions/Compass/stylesheets/compass/reset/_utilities-legacy.scss
+++ b/Extensions/Compass/stylesheets/compass/reset/_utilities-legacy.scss
@@ -13,27 +13,19 @@
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td {
@include reset-box-model;
- @include reset-font;
- }
+ @include reset-font; }
body {
- @include reset-body;
- }
+ @include reset-body; }
ol, ul {
- @include reset-list-style;
- }
+ @include reset-list-style; }
table {
- @include reset-table;
- }
+ @include reset-table; }
caption, th, td {
- @include reset-table-cell;
- }
+ @include reset-table-cell; }
q, blockquote {
- @include reset-quotation;
- }
+ @include reset-quotation; }
a img {
- @include reset-image-anchor-border;
- }
-}
+ @include reset-image-anchor-border; } }
// Reset all elements within some selector scope. To reset the selector itself,
// mixin the appropriate reset mixin for that element type as well. This could be
@@ -45,29 +37,22 @@
pre, a, abbr, acronym, address, code, del, dfn, em, img,
dl, dt, dd, ol, ul, li, fieldset, form, label, legend, caption, tbody, tfoot, thead, tr {
@include reset-box-model;
- @include reset-font;
- }
+ @include reset-font; }
table {
- @include reset-table;
- }
+ @include reset-table; }
caption, th, td {
- @include reset-table-cell;
- }
+ @include reset-table-cell; }
q, blockquote {
- @include reset-quotation;
- }
+ @include reset-quotation; }
a img {
- @include reset-image-anchor-border;
- }
-}
+ @include reset-image-anchor-border; } }
// Reset the box model measurements.
@mixin reset-box-model {
margin: 0;
padding: 0;
border: 0;
- outline: 0;
-}
+ outline: 0; }
// Reset the font and vertical alignment.
@mixin reset-font {
@@ -75,56 +60,45 @@
weight: inherit;
style: inherit;
size: 100%;
- family: inherit;
- }
-;
- vertical-align: baseline;
-}
+ family: inherit; };
+ vertical-align: baseline; }
// Resets the outline when focus.
// For accessibility you need to apply some styling in its place.
@mixin reset-focus {
- outline: 0;
-}
+ outline: 0; }
// Reset a body element.
@mixin reset-body {
line-height: 1;
color: black;
- background: white;
-}
+ background: white; }
// Reset the list style of an element.
@mixin reset-list-style {
- list-style: none;
-}
+ list-style: none; }
// Reset a table
@mixin reset-table {
border-collapse: separate;
border-spacing: 0;
- vertical-align: middle;
-}
+ vertical-align: middle; }
// Reset a table cell (`th`, `td`)
@mixin reset-table-cell {
text-align: left;
font-weight: normal;
- vertical-align: middle;
-}
+ vertical-align: middle; }
// Reset a quotation (`q`, `blockquote`)
@mixin reset-quotation {
quotes: "" "";
&:before, &:after {
- content: "";
- }
-}
+ content: ""; } }
// Resets the border.
@mixin reset-image-anchor-border {
- border: none;
-}
+ border: none; }
// Unrecognized elements are displayed inline.
// This reset provides a basic reset for html5 elements
@@ -133,9 +107,7 @@
@mixin reset-html5 {
#{elements-of-type(html5-block)} {
@include reset-box-model;
- display: block;
- }
-}
+ display: block; } }
// Resets the display of inline and block elements to their default display
// according to their tag type. Elements that have a default display that varies across
@@ -153,16 +125,11 @@
@mixin reset-display($selector: "", $important: false) {
#{append-selector(elements-of-type("inline"), $selector)} {
@if $important {
- display: inline !important;
- } @else {
- display: inline;
- }
- }
+ display: inline !important; }
+ @else {
+ display: inline; } }
#{append-selector(elements-of-type("block"), $selector)} {
@if $important {
- display: block !important;
- } @else {
- display: block;
- }
- }
-}
+ display: block !important; }
+ @else {
+ display: block; } } }
diff --git a/Extensions/Compass/stylesheets/compass/reset/_utilities.scss b/Extensions/Compass/stylesheets/compass/reset/_utilities.scss
old mode 100755
new mode 100644
index 7eba4ac..d173f3e
--- a/Extensions/Compass/stylesheets/compass/reset/_utilities.scss
+++ b/Extensions/Compass/stylesheets/compass/reset/_utilities.scss
@@ -11,35 +11,27 @@
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
- article, aside, canvas, details, embed,
- figure, figcaption, footer, header, hgroup,
+ article, aside, canvas, details, embed,
+ figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary,
time, mark, audio, video {
@include reset-box-model;
- @include reset-font;
- }
-// Unlike Eric's original reset, we reset the html element to be compatible
-// with the vertical rhythm mixins.
+ @include reset-font; }
+ // Unlike Eric's original reset, we reset the html element to be compatible
+ // with the vertical rhythm mixins.
html {
- @include reset-body;
- }
+ @include reset-body; }
ol, ul {
- @include reset-list-style;
- }
+ @include reset-list-style; }
table {
- @include reset-table;
- }
+ @include reset-table; }
caption, th, td {
- @include reset-table-cell;
- }
+ @include reset-table-cell; }
q, blockquote {
- @include reset-quotation;
- }
+ @include reset-quotation; }
a img {
- @include reset-image-anchor-border;
- }
- @include reset-html5;
-}
+ @include reset-image-anchor-border; }
+ @include reset-html5; }
// Reset all elements within some selector scope. To reset the selector itself,
// mixin the appropriate reset mixin for that element type as well. This could be
@@ -54,83 +46,67 @@
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
- article, aside, canvas, details, embed,
- figure, figcaption, footer, header, hgroup,
+ article, aside, canvas, details, embed,
+ figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary,
time, mark, audio, video {
@include reset-box-model;
- @include reset-font;
- }
+ @include reset-font; }
table {
- @include reset-table;
- }
+ @include reset-table; }
caption, th, td {
- @include reset-table-cell;
- }
+ @include reset-table-cell; }
q, blockquote {
- @include reset-quotation;
- }
+ @include reset-quotation; }
a img {
- @include reset-image-anchor-border;
- }
-}
+ @include reset-image-anchor-border; } }
// Reset the box model measurements.
@mixin reset-box-model {
margin: 0;
padding: 0;
- border: 0;
-}
+ border: 0; }
// Reset the font and vertical alignment.
@mixin reset-font {
font: inherit;
font-size: 100%;
- vertical-align: baseline;
-}
+ vertical-align: baseline; }
// Resets the outline when focus.
// For accessibility you need to apply some styling in its place.
@mixin reset-focus {
- outline: 0;
-}
+ outline: 0; }
// Reset a body element.
@mixin reset-body {
- line-height: 1;
-}
+ line-height: 1; }
// Reset the list style of an element.
@mixin reset-list-style {
- list-style: none;
-}
+ list-style: none; }
// Reset a table
@mixin reset-table {
border-collapse: collapse;
- border-spacing: 0;
-}
+ border-spacing: 0; }
// Reset a table cell (`th`, `td`)
@mixin reset-table-cell {
text-align: left;
font-weight: normal;
- vertical-align: middle;
-}
+ vertical-align: middle; }
// Reset a quotation (`q`, `blockquote`)
@mixin reset-quotation {
quotes: none;
&:before, &:after {
- content: "";
- content: none;
- }
-}
+ content: "";
+ content: none; } }
// Resets the border.
@mixin reset-image-anchor-border {
- border: none;
-}
+ border: none; }
// Unrecognized elements are displayed inline.
// This reset provides a basic reset for block html5 elements
@@ -138,9 +114,7 @@
// and reset in browsers that have default styles for them.
@mixin reset-html5 {
#{elements-of-type(html5-block)} {
- display: block;
- }
-}
+ display: block; } }
// Resets the display of inline and block elements to their default display
// according to their tag type. Elements that have a default display that varies across
@@ -158,16 +132,11 @@
@mixin reset-display($selector: "", $important: false) {
#{append-selector(elements-of-type("inline"), $selector)} {
@if $important {
- display: inline !important;
- } @else {
- display: inline;
- }
- }
+ display: inline !important; }
+ @else {
+ display: inline; } }
#{append-selector(elements-of-type("block"), $selector)} {
@if $important {
- display: block !important;
- } @else {
- display: block;
- }
- }
-}
+ display: block !important; }
+ @else {
+ display: block; } } }
diff --git a/Extensions/Compass/stylesheets/compass/typography/_links.scss b/Extensions/Compass/stylesheets/compass/typography/_links.scss
old mode 100755
new mode 100644
index 5dc282a..735000e
--- a/Extensions/Compass/stylesheets/compass/typography/_links.scss
+++ b/Extensions/Compass/stylesheets/compass/typography/_links.scss
@@ -1,3 +1,3 @@
-@import "links/links/_hover-link";
-@import "links/links/_link-colors";
-@import "links/links/_unstyled-link";
+@import "links/hover-link";
+@import "links/link-colors";
+@import "links/unstyled-link";
diff --git a/Extensions/Compass/stylesheets/compass/typography/_lists.scss b/Extensions/Compass/stylesheets/compass/typography/_lists.scss
old mode 100755
new mode 100644
index 86f7364..3365f30
--- a/Extensions/Compass/stylesheets/compass/typography/_lists.scss
+++ b/Extensions/Compass/stylesheets/compass/typography/_lists.scss
@@ -1,4 +1,4 @@
-@import "lists/lists/_horizontal-list";
-@import "lists/lists/_inline-list";
-@import "lists/lists/_inline-block-list";
-@import "lists/lists/_bullets";
+@import "lists/horizontal-list";
+@import "lists/inline-list";
+@import "lists/inline-block-list";
+@import "lists/bullets";
diff --git a/Extensions/Compass/stylesheets/compass/typography/_text.scss b/Extensions/Compass/stylesheets/compass/typography/_text.scss
old mode 100755
new mode 100644
index 8fce415..885f729
--- a/Extensions/Compass/stylesheets/compass/typography/_text.scss
+++ b/Extensions/Compass/stylesheets/compass/typography/_text.scss
@@ -1,4 +1,4 @@
-@import "text/text/_ellipsis";
-@import "text/text/_nowrap";
-@import "text/text/_replacement";
-@import "text/text/_force-wrap";
+@import "text/ellipsis";
+@import "text/nowrap";
+@import "text/replacement";
+@import "text/force-wrap";
diff --git a/Extensions/Compass/stylesheets/compass/typography/_vertical_rhythm.scss b/Extensions/Compass/stylesheets/compass/typography/_vertical_rhythm.scss
old mode 100755
new mode 100644
index b78f5fb..999d1fb
--- a/Extensions/Compass/stylesheets/compass/typography/_vertical_rhythm.scss
+++ b/Extensions/Compass/stylesheets/compass/typography/_vertical_rhythm.scss
@@ -55,9 +55,9 @@ $base-half-leader: $base-leader / 2;
// Establishes a font baseline for the given font-size.
@mixin establish-baseline($font-size: $base-font-size) {
-// IE 6 refuses to resize fonts set in pixels and it weirdly resizes fonts
-// whose root is set in ems. So we set the root font size in percentages of
-// the default font size.
+ // IE 6 refuses to resize fonts set in pixels and it weirdly resizes fonts
+ // whose root is set in ems. So we set the root font size in percentages of
+ // the default font size.
* html {
font-size: 100% * ($font-size / $browser-default-font-size);
}
@@ -109,14 +109,16 @@ $base-half-leader: $base-leader / 2;
}
// Calculate rhythm units.
-@function rhythm($lines: 1,
-$font-size: $base-font-size,
-$offset: 0) {
+@function rhythm(
+ $lines: 1,
+ $font-size: $base-font-size,
+ $offset: 0
+) {
@if not $relative-font-sizing and $font-size != $base-font-size {
@warn "$relative-font-sizing is false but a relative font size was passed to the rhythm function";
}
$rhythm: $font-unit * ($lines * $base-line-height - $offset) / $font-size;
-// Round the pixels down to nearest integer.
+ // Round the pixels down to nearest integer.
@if unit($rhythm) == px {
$rhythm: floor($rhythm);
}
@@ -126,7 +128,8 @@ $offset: 0) {
// Calculate the minimum multiple of rhythm units needed to contain the font-size.
@function lines-for-font-size($font-size) {
$lines: if($round-to-nearest-half-line,
- ceil(2 * $font-size / $base-line-height) / 2, ceil($font-size / $base-line-height));
+ ceil(2 * $font-size / $base-line-height) / 2,
+ ceil($font-size / $base-line-height));
@if $lines * $base-line-height - $font-size < $min-line-padding * 2 {
$lines: $lines + if($round-to-nearest-half-line, 0.5, 1);
}
@@ -180,8 +183,7 @@ $offset: 0) {
border-#{$side}: {
style: $border-style;
width: $font-unit * $width / $font-size;
- }
-;
+ };
padding-#{$side}: rhythm($lines, $font-size, $offset: $width);
}
@@ -193,8 +195,7 @@ $offset: 0) {
border: {
style: $border-style;
width: $font-unit * $width / $font-size;
- }
-;
+ };
padding: rhythm($lines, $font-size, $offset: $width);
}
diff --git a/Extensions/Compass/stylesheets/compass/typography/links/_hover-link.scss b/Extensions/Compass/stylesheets/compass/typography/links/_hover-link.scss
old mode 100755
new mode 100644
index 4e2e75a..8c72bc1
--- a/Extensions/Compass/stylesheets/compass/typography/links/_hover-link.scss
+++ b/Extensions/Compass/stylesheets/compass/typography/links/_hover-link.scss
@@ -2,6 +2,4 @@
@mixin hover-link {
text-decoration: none;
&:hover {
- text-decoration: underline;
- }
-}
+ text-decoration: underline; } }
diff --git a/Extensions/Compass/stylesheets/compass/typography/links/_link-colors.scss b/Extensions/Compass/stylesheets/compass/typography/links/_link-colors.scss
old mode 100755
new mode 100644
index 9af6825..5d641f7
--- a/Extensions/Compass/stylesheets/compass/typography/links/_link-colors.scss
+++ b/Extensions/Compass/stylesheets/compass/typography/links/_link-colors.scss
@@ -16,22 +16,13 @@
color: $normal;
@if $visited {
&:visited {
- color: $visited;
- }
- }
+ color: $visited; } }
@if $focus {
&:focus {
- color: $focus;
- }
- }
+ color: $focus; } }
@if $hover {
&:hover {
- color: $hover;
- }
- }
+ color: $hover; } }
@if $active {
&:active {
- color: $active;
- }
- }
-}
+ color: $active; } } }
diff --git a/Extensions/Compass/stylesheets/compass/typography/links/_unstyled-link.scss b/Extensions/Compass/stylesheets/compass/typography/links/_unstyled-link.scss
old mode 100755
new mode 100644
index 528715e..e39c2d6
--- a/Extensions/Compass/stylesheets/compass/typography/links/_unstyled-link.scss
+++ b/Extensions/Compass/stylesheets/compass/typography/links/_unstyled-link.scss
@@ -4,6 +4,4 @@
text-decoration: inherit;
cursor: inherit;
&:active, &:focus {
- outline: none;
- }
-}
+ outline: none; } }
diff --git a/Extensions/Compass/stylesheets/compass/typography/lists/_bullets.scss b/Extensions/Compass/stylesheets/compass/typography/lists/_bullets.scss
old mode 100755
new mode 100644
index 0c7e5bf..958eefc
--- a/Extensions/Compass/stylesheets/compass/typography/lists/_bullets.scss
+++ b/Extensions/Compass/stylesheets/compass/typography/lists/_bullets.scss
@@ -1,16 +1,14 @@
// Turn off the bullet for an element of a list
@mixin no-bullet {
- list-style-image: none;
- list-style-type: none;
- margin-left: 0;
+ list-style-image : none;
+ list-style-type : none;
+ margin-left : 0;
}
// turns off the bullets for an entire list
@mixin no-bullets {
list-style: none;
- li {
- @include no-bullet;
- }
+ li { @include no-bullet; }
}
// Make a list(ul/ol) have an image bullet.
diff --git a/Extensions/Compass/stylesheets/compass/typography/lists/_horizontal-list.scss b/Extensions/Compass/stylesheets/compass/typography/lists/_horizontal-list.scss
old mode 100755
new mode 100644
index 642786d..159b659
--- a/Extensions/Compass/stylesheets/compass/typography/lists/_horizontal-list.scss
+++ b/Extensions/Compass/stylesheets/compass/typography/lists/_horizontal-list.scss
@@ -24,8 +24,7 @@
// to have a horizontal layout. Used to implement +horizontal-list.
@mixin horizontal-list-container {
@include reset-box-model;
- @include clearfix;
-}
+ @include clearfix; }
// Can be mixed into any li selector that is meant to participate in a horizontal layout.
// Used to implement +horizontal-list.
@@ -46,15 +45,9 @@
left: $padding;
right: $padding;
}
- &:first-child, &.first {
- padding-#{$direction}: 0;
- }
- &:last-child {
- padding-#{opposite-position($direction)}: 0;
- }
- &.last {
- padding-#{opposite-position($direction)}: 0;
- }
+ &:first-child, &.first { padding-#{$direction}: 0; }
+ &:last-child { padding-#{opposite-position($direction)}: 0; }
+ &.last { padding-#{opposite-position($direction)}: 0; }
}
}
@@ -65,6 +58,4 @@
@mixin horizontal-list($padding: 4px, $direction: left) {
@include horizontal-list-container;
li {
- @include horizontal-list-item($padding, $direction);
- }
-}
+ @include horizontal-list-item($padding, $direction); } }
diff --git a/Extensions/Compass/stylesheets/compass/typography/lists/_inline-block-list.scss b/Extensions/Compass/stylesheets/compass/typography/lists/_inline-block-list.scss
old mode 100755
new mode 100644
index 946290c..7c698c9
--- a/Extensions/Compass/stylesheets/compass/typography/lists/_inline-block-list.scss
+++ b/Extensions/Compass/stylesheets/compass/typography/lists/_inline-block-list.scss
@@ -27,8 +27,7 @@
// Can be mixed into any selector that target a ul or ol that is meant
// to have an inline-block layout. Used to implement `inline-block-list`.
@mixin inline-block-list-container {
- @include horizontal-list-container;
-}
+ @include horizontal-list-container; }
// Can be mixed into any li selector that is meant to participate in a horizontal layout.
// Used to implement `inline-block-list`.
@@ -40,8 +39,7 @@
padding: {
left: $padding;
right: $padding;
- }
- ;
+ };
}
}
@@ -49,6 +47,4 @@
@mixin inline-block-list($padding: false) {
@include inline-block-list-container;
li {
- @include inline-block-list-item($padding);
- }
-}
+ @include inline-block-list-item($padding); } }
diff --git a/Extensions/Compass/stylesheets/compass/typography/lists/_inline-list.scss b/Extensions/Compass/stylesheets/compass/typography/lists/_inline-list.scss
old mode 100755
new mode 100644
index 5e60f5c..caff6fd
--- a/Extensions/Compass/stylesheets/compass/typography/lists/_inline-list.scss
+++ b/Extensions/Compass/stylesheets/compass/typography/lists/_inline-list.scss
@@ -26,18 +26,12 @@
@mixin delimited-list($separator: ", ") {
@include inline-list;
li {
- &:after {
- content: $separator;
- }
+ &:after { content: $separator; }
&:last-child {
- &:after {
- content: "";
- }
+ &:after { content: ""; }
}
&.last {
- &:after {
- content: "";
- }
+ &:after { content: ""; }
}
}
}
diff --git a/Extensions/Compass/stylesheets/compass/typography/text/_ellipsis.scss b/Extensions/Compass/stylesheets/compass/typography/text/_ellipsis.scss
old mode 100755
new mode 100644
index 6ad8cca..3b3db25
--- a/Extensions/Compass/stylesheets/compass/typography/text/_ellipsis.scss
+++ b/Extensions/Compass/stylesheets/compass/typography/text/_ellipsis.scss
@@ -9,12 +9,17 @@ $use-mozilla-ellipsis-binding: false !default;
// published [here](http://mattsnider.com/css/css-string-truncation-with-ellipsis/).
// Firefox implementation by [Rikkert Koppes](http://www.rikkertkoppes.com/thoughts/2008/6/).
@mixin ellipsis($no-wrap: true) {
- @if $no-wrap {
- white-space: nowrap;
- }
+ @if $no-wrap { white-space: nowrap; }
overflow: hidden;
- @include experimental(text-overflow, ellipsis, not -moz, not -webkit, -o, -ms, not -khtml, official);
+ @include experimental(text-overflow, ellipsis,
+ not -moz,
+ not -webkit,
+ -o,
+ -ms,
+ not -khtml,
+ official
+ );
@if $experimental-support-for-mozilla and $use-mozilla-ellipsis-binding {
- -moz-binding: stylesheet-url(unquote("xml/ellipsis.xml#ellipsis"));
+ -moz-binding: stylesheet-url(unquote("xml/ellipsis.xml#ellipsis"));
}
}
diff --git a/Extensions/Compass/stylesheets/compass/typography/text/_force-wrap.scss b/Extensions/Compass/stylesheets/compass/typography/text/_force-wrap.scss
old mode 100755
new mode 100644
index c39bcec..8a14e8f
--- a/Extensions/Compass/stylesheets/compass/typography/text/_force-wrap.scss
+++ b/Extensions/Compass/stylesheets/compass/typography/text/_force-wrap.scss
@@ -1,20 +1,12 @@
// Prevent long urls and text from breaking layouts
// [originally from perishablepress.com](http://perishablepress.com/press/2010/06/01/wrapping-content/)
@mixin force-wrap {
- white-space: pre;
-// CSS 2.0
- white-space: pre-wrap;
-// CSS 2.1
- white-space: pre-line;
-// CSS 3.0
- white-space: -pre-wrap;
-// Opera 4-6
- white-space: -o-pre-wrap;
-// Opera 7
- white-space: -moz-pre-wrap;
-// Mozilla
- white-space: -hp-pre-wrap;
-// HP Printers
- word-wrap: break-word;
-// IE 5+
+ white-space: pre; // CSS 2.0
+ white-space: pre-wrap; // CSS 2.1
+ white-space: pre-line; // CSS 3.0
+ white-space: -pre-wrap; // Opera 4-6
+ white-space: -o-pre-wrap; // Opera 7
+ white-space: -moz-pre-wrap; // Mozilla
+ white-space: -hp-pre-wrap; // HP Printers
+ word-wrap: break-word; // IE 5+
}
diff --git a/Extensions/Compass/stylesheets/compass/typography/text/_nowrap.scss b/Extensions/Compass/stylesheets/compass/typography/text/_nowrap.scss
old mode 100755
new mode 100644
index d1fcd05..1613dd6
--- a/Extensions/Compass/stylesheets/compass/typography/text/_nowrap.scss
+++ b/Extensions/Compass/stylesheets/compass/typography/text/_nowrap.scss
@@ -1,4 +1,2 @@
// When remembering whether or not there's a hyphen in white-space is too hard
-@mixin nowrap {
- white-space: nowrap;
-}
+@mixin nowrap { white-space: nowrap; }
diff --git a/Extensions/Compass/stylesheets/compass/typography/text/_replacement.scss b/Extensions/Compass/stylesheets/compass/typography/text/_replacement.scss
old mode 100755
new mode 100644
index af597bf..703571b
--- a/Extensions/Compass/stylesheets/compass/typography/text/_replacement.scss
+++ b/Extensions/Compass/stylesheets/compass/typography/text/_replacement.scss
@@ -17,18 +17,16 @@ $hide-text-direction: left !default;
@mixin replace-text($img, $x: 50%, $y: 50%) {
@include hide-text;
background: {
- @if is-url($img) {
- image: $img;
- } @else {
- image: image-url($img);
- }
- repeat: no-repeat;
- position: $x $y;
+ @if is-url($img) {
+ image: $img;
+ } @else {
+ image: image-url($img);
+ }
+ repeat: no-repeat;
+ position: $x $y;
+ };
}
-;
- }
-
// Like the `replace-text` mixin, but also sets the width
// and height of the element according the dimensions of the image.
//
@@ -53,7 +51,7 @@ $hide-text-direction: left !default;
overflow: hidden;
text-align: left;
} @else {
- // slightly wider than the box prevents issues with inline-block elements
+ // slightly wider than the box prevents issues with inline-block elements
text-indent: 110%;
white-space: nowrap;
overflow: hidden;
diff --git a/Extensions/Compass/stylesheets/compass/utilities/_color.scss b/Extensions/Compass/stylesheets/compass/utilities/_color.scss
old mode 100755
new mode 100644
index e330ee6..0cc7fd1
--- a/Extensions/Compass/stylesheets/compass/utilities/_color.scss
+++ b/Extensions/Compass/stylesheets/compass/utilities/_color.scss
@@ -1 +1 @@
-@import "color/color/_contrast";
\ No newline at end of file
+@import "color/contrast";
\ No newline at end of file
diff --git a/Extensions/Compass/stylesheets/compass/utilities/_general.scss b/Extensions/Compass/stylesheets/compass/utilities/_general.scss
old mode 100755
new mode 100644
index ca1f3e7..047e636
--- a/Extensions/Compass/stylesheets/compass/utilities/_general.scss
+++ b/Extensions/Compass/stylesheets/compass/utilities/_general.scss
@@ -1,6 +1,6 @@
@import "general/reset";
-@import "general/general/_clearfix";
-@import "general/general/_float";
-@import "general/general/_tag-cloud";
-@import "general/general/_hacks";
-@import "general/general/_min";
+@import "general/clearfix";
+@import "general/float";
+@import "general/tag-cloud";
+@import "general/hacks";
+@import "general/min";
diff --git a/Extensions/Compass/stylesheets/compass/utilities/_links.scss b/Extensions/Compass/stylesheets/compass/utilities/_links.scss
new file mode 100644
index 0000000..e0e3251
--- /dev/null
+++ b/Extensions/Compass/stylesheets/compass/utilities/_links.scss
@@ -0,0 +1,5 @@
+@warn "This import is deprecated. Use 'compass/typography/links' instead.";
+
+@import "../typography/links/hover-link";
+@import "../typography/links/link-colors";
+@import "../typography/links/unstyled-link";
diff --git a/Extensions/Compass/stylesheets/compass/utilities/_lists.scss b/Extensions/Compass/stylesheets/compass/utilities/_lists.scss
new file mode 100644
index 0000000..4833ee1
--- /dev/null
+++ b/Extensions/Compass/stylesheets/compass/utilities/_lists.scss
@@ -0,0 +1,6 @@
+@warn "This import is deprecated. Use 'compass/typography/lists' instead.";
+
+@import "../typography/lists/horizontal-list";
+@import "../typography/lists/inline-list";
+@import "../typography/lists/inline-block-list";
+@import "../typography/lists/bullets";
diff --git a/Extensions/Compass/stylesheets/compass/utilities/_print.scss b/Extensions/Compass/stylesheets/compass/utilities/_print.scss
old mode 100755
new mode 100644
index a453b56..4771e08
--- a/Extensions/Compass/stylesheets/compass/utilities/_print.scss
+++ b/Extensions/Compass/stylesheets/compass/utilities/_print.scss
@@ -4,22 +4,14 @@
// Note: these aren't semantic.
@mixin print-utilities($media: print) {
@if $media == print {
- .noprint, .no-print {
- display: none;
- }
+ .noprint, .no-print { display: none; }
#{elements-of-type(block)} {
- &.print-only {
- display: block;
- }
+ &.print-only { display: block; }
}
#{elements-of-type(inline)} {
- &.print-only {
- display: inline;
- }
+ &.print-only { display: inline; }
}
} @else {
- .print-only {
- display: none;
- }
+ .print-only { display: none; }
}
}
diff --git a/Extensions/Compass/stylesheets/compass/utilities/_sprites.scss b/Extensions/Compass/stylesheets/compass/utilities/_sprites.scss
old mode 100755
new mode 100644
index ce5f73a..0066804
--- a/Extensions/Compass/stylesheets/compass/utilities/_sprites.scss
+++ b/Extensions/Compass/stylesheets/compass/utilities/_sprites.scss
@@ -1,2 +1,2 @@
-@import "sprites/sprites/_base";
-@import "sprites/sprites/_sprite-img";
+@import "sprites/base";
+@import "sprites/sprite-img";
diff --git a/Extensions/Compass/stylesheets/compass/utilities/_tables.scss b/Extensions/Compass/stylesheets/compass/utilities/_tables.scss
old mode 100755
new mode 100644
index e8f53db..4af1d51
--- a/Extensions/Compass/stylesheets/compass/utilities/_tables.scss
+++ b/Extensions/Compass/stylesheets/compass/utilities/_tables.scss
@@ -1,3 +1,3 @@
-@import "tables/tables/_alternating-rows-and-columns";
-@import "tables/tables/_borders";
-@import "tables/tables/_scaffolding";
+@import "tables/alternating-rows-and-columns";
+@import "tables/borders";
+@import "tables/scaffolding";
diff --git a/Extensions/Compass/stylesheets/compass/utilities/_text.scss b/Extensions/Compass/stylesheets/compass/utilities/_text.scss
new file mode 100644
index 0000000..bb73c25
--- /dev/null
+++ b/Extensions/Compass/stylesheets/compass/utilities/_text.scss
@@ -0,0 +1,5 @@
+@warn "This import is deprecated. Use 'compass/typography/text' instead.";
+
+@import "../typography/text/ellipsis";
+@import "../typography/text/nowrap";
+@import "../typography/text/replacement";
diff --git a/Extensions/Compass/stylesheets/compass/utilities/color/_contrast.scss b/Extensions/Compass/stylesheets/compass/utilities/color/_contrast.scss
old mode 100755
new mode 100644
index 49bbc7d..fc73905
--- a/Extensions/Compass/stylesheets/compass/utilities/color/_contrast.scss
+++ b/Extensions/Compass/stylesheets/compass/utilities/color/_contrast.scss
@@ -1,24 +1,28 @@
-$contrasted-dark-default: #000 !default;
-$contrasted-light-default: #fff !default;
+$contrasted-dark-default: #000 !default;
+$contrasted-light-default: #fff !default;
$contrasted-lightness-threshold: 30% !default;
// Returns the `$light` color when the `$color` is dark
// and the `$dark` color when the `$color` is light.
// The `$threshold` is a percent between `0%` and `100%` and it determines
// when the lightness of `$color` changes from "dark" to "light".
-@function contrast-color($color,
-$dark: $contrasted-dark-default,
-$light: $contrasted-light-default,
-$threshold: $contrasted-lightness-threshold) {
+@function contrast-color(
+ $color,
+ $dark: $contrasted-dark-default,
+ $light: $contrasted-light-default,
+ $threshold: $contrasted-lightness-threshold
+) {
@return if(lightness($color) < $threshold, $light, $dark)
}
// Sets the specified background color and calculates a dark or light contrasted text color.
// The arguments are passed through to the [contrast-color function](#function-contrast-color).
-@mixin contrasted($background-color,
-$dark: $contrasted-dark-default,
-$light: $contrasted-light-default,
-$threshold: $contrasted-lightness-threshold) {
+@mixin contrasted(
+ $background-color,
+ $dark: $contrasted-dark-default,
+ $light: $contrasted-light-default,
+ $threshold: $contrasted-lightness-threshold
+) {
background-color: $background-color;
color: contrast-color($background-color, $dark, $light, $threshold);
}
\ No newline at end of file
diff --git a/Extensions/Compass/stylesheets/compass/utilities/general/_clearfix.scss b/Extensions/Compass/stylesheets/compass/utilities/general/_clearfix.scss
old mode 100755
new mode 100644
index e4cafb5..73f9254
--- a/Extensions/Compass/stylesheets/compass/utilities/general/_clearfix.scss
+++ b/Extensions/Compass/stylesheets/compass/utilities/general/_clearfix.scss
@@ -20,12 +20,12 @@
// outside the bounds of the container at the expense of more tricky CSS.
@mixin legacy-pie-clearfix {
&:after {
- content: "\0020";
- display: block;
- height: 0;
- clear: both;
- overflow: hidden;
- visibility: hidden;
+ content : "\0020";
+ display : block;
+ height : 0;
+ clear : both;
+ overflow : hidden;
+ visibility : hidden;
}
@include has-layout;
}
diff --git a/Extensions/Compass/stylesheets/compass/utilities/general/_float.scss b/Extensions/Compass/stylesheets/compass/utilities/general/_float.scss
old mode 100755
new mode 100644
index 3088905..914f184
--- a/Extensions/Compass/stylesheets/compass/utilities/general/_float.scss
+++ b/Extensions/Compass/stylesheets/compass/utilities/general/_float.scss
@@ -1,21 +1,18 @@
// Implementation of float:left with fix for the
// [double-margin bug in IE5/6](http://www.positioniseverything.net/explorer/doubled-margin.html)
@mixin float-left {
- @include float(left);
-}
+ @include float(left); }
// Implementation of float:right with fix for the
// [double-margin bug in IE5/6](http://www.positioniseverything.net/explorer/doubled-margin.html)
@mixin float-right {
- @include float(right);
-}
+ @include float(right); }
// Direction independent float mixin that fixes the
// [double-margin bug in IE5/6](http://www.positioniseverything.net/explorer/doubled-margin.html)
@mixin float($side: left) {
display: inline;
- float: unquote($side);
-}
+ float: unquote($side); }
// Resets floated elements back to their default of `float: none` and defaults
// to `display: block` unless you pass `inline` as an argument
@@ -30,5 +27,4 @@
// +reset-float
@mixin reset-float($display: block) {
float: none;
- display: $display;
-}
\ No newline at end of file
+ display: $display; }
\ No newline at end of file
diff --git a/Extensions/Compass/stylesheets/compass/utilities/general/_hacks.scss b/Extensions/Compass/stylesheets/compass/utilities/general/_hacks.scss
old mode 100755
new mode 100644
index bf3d800..d5a6bae
--- a/Extensions/Compass/stylesheets/compass/utilities/general/_hacks.scss
+++ b/Extensions/Compass/stylesheets/compass/utilities/general/_hacks.scss
@@ -29,12 +29,10 @@ $default-has-layout-approach: zoom !default;
@mixin has-layout-block {
@if $legacy-support-for-ie {
- // This makes ie6 get layout
+ // This makes ie6 get layout
display: inline-block;
- // and this puts it back to block
- & {
- display: block;
- }
+ // and this puts it back to block
+ & { display: block; }
}
}
diff --git a/Extensions/Compass/stylesheets/compass/utilities/general/_min.scss b/Extensions/Compass/stylesheets/compass/utilities/general/_min.scss
old mode 100755
new mode 100644
index 5d9528c..99a676b
--- a/Extensions/Compass/stylesheets/compass/utilities/general/_min.scss
+++ b/Extensions/Compass/stylesheets/compass/utilities/general/_min.scss
@@ -3,17 +3,14 @@
//**
// Cross browser min-height mixin.
@mixin min-height($value) {
- @include hacked-minimum(height, $value);
-}
+ @include hacked-minimum(height, $value); }
//**
// Cross browser min-width mixin.
@mixin min-width($value) {
- @include hacked-minimum(width, $value);
-}
+ @include hacked-minimum(width, $value); }
// @private This mixin is not meant to be used directly.
@mixin hacked-minimum($property, $value) {
min-#{$property}: $value;
- @include bang-hack($property, auto, $value);
-}
+ @include bang-hack($property, auto, $value); }
diff --git a/Extensions/Compass/stylesheets/compass/utilities/general/_reset.scss b/Extensions/Compass/stylesheets/compass/utilities/general/_reset.scss
new file mode 100644
index 0000000..f5f6487
--- /dev/null
+++ b/Extensions/Compass/stylesheets/compass/utilities/general/_reset.scss
@@ -0,0 +1,2 @@
+// This module has moved.
+@import "compass/reset/utilities";
\ No newline at end of file
diff --git a/Extensions/Compass/stylesheets/compass/utilities/general/_tabs.scss b/Extensions/Compass/stylesheets/compass/utilities/general/_tabs.scss
old mode 100755
new mode 100644
diff --git a/Extensions/Compass/stylesheets/compass/utilities/general/_tag-cloud.scss b/Extensions/Compass/stylesheets/compass/utilities/general/_tag-cloud.scss
old mode 100755
new mode 100644
index 796b6e1..7ccae05
--- a/Extensions/Compass/stylesheets/compass/utilities/general/_tag-cloud.scss
+++ b/Extensions/Compass/stylesheets/compass/utilities/general/_tag-cloud.scss
@@ -3,24 +3,16 @@
font-size: $base-size;
line-height: 1.2 * $base-size;
.xxs, .xs, .s, .l, .xl, .xxl {
- line-height: 1.2 * $base-size;
- }
+ line-height: 1.2 * $base-size; }
.xxs {
- font-size: $base-size / 2;
- }
+ font-size: $base-size / 2; }
.xs {
- font-size: 2 * $base-size / 3;
- }
+ font-size: 2 * $base-size / 3; }
.s {
- font-size: 3 * $base-size / 4;
- }
+ font-size: 3 * $base-size / 4; }
.l {
- font-size: 4 * $base-size / 3;
- }
+ font-size: 4 * $base-size / 3; }
.xl {
- font-size: 3 * $base-size / 2;
- }
+ font-size: 3 * $base-size / 2; }
.xxl {
- font-size: 2 * $base-size;
- }
-}
+ font-size: 2 * $base-size; } }
diff --git a/Extensions/Compass/stylesheets/compass/utilities/links/_hover-link.scss b/Extensions/Compass/stylesheets/compass/utilities/links/_hover-link.scss
new file mode 100644
index 0000000..843459f
--- /dev/null
+++ b/Extensions/Compass/stylesheets/compass/utilities/links/_hover-link.scss
@@ -0,0 +1,3 @@
+@warn "This import is deprecated. Use 'compass/typography/links/hover-link' instead.";
+
+@import "../../typography/links/hover-link";
diff --git a/Extensions/Compass/stylesheets/compass/utilities/links/_link-colors.scss b/Extensions/Compass/stylesheets/compass/utilities/links/_link-colors.scss
new file mode 100644
index 0000000..fac9438
--- /dev/null
+++ b/Extensions/Compass/stylesheets/compass/utilities/links/_link-colors.scss
@@ -0,0 +1,3 @@
+@warn "This import is deprecated. Use 'compass/typography/links/link-colors' instead.";
+
+@import "../../typography/links/link-colors";
diff --git a/Extensions/Compass/stylesheets/compass/utilities/links/_unstyled-link.scss b/Extensions/Compass/stylesheets/compass/utilities/links/_unstyled-link.scss
new file mode 100644
index 0000000..1c48f46
--- /dev/null
+++ b/Extensions/Compass/stylesheets/compass/utilities/links/_unstyled-link.scss
@@ -0,0 +1,3 @@
+@warn "This import is deprecated. Use 'compass/typography/links/unstyled-link' instead.";
+
+@import "../../typography/links/unstyled-link";
diff --git a/Extensions/Compass/stylesheets/compass/utilities/lists/_bullets.scss b/Extensions/Compass/stylesheets/compass/utilities/lists/_bullets.scss
new file mode 100644
index 0000000..796e1cd
--- /dev/null
+++ b/Extensions/Compass/stylesheets/compass/utilities/lists/_bullets.scss
@@ -0,0 +1,3 @@
+@warn "This import is deprecated. Use 'compass/typography/lists/bullets' instead.";
+
+@import "../../typography/lists/bullets";
diff --git a/Extensions/Compass/stylesheets/compass/utilities/lists/_horizontal-list.scss b/Extensions/Compass/stylesheets/compass/utilities/lists/_horizontal-list.scss
new file mode 100644
index 0000000..38ae85c
--- /dev/null
+++ b/Extensions/Compass/stylesheets/compass/utilities/lists/_horizontal-list.scss
@@ -0,0 +1,3 @@
+@warn "This import is deprecated. Use 'compass/typography/lists/horizontal-list' instead.";
+
+@import "../../typography/lists/horizontal-list";
diff --git a/Extensions/Compass/stylesheets/compass/utilities/lists/_inline-block-list.scss b/Extensions/Compass/stylesheets/compass/utilities/lists/_inline-block-list.scss
new file mode 100644
index 0000000..5d4a129
--- /dev/null
+++ b/Extensions/Compass/stylesheets/compass/utilities/lists/_inline-block-list.scss
@@ -0,0 +1,3 @@
+@warn "This import is deprecated. Use 'compass/typography/lists/inline-block-list' instead.";
+
+@import "../../typography/lists/inline-block-list";
diff --git a/Extensions/Compass/stylesheets/compass/utilities/lists/_inline-list.scss b/Extensions/Compass/stylesheets/compass/utilities/lists/_inline-list.scss
new file mode 100644
index 0000000..fb1dfeb
--- /dev/null
+++ b/Extensions/Compass/stylesheets/compass/utilities/lists/_inline-list.scss
@@ -0,0 +1,3 @@
+@warn "This import is deprecated. Use 'compass/typography/lists/inline-list' instead.";
+
+@import "../../typography/lists/inline-list";
diff --git a/Extensions/Compass/stylesheets/compass/utilities/sprites/_base.scss b/Extensions/Compass/stylesheets/compass/utilities/sprites/_base.scss
old mode 100755
new mode 100644
index 66edc53..1b268a8
--- a/Extensions/Compass/stylesheets/compass/utilities/sprites/_base.scss
+++ b/Extensions/Compass/stylesheets/compass/utilities/sprites/_base.scss
@@ -12,11 +12,12 @@ $sprite-selectors: hover, target, active !default;
// sprite of the given `$sprite` name. You can move the image relative to its
// natural position by passing `$offset-x` and `$offset-y`.
@mixin sprite-background-position($map, $sprite, $offset-x: 0, $offset-y: 0) {
- background-position: sprite-position($map, $sprite, $offset-x, $offset-y);
+ background-position: sprite-position($map, $sprite, $offset-x, $offset-y);
}
+
// Determines if you want to include magic selectors in your sprites
-$disable-magic-sprite-selectors: false !default;
+$disable-magic-sprite-selectors:false !default;
// Include the position and (optionally) dimensions of this `$sprite`
// in the given sprite `$map`. The sprite url should come from either a base
@@ -40,7 +41,7 @@ $disable-magic-sprite-selectors: false !default;
@each $selector in $sprite-selectors {
@if sprite_has_selector($map, $sprite-name, $selector) {
&:#{$selector}, &.#{$full-sprite-name}_#{$selector}, &.#{$full-sprite-name}-#{$selector} {
- @include sprite-background-position($map, "#{$sprite-name}_#{$selector}", $offset-x, $offset-y);
+ @include sprite-background-position($map, "#{$sprite-name}_#{$selector}", $offset-x, $offset-y);
}
}
}
@@ -57,9 +58,7 @@ $disable-magic-sprite-selectors: false !default;
@if sprite_does_not_have_parent($map, $sprite-name) {
$full-sprite-name: "#{$prefix}-#{$sprite-name}";
.#{$full-sprite-name} {
- @if $base-class {
- @extend #{$base-class};
- }
+ @if $base-class { @extend #{$base-class}; }
@include sprite($map, $sprite-name, $dimensions, $offset-x, $offset-y);
}
}
diff --git a/Extensions/Compass/stylesheets/compass/utilities/sprites/_sprite-img.scss b/Extensions/Compass/stylesheets/compass/utilities/sprites/_sprite-img.scss
old mode 100755
new mode 100644
index 620bfa8..ff90c00
--- a/Extensions/Compass/stylesheets/compass/utilities/sprites/_sprite-img.scss
+++ b/Extensions/Compass/stylesheets/compass/utilities/sprites/_sprite-img.scss
@@ -28,12 +28,12 @@ $sprite-image-default-height: $sprite-default-size !default;
// To reduce duplication use a sprite-bg mixin for common properties and a sprite-select mixin for positioning.
@mixin sprite-img($img, $col, $row: 1, $width: $sprite-image-default-width, $height: $sprite-image-default-height, $margin: $sprite-default-margin) {
@include sprite-background($img, $width, $height);
- @include sprite-position($col, $row, $width, $height, $margin);
+ @include sprite-position($col, $row, $width, $height, $margin);
}
// Sets rules common for all sprites, assumes you want a square, but allows a rectangular region.
@mixin sprite-background($img, $width: $sprite-default-size, $height: $width) {
- @include sprite-background-rectangle($img, $width, $height);
+ @include sprite-background-rectangle($img, $width, $height);
}
// Sets rules common for all sprites, assumes a rectangular region.
@@ -41,34 +41,30 @@ $sprite-image-default-height: $sprite-default-size !default;
background: image-url($img) no-repeat;
width: $width;
height: $height;
- overflow: hidden;
+ overflow: hidden;
}
// Allows horizontal sprite positioning optimized for a single row of sprites.
@mixin sprite-column($col, $width: $sprite-image-default-width, $margin: $sprite-default-margin) {
- @include sprite-position($col, 1, $width, 0px, $margin);
+ @include sprite-position($col, 1, $width, 0px, $margin);
}
// Allows vertical sprite positioning optimized for a single column of sprites.
@mixin sprite-row($row, $height: $sprite-image-default-height, $margin: $sprite-default-margin) {
- @include sprite-position(1, $row, 0px, $height, $margin);
+ @include sprite-position(1, $row, 0px, $height, $margin);
}
// Allows vertical and horizontal sprite positioning from a grid of equal dimensioned sprites.
@mixin sprite-position($col, $row: 1, $width: $sprite-image-default-width, $height: $sprite-image-default-height, $margin: $sprite-default-margin) {
$x: ($col - 1) * -$width - ($col - 1) * $margin;
$y: ($row - 1) * -$height - ($row - 1) * $margin;
- background-position: $x $y;
+ background-position: $x $y;
}
-// Similar to 'sprite-replace-text-with-dimensions' but does not autmaticly set the demensions
-@mixin sprite-replace-text
-(
-$map,
-$sprite,
-$dimensions: false, $offset-x: 0, $offset-y: 0)
-{
+
+// Similar to 'sprite-replace-text-with-dimensions' but does not autmaticly set the demensions
+@mixin sprite-replace-text ($map, $sprite, $dimensions: false, $offset-x: 0, $offset-y: 0) {
@include hide-text;
@include sprite($map, $sprite, $dimensions, $offset-x, $offset-y);
background-image: $map;
@@ -78,24 +74,6 @@ $dimensions: false, $offset-x: 0, $offset-y: 0)
// Similar to 'replace-text-with-dimensions' but with sprites
// To use, create your sprite and then pass it in the `$map` param
// The name of the image in the sprite folder should be `$img-name`
-@mixin sprite-replace-text-with-dimensions
-
-(
-$map,
-$sprite,
-$offset-x: 0, $offset-y: 0)
-{
- @include sprite-replace-text
-(
-$map
-,
-$sprite
-,
-true
-,
-$offset-x
-,
-$offset-y
-)
-;
+@mixin sprite-replace-text-with-dimensions ($map, $sprite, $offset-x: 0, $offset-y: 0){
+ @include sprite-replace-text ($map, $sprite, true, $offset-x, $offset-y);
}
\ No newline at end of file
diff --git a/Extensions/Compass/stylesheets/compass/utilities/tables/_alternating-rows-and-columns.scss b/Extensions/Compass/stylesheets/compass/utilities/tables/_alternating-rows-and-columns.scss
old mode 100755
new mode 100644
index 59285c3..4da78e2
--- a/Extensions/Compass/stylesheets/compass/utilities/tables/_alternating-rows-and-columns.scss
+++ b/Extensions/Compass/stylesheets/compass/utilities/tables/_alternating-rows-and-columns.scss
@@ -2,33 +2,21 @@
th {
background-color: $header-color;
&.even, &:nth-child(2n) {
- background-color: $header-color - $dark-intersection;
- }
- }
+ background-color: $header-color - $dark-intersection; } }
tr {
&.odd, &:nth-child(2n+1) {
td {
- background-color: $odd-row-color;
- &.even, &:nth-child(2n) {
- background-color: $odd-row-color - $dark-intersection;
- }
- }
+ background-color: $odd-row-color;
+ &.even, &:nth-child(2n) {
+ background-color: $odd-row-color - $dark-intersection; } } }
}
- }
tr.even {
td {
background-color: $even-row-color;
&.even, &:nth-child(2n) {
- background-color: $even-row-color - $dark-intersection;
- }
- }
- }
+ background-color: $even-row-color - $dark-intersection; } } }
tfoot {
th, td {
background-color: $footer-color;
&.even, &:nth-child(2n) {
- background-color: $footer-color - $dark-intersection;
- }
- }
- }
-}
+ background-color: $footer-color - $dark-intersection; } } } }
diff --git a/Extensions/Compass/stylesheets/compass/utilities/tables/_borders.scss b/Extensions/Compass/stylesheets/compass/utilities/tables/_borders.scss
old mode 100755
new mode 100644
index 0251824..120896d
--- a/Extensions/Compass/stylesheets/compass/utilities/tables/_borders.scss
+++ b/Extensions/Compass/stylesheets/compass/utilities/tables/_borders.scss
@@ -2,20 +2,13 @@
border: $width solid $color;
thead {
th {
- border-bottom: $width solid $color;
- }
- }
+ border-bottom: $width solid $color; } }
tfoot {
th, td {
- border-top: $width solid $color;
- }
- }
+ border-top: $width solid $color; } }
th {
&:first-child {
- border-right: $width solid $color;
- }
- }
-}
+ border-right: $width solid $color; } } }
@mixin inner-table-borders($width: 2px, $color: black) {
th, td {
@@ -23,14 +16,10 @@
right: $width solid $color;
bottom: $width solid $color;
left-width: 0px;
- top-width: 0px;
- }
- ;
+ top-width: 0px; };
&:last-child,
&.last {
- border-right-width: 0px;
- }
- }
+ border-right-width: 0px; } }
// IE8 ignores rules that are included on the same line as :last-child
// see http://www.richardscarrott.co.uk/posts/view/ie8-last-child-bug for details
@@ -38,13 +27,7 @@
tbody, tfoot {
tr:last-child {
th, td {
- border-bottom-width: 0px;
- }
- }
+ border-bottom-width: 0px; } }
tr.last {
th, td {
- border-bottom-width: 0px;
- }
- }
- }
-}
+ border-bottom-width: 0px; } } } }
diff --git a/Extensions/Compass/stylesheets/compass/utilities/tables/_scaffolding.scss b/Extensions/Compass/stylesheets/compass/utilities/tables/_scaffolding.scss
old mode 100755
new mode 100644
index 7954314..cc19d04
--- a/Extensions/Compass/stylesheets/compass/utilities/tables/_scaffolding.scss
+++ b/Extensions/Compass/stylesheets/compass/utilities/tables/_scaffolding.scss
@@ -1,13 +1,9 @@
@mixin table-scaffolding {
th {
text-align: center;
- font-weight: bold;
- }
+ font-weight: bold; }
td,
th {
padding: 2px;
&.numeric {
- text-align: right;
- }
- }
-}
+ text-align: right; } } }
diff --git a/Extensions/Compass/stylesheets/compass/utilities/text/_ellipsis.scss b/Extensions/Compass/stylesheets/compass/utilities/text/_ellipsis.scss
new file mode 100644
index 0000000..b172754
--- /dev/null
+++ b/Extensions/Compass/stylesheets/compass/utilities/text/_ellipsis.scss
@@ -0,0 +1,3 @@
+@warn "This import is deprecated. Use 'compass/typography/text/ellipsis' instead.";
+
+@import "../../typography/text/ellipsis";
diff --git a/Extensions/Compass/stylesheets/compass/utilities/text/_nowrap.scss b/Extensions/Compass/stylesheets/compass/utilities/text/_nowrap.scss
new file mode 100644
index 0000000..ca4a22f
--- /dev/null
+++ b/Extensions/Compass/stylesheets/compass/utilities/text/_nowrap.scss
@@ -0,0 +1,3 @@
+@warn "This import is deprecated. Use 'compass/typography/text/nowrap' instead.";
+
+@import "../../typography/text/nowrap";
diff --git a/Extensions/Compass/stylesheets/compass/utilities/text/_replacement.scss b/Extensions/Compass/stylesheets/compass/utilities/text/_replacement.scss
new file mode 100644
index 0000000..809c6a8
--- /dev/null
+++ b/Extensions/Compass/stylesheets/compass/utilities/text/_replacement.scss
@@ -0,0 +1,3 @@
+@warn "This import is deprecated. Use 'compass/typography/text/replacement' instead.";
+
+@import "../../typography/text/replacement";
diff --git a/Extensions/Compass/test.php b/Extensions/Compass/test.php
new file mode 100644
index 0000000..9cf176c
--- /dev/null
+++ b/Extensions/Compass/test.php
@@ -0,0 +1,62 @@
+extensions as $extensionName) {
+ $namespace = ucwords(preg_replace('/[^0-9a-z]+/', '_', strtolower($extensionName)));
+ $extensionPath = realpath(__DIR__.'/../' . $namespace . '/' . $namespace . '.php');
+ if (file_exists($extensionPath)) {
+ require_once($extensionPath);
+ $hook = $namespace . '::resolveExtensionPath';
+ $returnPath = call_user_func($hook, $file, $parser);
+ if (!empty($returnPath)) {
+ $paths[] = $returnPath;
+ }
+
+ }
+ }
+
+ return $paths;
+}
+
+function getFunctions($extensions)
+{
+ $output = array();
+ if (!empty($extensions)) {
+ foreach ($extensions as $extension) {
+ $name = explode('/', $extension, 2);
+ $namespace = ucwords(preg_replace('/[^0-9a-z]+/', '_', strtolower(array_shift($name))));
+ $extensionPath = realpath(__DIR__.'/../' . $namespace . '/' . $namespace . '.php');
+ if (file_exists(
+ $extensionPath
+ )
+ ) {
+ require_once($extensionPath);
+ $namespace = $namespace . '::';
+ $function = 'getFunctions';
+ $output = array_merge($output, call_user_func($namespace . $function, $namespace));
+ }
+ }
+ }
+
+ return $output;
+}
+
+$path = realpath(__DIR__).'/../..';
+$library = $path . '/SassParser.php';
+
+require_once ($library);
+
+$options = array(
+ 'style' => 'expanded',
+ 'cache' => false,
+ 'syntax' => 'scss',
+ 'debug' => false,
+ 'debug_info' => false,
+ 'load_path_functions' => array('loadCallback'),
+ 'load_paths' => array(dirname($file)),
+ 'functions' => getFunctions(array('Compass','Own')),
+ 'extensions' => array('Compass','Own')
+);
+$parser = new SassParser($options);
+return $parser->toCss($file);
\ No newline at end of file
diff --git a/test-extensions.php b/test-extensions.php
new file mode 100755
index 0000000..476c9b7
--- /dev/null
+++ b/test-extensions.php
@@ -0,0 +1,147 @@
+
+
+
+ PHamlP Test Suite
+
+
+
+ $test) {
+ if (isset($_GET['name']) && $name != $_GET['name']) {
+ continue;
+ }
+ if (isset($_GET['skip']) && $name && preg_match('/(^|,)(' . preg_quote($name) . ')(,|$)/', $_GET['skip'])) {
+ continue;
+ }
+ if (count($test) > 1) {
+ $result = test_files($test, $test_dir);
+
+ if ($result === TRUE) {
+ print "\n\tPASS $name
";
+ }
+ else {
+ print "\n\tFAIL $name
";
+ print "$result
";
+ }
+ flush();
+
+ if ($i++ == 100) {
+ die;
+ }
+ }
+ }
+
+ function test_files($files, $dir = '.') {
+ sort($files);
+ foreach ($files as $i => $file) {
+ $name = explode('.', $file);
+ $ext = array_pop($name);
+
+ $fn = 'parse_' . $ext;
+ if (function_exists($fn)) {
+ try {
+ $result = $fn($dir . '/' . $file);
+ } catch (Exception $e) {
+ return $e->__toString();
+ }
+ file_put_contents('/tmp/scss_test_' . $i, trim($result) . "\n");
+ }
+ }
+
+ $diff = exec('diff -ibwB /tmp/scss_test_0 /tmp/scss_test_1', $out);
+ if (count($out)) {
+ if (isset($_GET['full'])) {
+ $out[] = "\n\n\n" . $result;
+ }
+ return implode("\n", $out);
+ } else {
+ return TRUE;
+ }
+ }
+
+
+ function parse_scss($file) {
+ return __parse($file, 'scss');
+ }
+ function parse_sass($file) {
+ return __parse($file, 'sass');
+ }
+ function parse_css($file) {
+ return file_get_contents($file);
+ }
+
+ function __parse($file, $syntax, $style = 'nested') {
+ global $extensions_dir;
+ foreach ($extensions_dir as $item) {
+ if ($item->isDir() && !$item->isDot()) {
+ $extensionTest = $item->getRealPath().'/test.php';
+ if (file_exists($extensionTest)) {
+ $result = include $extensionTest;
+ return $result;
+ }
+ }
+ }
+ }
+
+ function cb_warn($message, $context) {
+ print "WARN : ";
+ print_r($message);
+ print "
";
+ }
+ function cb_debug($message) {
+ print "DEBUG : ";
+ print_r($message);
+ print "
";
+ }
+
+ function find_files($dir) {
+ $op = opendir($dir);
+ $return = array('by_type' => array(), 'by_name' => array());
+ if ($op) {
+ while (false !== ($file = readdir($op))) {
+ if (substr($file, 0, 1) == '.') {
+ continue;
+ }
+ $name = explode('.', $file);
+ $ext = array_pop($name);
+ $return['by_type'][$ext] = $file;
+ $name = implode('.', $name);
+ if (!isset($return['by_name'][$name])) {
+ $return['by_name'][$name] = array();
+ }
+ $return['by_name'][$name][] = $name . '.' . $ext;
+ }
+ }
+ asort($return['by_name']);
+ asort($return['by_type']);
+ return $return;
+ }
+ ?>
+
+
diff --git a/test.php b/test.php
index 7b5e49d..0e8e924 100755
--- a/test.php
+++ b/test.php
@@ -67,7 +67,7 @@ function test_files($files, $dir = '.') {
try {
$result = $fn($dir . '/' . $file);
} catch (Exception $e) {
- $result = $e->__toString();
+ return $e->__toString();
}
file_put_contents('/tmp/scss_test_' . $i, trim($result) . "\n");
}
diff --git a/tests/extensions/linear_gradient_compass.css b/tests/extensions/linear_gradient_compass.css
new file mode 100644
index 0000000..21e9cd5
--- /dev/null
+++ b/tests/extensions/linear_gradient_compass.css
@@ -0,0 +1,5 @@
+p {
+ background-image: -webkit-linear-gradient(bottom, #eff4f8 23%, white 62%);
+ background-image: -moz-linear-gradient(bottom, #eff4f8 23%, white 62%);
+ background-image: linear-gradient(bottom, #eff4f8 23%, white 62%);
+}
\ No newline at end of file
diff --git a/tests/extensions/linear_gradient_compass.scss b/tests/extensions/linear_gradient_compass.scss
new file mode 100644
index 0000000..73a9d78
--- /dev/null
+++ b/tests/extensions/linear_gradient_compass.scss
@@ -0,0 +1,7 @@
+@import "compass/compass";
+
+p {
+ @include background-image(
+ linear-gradient(bottom, #eff4f8 23%, #fff 62%)
+ );
+}
\ No newline at end of file