stylesheets/flint/mixins/lib/_flint-calculate.scss in flint-gs-1.0.8 vs stylesheets/flint/mixins/lib/_flint-calculate.scss in flint-gs-1.0.9
- old
+ new
@@ -104,11 +104,11 @@
}
@include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft);
@include debugPrintInstance($calcKey);
- } @else if $calcGutter == "alpha" or $calcGutter == "no-left" and get-value(settings, gutter) != false {
+ } @else if $calcGutter == "alpha" or $calcGutter == "no-left" or $calcGutter == "first" and get-value(settings, gutter) != false {
$outputWidth: (calc-width($calcKey, $calcSpan)) - (calc-margin($calcKey, $calcSpan));
$outputMarginRight: calc-margin($calcKey, $calcSpan);
$outputMarginLeft: ( if( $calcShift > 0,
calc-width($calcKey, $calcShift),
@@ -120,11 +120,11 @@
}
@include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft);
@include debugPrintInstance($calcKey);
- } @else if $calcGutter == "omega" or $calcGutter == "no-right" and get-value(settings, gutter) != false {
+ } @else if $calcGutter == "omega" or $calcGutter == "no-right" or $calcGutter == "last" and get-value(settings, gutter) != false {
$outputWidth: (calc-width($calcKey, $calcSpan)) - ((calc-margin($calcKey, $calcSpan)));
$outputMarginRight: 0;
$outputMarginLeft: ( if( $calcShift > 0,
(calc-margin($calcKey, $calcSpan)) + (calc-width($calcKey, $calcShift)),
@@ -241,11 +241,11 @@
@include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft);
@include debugPrintInstance($calcKey);
}
- } @else if $calcGutter == "alpha" or $calcGutter == "no-left" and get-value(settings, gutter) != false {
+ } @else if $calcGutter == "alpha" or $calcGutter == "no-left" or $calcGutter == "first" and get-value(settings, gutter) != false {
@if $calcContext == "auto" {
@if $exists != false {
$outputWidth: (calc-width($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))) - (calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))));
@@ -280,11 +280,11 @@
@include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft);
@include debugPrintInstance($calcKey);
}
- } @else if $calcGutter == "omega" or $calcGutter == "no-right" and get-value(settings, gutter) != false {
+ } @else if $calcGutter == "omega" or $calcGutter == "no-right" or $calcGutter == "last" and get-value(settings, gutter) != false {
@if $calcContext == "auto" {
@if $exists != false {
$outputWidth: (calc-width($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))) - ((calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))));
@@ -428,11 +428,11 @@
@include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft);
@include debugPrintInstance($calcKey);
}
- } @else if $calcGutter == "alpha" or $calcGutter == "no-left" and get-value(settings, gutter) != false {
+ } @else if $calcGutter == "alpha" or $calcGutter == "no-left" or $calcGutter == "first" and get-value(settings, gutter) != false {
@if $calcContext == "auto" {
@if $exists != false {
$outputWidth: (calc-width($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))) - (calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))));
@@ -461,11 +461,11 @@
@include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft);
@include debugPrintInstance($calcKey);
}
- } @else if $calcGutter == "omega" or $calcGutter =="no-right" and get-value(settings, gutter) != false {
+ } @else if $calcGutter == "omega" or $calcGutter =="no-right" or $calcGutter == "last" and get-value(settings, gutter) != false {
@if $calcContext == "auto" {
@if $exists != false {
$outputWidth: (calc-width($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))) - (calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))));
@@ -557,11 +557,11 @@
}
@include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft);
@include debugPrintInstance($calcKey);
- } @else if $calcGutter == "alpha" or $calcGutter == "no-left" and get-value(settings, gutter) != false {
+ } @else if $calcGutter == "alpha" or $calcGutter == "no-left" or $calcGutter == "first" and get-value(settings, gutter) != false {
$outputWidth: (calc-width($calcKey, $calcSpan)) - (calc-margin($calcKey, $calcSpan));
$outputMarginRight: calc-margin($calcKey, $calcSpan);
$outputMarginLeft: 0;
@@ -570,10 +570,10 @@
}
@include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft);
@include debugPrintInstance($calcKey);
- } @else if $calcGutter == "omega" or $calcGutter == "no-right" and get-value(settings, gutter) != false {
+ } @else if $calcGutter == "omega" or $calcGutter == "no-right" or $calcGutter == "last" and get-value(settings, gutter) != false {
$outputWidth: (calc-width($calcKey, $calcSpan)) - (calc-margin($calcKey, $calcSpan));
$outputMarginRight: 0;
$outputMarginLeft: calc-margin($calcKey, $calcSpan);
\ No newline at end of file