Browse Source

Changed compass Sass to use not as function.

This is "not" ideal, but it's necessary because of
https://github.com/sass/libsass/issues/368
master
Michael Hellein 11 years ago
parent
commit
6fcca275e6
  1. 2
      lib/compass/css3/_appearance.scss
  2. 14
      lib/compass/css3/_background-clip.scss
  3. 10
      lib/compass/css3/_background-origin.scss
  4. 2
      lib/compass/css3/_background-size.scss
  5. 28
      lib/compass/css3/_border-radius.scss
  6. 2
      lib/compass/css3/_box-shadow.scss
  7. 2
      lib/compass/css3/_box-sizing.scss
  8. 18
      lib/compass/css3/_box.scss
  9. 24
      lib/compass/css3/_columns.scss
  10. 2
      lib/compass/css3/_filter.scss
  11. 8
      lib/compass/css3/_hyphenation.scss
  12. 2
      lib/compass/css3/_images.scss
  13. 4
      lib/compass/css3/_regions.scss
  14. 4
      lib/compass/css3/_transform-legacy.scss
  15. 16
      lib/compass/css3/_transform.scss
  16. 8
      lib/compass/css3/_transition.scss
  17. 2
      lib/compass/css3/_user-interface.scss
  18. 12
      lib/compass/typography/_vertical_rhythm.scss
  19. 6
      lib/compass/typography/text/_ellipsis.scss
  20. 2
      lib/compass/utilities/sprites/_base.scss

2
lib/compass/css3/_appearance.scss

@ -11,6 +11,6 @@
@mixin appearance($ap) {
$ap: unquote($ap);
@include experimental(appearance, $ap,
-moz, -webkit, not -o, not -ms, not -khtml, official
-moz, -webkit, not(-o), not(-ms), not(-khtml), official
);
}

14
lib/compass/css3/_background-clip.scss

@ -27,16 +27,16 @@ $default-background-clip: padding-box !default;
@include experimental(background-clip, $deprecated,
-moz,
-webkit,
not -o,
not -ms,
not -khtml,
not(-o),
not(-ms),
not(-khtml),
not official
);
@include experimental(background-clip, $clip,
not -moz,
not -webkit,
not -o,
not -ms,
not(-moz),
not(-webkit),
not(-o),
not(-ms),
-khtml,
official
);

10
lib/compass/css3/_background-origin.scss

@ -26,14 +26,14 @@ $default-background-origin: content-box !default;
@include experimental(background-origin, $deprecated,
-moz,
-webkit,
not -o,
not -ms,
not -khtml,
not(-o),
not(-ms),
not(-khtml),
not official
);
@include experimental(background-origin, $origin,
not -moz,
not -webkit,
not(-moz),
not(-webkit),
-o,
-ms,
-khtml,

2
lib/compass/css3/_background-size.scss

@ -22,5 +22,5 @@ $default-background-size: 100% auto !default;
) {
$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);
@include experimental(background-size, $sizes, -moz, -webkit, -o, not(-ms), not(-khtml));
}

28
lib/compass/css3/_border-radius.scss

@ -42,18 +42,18 @@ $default-border-radius: 5px !default;
// 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,
not(-moz),
-webkit,
not -o,
not -ms,
not -khtml,
not(-o),
not(-ms),
not(-khtml),
not official
);
@include experimental("border-radius", $radius unquote("/") $vertical-radius,
-moz,
not -webkit,
not -o,
not -ms,
not(-webkit),
not(-o),
not(-ms),
-khtml,
official
);
@ -72,17 +72,17 @@ $default-border-radius: 5px !default;
// 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(-webkit),
not(-o),
not(-ms),
not(-khtml),
not official
);
@include experimental("border-#{$vert}-#{$horz}-radius", $radius,
not -moz,
not(-moz),
-webkit,
not -o,
not -ms,
not(-o),
not(-ms),
-khtml,
official
);

2
lib/compass/css3/_box-shadow.scss

@ -45,7 +45,7 @@ $default-box-shadow-inset : false !default;
}
$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
-moz, -webkit, not(-o), not(-ms), not(-khtml), official
);
}

2
lib/compass/css3/_box-sizing.scss

@ -8,6 +8,6 @@
@mixin box-sizing($bs) {
$bs: unquote($bs);
@include experimental(box-sizing, $bs,
-moz, -webkit, not -o, not -ms, not -khtml, official
-moz, -webkit, not(-o), not(-ms), not(-khtml), official
);
}

18
lib/compass/css3/_box.scss

@ -3,7 +3,7 @@
// 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
-moz, -webkit, not(-o), -ms, not(-khtml), official
);
}
@ -16,7 +16,7 @@ $default-box-orient: horizontal !default;
) {
$orientation : unquote($orientation);
@include experimental(box-orient, $orientation,
-moz, -webkit, not -o, -ms, not -khtml, official
-moz, -webkit, not(-o), -ms, not(-khtml), official
);
}
@ -29,7 +29,7 @@ $default-box-align: stretch !default;
) {
$alignment : unquote($alignment);
@include experimental(box-align, $alignment,
-moz, -webkit, not -o, -ms, not -khtml, official
-moz, -webkit, not(-o), -ms, not(-khtml), official
);
}
@ -43,7 +43,7 @@ $default-box-flex: 0 !default;
$flex: $default-box-flex
) {
@include experimental(box-flex, $flex,
-moz, -webkit, not -o, -ms, not -khtml, official
-moz, -webkit, not(-o), -ms, not(-khtml), official
);
}
@ -55,7 +55,7 @@ $default-box-flex-group: 1 !default;
$group: $default-box-flex-group
) {
@include experimental(box-flex-group, $group,
-moz, -webkit, not -o, -ms, not -khtml, official
-moz, -webkit, not(-o), -ms, not(-khtml), official
);
}
@ -67,7 +67,7 @@ $default-box-ordinal-group: 1 !default;
$group: $default-ordinal-flex-group
) {
@include experimental(box-ordinal-group, $group,
-moz, -webkit, not -o, -ms, not -khtml, official
-moz, -webkit, not(-o), -ms, not(-khtml), official
);
}
@ -80,7 +80,7 @@ $default-box-direction: normal !default;
) {
$direction: unquote($direction);
@include experimental(box-direction, $direction,
-moz, -webkit, not -o, -ms, not -khtml, official
-moz, -webkit, not(-o), -ms, not(-khtml), official
);
}
@ -93,7 +93,7 @@ $default-box-lines: single !default;
) {
$lines: unquote($lines);
@include experimental(box-lines, $lines,
-moz, -webkit, not -o, -ms, not -khtml, official
-moz, -webkit, not(-o), -ms, not(-khtml), official
);
}
@ -106,6 +106,6 @@ $default-box-pack: start !default;
) {
$pack: unquote($pack);
@include experimental(box-pack, $pack,
-moz, -webkit, not -o, -ms, not -khtml, official
-moz, -webkit, not(-o), -ms, not(-khtml), official
);
}

24
lib/compass/css3/_columns.scss

@ -7,35 +7,35 @@
// @include columns(20em 2)
@mixin columns($width-and-count) {
@include experimental(columns, $width-and-count,
-moz, -webkit, -o, -ms, not -khtml, official
-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
-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
-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
-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
-moz, -webkit, -o, -ms, not(-khtml), official
);
}
@ -43,7 +43,7 @@
// This works like border-style.
@mixin column-rule-style($style) {
@include experimental(column-rule-style, unquote($style),
-moz, -webkit, -o, -ms, not -khtml, official
-moz, -webkit, -o, -ms, not(-khtml), official
);
}
@ -51,7 +51,7 @@
// This works like border-color.
@mixin column-rule-color($color) {
@include experimental(column-rule-color, $color,
-moz, -webkit, -o, -ms, not -khtml, official
-moz, -webkit, -o, -ms, not(-khtml), official
);
}
@ -66,7 +66,7 @@
@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
-moz, -webkit, -o, -ms, not(-khtml), official
);
}
@ -83,7 +83,7 @@
// -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 );
@include experimental(column-break-before, $value, not(-moz), -webkit, not(-o), not(-ms), not(-khtml), official );
}
// Mixin for setting column-break-after
@ -99,7 +99,7 @@
// -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 );
@include experimental(column-break-after, $value, not(-moz), -webkit, not(-o), not(-ms), not(-khtml), official );
}
// Mixin for setting column-break-inside
@ -114,7 +114,7 @@
// -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 );
@include experimental(column-break-inside, $value, not(-moz), -webkit, not(-o), not(-ms), not(-khtml), official );
}
// All-purpose mixin for setting column breaks.
@ -144,5 +144,5 @@
// 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 );
@include experimental("column-break-#{$type}", $value, not(-moz), -webkit, not(-o), not(-ms), not(-khtml), official );
}

2
lib/compass/css3/_filter.scss

@ -18,6 +18,6 @@
) {
$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
-moz, -webkit, not(-o), not(-ms), not(-khtml), official
);
}

8
lib/compass/css3/_hyphenation.scss

@ -21,16 +21,16 @@
@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
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
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
not(-moz), not(-webkit), not(-o), -ms, not(-khtml), official
);
}
}
@ -51,7 +51,7 @@
//
@mixin hyphens($value: auto){
@include experimental(hyphens, $value,
-moz, -webkit, not -o, not -ms, not -khtml, official
-moz, -webkit, not(-o), not(-ms), not(-khtml), official
);
}

2
lib/compass/css3/_images.scss

@ -43,7 +43,7 @@
$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; }
@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);
}

4
lib/compass/css3/_regions.scss

@ -10,13 +10,13 @@
@mixin flow-into($target) {
$target: unquote($target);
@include experimental(flow-into, $target,
not -moz, -webkit, not -o, -ms, not -khtml, not official
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
not(-moz), -webkit, not(-o), -ms, not(-khtml), not official
);
}

4
lib/compass/css3/_transform-legacy.scss

@ -8,7 +8,7 @@
@mixin apply-transform($transform) {
@include experimental(transform, $transform,
-moz, -webkit, -o, not -ms, not -khtml, official
-moz, -webkit, -o, not(-ms), not(-khtml), official
);
}
@ -16,7 +16,7 @@
@mixin apply-origin($origin) {
@include experimental(transform-origin, $origin,
-moz, -webkit, -o, not -ms, not -khtml, official
-moz, -webkit, -o, not(-ms), not(-khtml), official
);
}

16
lib/compass/css3/_transform.scss

@ -104,11 +104,11 @@ $default-skew-y : 5deg !default;
$only3d: $only3d or -compass-list-size(-compass-list($origin)) > 2;
@if $only3d {
@include experimental(transform-origin, $origin,
-moz, -webkit, -o, -ms, not -khtml, official
-moz, -webkit, -o, -ms, not(-khtml), official
);
} @else {
@include experimental(transform-origin, $origin,
-moz, -webkit, -o, -ms, not -khtml, official
-moz, -webkit, -o, -ms, not(-khtml), official
);
}
}
@ -147,11 +147,11 @@ $default-skew-y : 5deg !default;
) {
@if $only3d {
@include experimental(transform, $transform,
-moz, -webkit, -o, -ms, not -khtml, official
-moz, -webkit, -o, -ms, not(-khtml), official
);
} @else {
@include experimental(transform, $transform,
-moz, -webkit, -o, -ms, not -khtml, official
-moz, -webkit, -o, -ms, not(-khtml), official
);
}
}
@ -179,7 +179,7 @@ $default-skew-y : 5deg !default;
// 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
-moz, -webkit, -o, -ms, not(-khtml), official
);
}
@ -190,7 +190,7 @@ $default-skew-y : 5deg !default;
// 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
-moz, -webkit, -o, -ms, not(-khtml), official
);
}
@ -202,7 +202,7 @@ $default-skew-y : 5deg !default;
// 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
-moz, -webkit, -o, -ms, not(-khtml), official
);
}
@ -214,7 +214,7 @@ $default-skew-y : 5deg !default;
// 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
-moz, -webkit, -o, -ms, not(-khtml), official
);
}

8
lib/compass/css3/_transition.scss

@ -68,7 +68,7 @@ $transitionable-prefixed-values: transform, transform-origin !default;
@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
-moz, -webkit, -o, not(-ms), not(-khtml), official
);
}
@ -92,7 +92,7 @@ $transitionable-prefixed-values: transform, transform-origin !default;
$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
-moz, -webkit, -o, not(-ms), not(-khtml), official
);
}
@ -115,7 +115,7 @@ $transitionable-prefixed-values: transform, transform-origin !default;
@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
-moz, -webkit, -o, not(-ms), not(-khtml), official
);
}
@ -214,7 +214,7 @@ $transitionable-prefixed-values: transform, transform-origin !default;
// Checks if the value given is a unit of time.
@function is-time($value) {
@if type-of($value) == number {
@return not not index(s ms, unit($value));
@return not(not(index(s ms, unit($value))));
} @else {
@return false;
}

2
lib/compass/css3/_user-interface.scss

@ -12,6 +12,6 @@
@mixin user-select($select) {
$select: unquote($select);
@include experimental(user-select, $select,
-moz, -webkit, not -o, not -ms, -khtml, official
-moz, -webkit, not(-o), not(-ms), -khtml, official
);
}

12
lib/compass/typography/_vertical_rhythm.scss

@ -46,10 +46,10 @@ $base-half-leader: $base-leader / 2;
// True if a number has an absolute unit.
@function absolute-unit($number) {
@return not (relative-unit($number) or unitless($number));
@return not(relative-unit($number) or unitless($number));
}
@if $relative-font-sizing and not relative-unit($font-unit) {
@if $relative-font-sizing and not(relative-unit($font-unit)) {
@warn "$relative-font-sizing is true but $font-unit is set to #{$font-unit} which is not a relative unit.";
}
@ -93,7 +93,7 @@ $base-half-leader: $base-leader / 2;
// defaults to the smallest integer that is large enough to fit the font.
// Use $from-size to adjust from a font-size other than the base font-size.
@mixin adjust-font-size-to($to-size, $lines: lines-for-font-size($to-size), $from-size: $base-font-size) {
@if not $relative-font-sizing and $from-size != $base-font-size {
@if not($relative-font-sizing) and $from-size != $base-font-size {
@warn "$relative-font-sizing is false but a relative font size was passed to adjust-font-size-to";
}
font-size: $font-unit * $to-size / $from-size;
@ -114,7 +114,7 @@ $base-half-leader: $base-leader / 2;
$font-size: $base-font-size,
$offset: 0
) {
@if not $relative-font-sizing and $font-size != $base-font-size {
@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;
@ -177,7 +177,7 @@ $base-half-leader: $base-leader / 2;
// Apply a border and whitespace to any side without destroying the vertical
// rhythm. The whitespace must be greater than the width of the border.
@mixin apply-side-rhythm-border($side, $width: 1px, $lines: 1, $font-size: $base-font-size, $border-style: $default-rhythm-border-style) {
@if not $relative-font-sizing and $font-size != $base-font-size {
@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 apply-side-rhythm-border";
}
border-#{$side}: {
@ -189,7 +189,7 @@ $base-half-leader: $base-leader / 2;
// Apply borders and whitespace equally to all sides.
@mixin rhythm-borders($width: 1px, $lines: 1, $font-size: $base-font-size, $border-style: $default-rhythm-border-style) {
@if not $relative-font-sizing and $font-size != $base-font-size {
@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 rhythm-borders";
}
border: {

6
lib/compass/typography/text/_ellipsis.scss

@ -12,11 +12,11 @@ $use-mozilla-ellipsis-binding: false !default;
@if $no-wrap { white-space: nowrap; }
overflow: hidden;
@include experimental(text-overflow, ellipsis,
not -moz,
not -webkit,
not(-moz),
not(-webkit),
-o,
-ms,
not -khtml,
not(-khtml),
official
);
@if $experimental-support-for-mozilla and $use-mozilla-ellipsis-binding {

2
lib/compass/utilities/sprites/_base.scss

@ -29,7 +29,7 @@ $disable-magic-sprite-selectors:false !default;
@if $dimensions {
@include sprite-dimensions($map, $sprite);
}
@if not $disable-magic-sprite-selectors {
@if not($disable-magic-sprite-selectors) {
@include sprite-selectors($map, $sprite, $sprite, $offset-x, $offset-y);
}
}

Loading…
Cancel
Save