stylesheets/flint/mixins/lib/_flint-calculate.scss in flint-gs-1.2.0 vs stylesheets/flint/mixins/lib/_flint-calculate.scss in flint-gs-1.3.0

- old
+ new

@@ -154,39 +154,57 @@ @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); @include debugPrintInstance($calcKey); } } @else if $calcContext != NULL { - // Check if context of parent instance exists + // Check if parent instance exists $exists: get-family-instance($calcKey); @if $calcShift != NULL { @if $calcGutter == NULL or $calcGutter == "normal" or $calcGutter == "default" or $calcGutter == "regular" and get-value(settings, gutter) != false { // Check if context is set to auto - @if $calcContext == "auto" { + @if $calcContext == "auto"{ // Does parent exist? @if $exists != false { + @if get-value(settings, grid) == "fluid" { - $outputWidth: (calc-width($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))) - ((calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))))*2); - $outputMarginRight: calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); - $outputMarginLeft: ( if( $calcShift > 0, - (calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))) + (calc-width($calcKey, $calcShift, to-number(get-instance-value($calcKey, span)))), - (calc-margin($calcKey, -$calcSpan, to-number(get-instance-value($calcKey, span)))) + (calc-width($calcKey, $calcShift, to-number(get-instance-value($calcKey, span)))) - )); + $outputWidth: (calc-width($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))) - ((calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))))*2); + $outputMarginRight: calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); + $outputMarginLeft: ( if( $calcShift > 0, + (calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))) + (calc-width($calcKey, $calcShift, to-number(get-instance-value($calcKey, span)))), + (calc-margin($calcKey, -$calcSpan, to-number(get-instance-value($calcKey, span)))) + (calc-width($calcKey, $calcShift, to-number(get-instance-value($calcKey, span)))) + )); - @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { - @content; - } + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } - @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); - @include debugPrintInstance($calcKey); - + @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); + @include debugPrintInstance($calcKey); + + } @else if get-value(settings, grid) == "fixed" { + // Get parent width instead of parent span for fixed grids + $outputWidth: (to-number(get-instance-value($calcKey, output, width)) / to-number(get-instance-value($calcKey, span)) * $calcSpan) - ((calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))))*2); + $outputMarginRight: calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); + $outputMarginLeft: ( if( $calcShift > 0, + (calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))) + (calc-width($calcKey, $calcShift, to-number(get-instance-value($calcKey, span)))), + (calc-margin($calcKey, -$calcSpan, to-number(get-instance-value($calcKey, span)))) + (calc-width($calcKey, $calcShift, to-number(get-instance-value($calcKey, span)))) + )); + + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } + + @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); + @include debugPrintInstance($calcKey); + + } } @else { // Else warn that context should not be set to `auto` @warn "You set context to `#{$calcContext}`, but a parent instance could not be found for `#{selector_string()}`"; } - // Output styles normally if not set to auto + // Output styles normally if not set to auto } @else { $outputWidth: (calc-width($calcKey, $calcSpan, $calcContext)) - ((calc-margin($calcKey, $calcSpan, $calcContext))*2); $outputMarginRight: calc-margin($calcKey, $calcSpan, $calcContext); $outputMarginLeft: ( if( $calcShift > 0, @@ -204,25 +222,43 @@ } @else if $calcGutter == "inside" and get-value(settings, gutter) != false { @if $calcContext == "auto" { @if $exists != false { + @if get-value(settings, grid) == "fluid" { - $outputWidth: (calc-width($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))) - ((calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))))*4); - $outputMarginRight: calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); - $outputMarginLeft: ( if( $calcShift > 0, - (calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))) + (calc-width($calcKey, $calcShift, to-number(get-instance-value($calcKey, span)))), - (calc-margin($calcKey, -$calcSpan, to-number(get-instance-value($calcKey, span)))) + (calc-width($calcKey, $calcShift, to-number(get-instance-value($calcKey, span)))) - )); + $outputWidth: (calc-width($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))) - ((calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))))*4); + $outputMarginRight: calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); + $outputMarginLeft: ( if( $calcShift > 0, + (calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))) + (calc-width($calcKey, $calcShift, to-number(get-instance-value($calcKey, span)))), + (calc-margin($calcKey, -$calcSpan, to-number(get-instance-value($calcKey, span)))) + (calc-width($calcKey, $calcShift, to-number(get-instance-value($calcKey, span)))) + )); - @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { - @content; - } + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } - @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); - @include debugPrintInstance($calcKey); - + @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); + @include debugPrintInstance($calcKey); + + } @else if get-value(settings, grid) == "fixed" { + + $outputWidth: (to-number(get-instance-value($calcKey, output, width)) / to-number(get-instance-value($calcKey, span)) * $calcSpan) - ((calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))))*4); + $outputMarginRight: calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); + $outputMarginLeft: ( if( $calcShift > 0, + (calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))) + (calc-width($calcKey, $calcShift, to-number(get-instance-value($calcKey, span)))), + (calc-margin($calcKey, -$calcSpan, to-number(get-instance-value($calcKey, span)))) + (calc-width($calcKey, $calcShift, to-number(get-instance-value($calcKey, span)))) + )); + + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } + + @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); + @include debugPrintInstance($calcKey); + + } } @else { // Else warn that context should not be set to `auto` @warn "You set context to `#{$calcContext}`, but a parent instance could not be found for `#{selector_string()}`"; } // Output styles normally if not set to auto @@ -245,25 +281,43 @@ } @else if $calcGutter == "alpha" or $calcGutter == "no-left" or $calcGutter == "first" and get-value(settings, gutter) != false { @if $calcContext == "auto" { @if $exists != false { + @if get-value(settings, grid) == "fluid" { - $outputWidth: (calc-width($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))) - (calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))); - $outputMarginRight: calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); - $outputMarginLeft: ( if( $calcShift > 0, - calc-width($calcKey, $calcShift, to-number(get-instance-value($calcKey, span))), - calc-width($calcKey, $calcShift, to-number(get-instance-value($calcKey, span))) - )); + $outputWidth: (calc-width($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))) - (calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))); + $outputMarginRight: calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); + $outputMarginLeft: ( if( $calcShift > 0, + calc-width($calcKey, $calcShift, to-number(get-instance-value($calcKey, span))), + calc-width($calcKey, $calcShift, to-number(get-instance-value($calcKey, span))) + )); - @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { - @content; - } + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } - @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); - @include debugPrintInstance($calcKey); + @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); + @include debugPrintInstance($calcKey); + } @else if get-value(settings, grid) == "fixed" { + + $outputWidth: (to-number(get-instance-value($calcKey, output, width)) / to-number(get-instance-value($calcKey, span)) * $calcSpan) - ((calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))))); + $outputMarginRight: calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); + $outputMarginLeft: ( if( $calcShift > 0, + calc-width($calcKey, $calcShift, to-number(get-instance-value($calcKey, span))), + calc-width($calcKey, $calcShift, to-number(get-instance-value($calcKey, span))) + )); + + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } + + @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); + @include debugPrintInstance($calcKey); + + } } @else { @warn "You set context to `#{$calcContext}`, but a parent instance could not be found for `#{selector_string()}`"; } } @else { @@ -284,25 +338,43 @@ } @else if $calcGutter == "omega" or $calcGutter == "no-right" or $calcGutter == "last" and get-value(settings, gutter) != false { @if $calcContext == "auto" { @if $exists != false { + @if get-value(settings, grid) == "fluid" { - $outputWidth: (calc-width($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))) - ((calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))))); - $outputMarginRight: 0; - $outputMarginLeft: ( if( $calcShift > 0, - (calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))) + (calc-width($calcKey, $calcShift, to-number(get-instance-value($calcKey, span)))), - (calc-margin($calcKey, -$calcSpan, to-number(get-instance-value($calcKey, span)))) + (calc-width($calcKey, $calcShift, to-number(get-instance-value($calcKey, span)))) - )); + $outputWidth: (calc-width($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))) - ((calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))))); + $outputMarginRight: 0; + $outputMarginLeft: ( if( $calcShift > 0, + (calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))) + (calc-width($calcKey, $calcShift, to-number(get-instance-value($calcKey, span)))), + (calc-margin($calcKey, -$calcSpan, to-number(get-instance-value($calcKey, span)))) + (calc-width($calcKey, $calcShift, to-number(get-instance-value($calcKey, span)))) + )); - @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { - @content; - } + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } - @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); - @include debugPrintInstance($calcKey); + @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); + @include debugPrintInstance($calcKey); + } @else if get-value(settings, grid) == "fixed" { + + $outputWidth: (to-number(get-instance-value($calcKey, output, width)) / to-number(get-instance-value($calcKey, span)) * $calcSpan) - ((calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))))); + $outputMarginRight: 0; + $outputMarginLeft: ( if( $calcShift > 0, + (calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))) + (calc-width($calcKey, $calcShift, to-number(get-instance-value($calcKey, span)))), + (calc-margin($calcKey, -$calcSpan, to-number(get-instance-value($calcKey, span)))) + (calc-width($calcKey, $calcShift, to-number(get-instance-value($calcKey, span)))) + )); + + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } + + @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); + @include debugPrintInstance($calcKey); + + } } @else { @warn "You set context to `#{$calcContext}`, but a parent instance could not be found for `#{selector_string()}`"; } } @else { @@ -323,25 +395,43 @@ } @else if $calcGutter == "row" or $calcGutter == "none" or get-value(settings, gutter) == false { @if $calcContext == "auto" { @if $exists != false { + @if get-value(settings, grid) == "fluid" { - $outputWidth: (calc-width($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))); - $outputMarginRight: 0; - $outputMarginLeft: ( if( $calcShift > 0, - calc-width($calcKey, $calcShift, to-number(get-instance-value($calcKey, span))), - calc-width($calcKey, $calcShift, to-number(get-instance-value($calcKey, span))) - )); + $outputWidth: (calc-width($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))); + $outputMarginRight: 0; + $outputMarginLeft: ( if( $calcShift > 0, + calc-width($calcKey, $calcShift, to-number(get-instance-value($calcKey, span))), + calc-width($calcKey, $calcShift, to-number(get-instance-value($calcKey, span))) + )); - @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { - @content; - } + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } - @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); - @include debugPrintInstance($calcKey); + @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); + @include debugPrintInstance($calcKey); + } @else if get-value(settings, grid) == "fixed" { + + $outputWidth: (to-number(get-instance-value($calcKey, output, width)) / to-number(get-instance-value($calcKey, span)) * $calcSpan); + $outputMarginRight: 0; + $outputMarginLeft: ( if( $calcShift > 0, + calc-width($calcKey, $calcShift, to-number(get-instance-value($calcKey, span))), + calc-width($calcKey, $calcShift, to-number(get-instance-value($calcKey, span))) + )); + + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } + + @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); + @include debugPrintInstance($calcKey); + + } } @else { @warn "You set context to `#{$calcContext}`, but a parent instance could not be found for `#{selector_string()}`"; } } @else { @@ -360,31 +450,42 @@ @include debugPrintInstance($calcKey); } } } @else { @if $calcGutter == NULL or $calcGutter == "normal" or $calcGutter == "default" or $calcGutter == "regular" and get-value(settings, gutter) != false { - // Check if context is set to auto @if $calcContext == "auto" { - // Did it exist? @if $exists != false { + @if get-value(settings, grid) == "fluid" { - $outputWidth: (calc-width($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))) - ((calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))))*2); - $outputMarginRight: calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); - $outputMarginLeft: calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); + $outputWidth: (calc-width($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))) - ((calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))))*2); + $outputMarginRight: calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); + $outputMarginLeft: calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); - @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { - @content; - } + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } - @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); - @include debugPrintInstance($calcKey); + @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); + @include debugPrintInstance($calcKey); + } @else if get-value(settings, grid) == "fixed" { + + $outputWidth: (to-number(get-instance-value($calcKey, output, width)) / to-number(get-instance-value($calcKey, span)) * $calcSpan) - ((calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))))*2); + $outputMarginRight: calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); + $outputMarginLeft: calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); + + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } + + @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); + @include debugPrintInstance($calcKey); + + } } @else { - // Else warn that context should not be set to `auto` @warn "You set context to `#{$calcContext}`, but a parent instance could not be found for `#{selector_string()}`"; } - // Output styles normally if not set to auto } @else { $outputWidth: (calc-width($calcKey, $calcSpan, $calcContext)) - ((calc-margin($calcKey, $calcSpan, $calcContext))*2); $outputMarginRight: calc-margin($calcKey, $calcSpan, $calcContext); $outputMarginLeft: calc-margin($calcKey, $calcSpan, $calcContext); @@ -399,22 +500,38 @@ } @else if $calcGutter == "inside" and get-value(settings, gutter) != false { @if $calcContext == "auto" { @if $exists != false { + @if get-value(settings, grid) == "fluid" { - $outputWidth: (calc-width($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))) - ((calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))))*4); - $outputMarginRight: calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); - $outputMarginLeft: calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); + $outputWidth: (calc-width($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))) - ((calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))))*4); + $outputMarginRight: calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); + $outputMarginLeft: calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); - @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { - @content; - } + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } - @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); - @include debugPrintInstance($calcKey); + @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); + @include debugPrintInstance($calcKey); + } @else if get-value(settings, grid) == "fixed" { + + $outputWidth: (to-number(get-instance-value($calcKey, output, width)) / to-number(get-instance-value($calcKey, span)) * $calcSpan) - ((calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))))*4); + $outputMarginRight: calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); + $outputMarginLeft: calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); + + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } + + @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); + @include debugPrintInstance($calcKey); + + } + } @else { @warn "You set context to `#{$calcContext}`, but a parent instance could not be found for `#{selector_string()}`"; } } @else { @@ -432,22 +549,37 @@ } @else if $calcGutter == "alpha" or $calcGutter == "no-left" or $calcGutter == "first" and get-value(settings, gutter) != false { @if $calcContext == "auto" { @if $exists != false { + @if get-value(settings, grid) == "fluid" { - $outputWidth: (calc-width($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))) - (calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))); - $outputMarginRight: calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); - $outputMarginLeft: 0; + $outputWidth: (calc-width($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))) - (calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))); + $outputMarginRight: calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); + $outputMarginLeft: 0; - @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { - @content; - } + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } - @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); - @include debugPrintInstance($calcKey); + @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); + @include debugPrintInstance($calcKey); + } @else if get-value(settings, grid) == "fixed" { + + $outputWidth: (to-number(get-instance-value($calcKey, output, width)) / to-number(get-instance-value($calcKey, span)) * $calcSpan) - ((calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))))); + $outputMarginRight: calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); + $outputMarginLeft: 0; + + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } + + @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); + @include debugPrintInstance($calcKey); + + } } @else { @warn "You set context to `#{$calcContext}`, but a parent instance could not be found for `#{selector_string()}`"; } } @else { @@ -465,22 +597,37 @@ } @else if $calcGutter == "omega" or $calcGutter =="no-right" or $calcGutter == "last" and get-value(settings, gutter) != false { @if $calcContext == "auto" { @if $exists != false { + @if get-value(settings, grid) == "fluid" { - $outputWidth: (calc-width($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))) - (calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))); - $outputMarginRight: 0; - $outputMarginLeft: calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); + $outputWidth: (calc-width($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))) - (calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span)))); + $outputMarginRight: 0; + $outputMarginLeft: calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); - @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { - @content; - } + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } - @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); - @include debugPrintInstance($calcKey); + @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); + @include debugPrintInstance($calcKey); + } @else if get-value(settings, grid) == "fixed" { + + $outputWidth: (to-number(get-instance-value($calcKey, output, width)) / to-number(get-instance-value($calcKey, span)) * $calcSpan) - ((calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))))); + $outputMarginRight: 0; + $outputMarginLeft: calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); + + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } + + @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); + @include debugPrintInstance($calcKey); + + } } @else { @warn "You set context to `#{$calcContext}`, but a parent instance could not be found for `#{selector_string()}`"; } } @else { @@ -498,21 +645,36 @@ } @else if $calcGutter == "row" or $calcGutter == "none" or get-value(settings, gutter) == false { @if $calcContext == "auto" { @if $exists != false { + @if get-value(settings, grid) == "fluid" { - $outputWidth: calc-width($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); - $outputMarginRight: 0; - $outputMarginLeft: 0; + $outputWidth: calc-width($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); + $outputMarginRight: 0; + $outputMarginLeft: 0; - @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { - @content; - } + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } - @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); - @include debugPrintInstance($calcKey); + @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); + @include debugPrintInstance($calcKey); + } @else if get-value(settings, grid) == "fixed" { + + $outputWidth: (to-number(get-instance-value($calcKey, output, width)) / to-number(get-instance-value($calcKey, span)) * $calcSpan); + $outputMarginRight: 0; + $outputMarginLeft: 0; + + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } + + @include newInstance($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); + @include debugPrintInstance($calcKey); + + } } @else { @warn "You set context to `#{$calcContext}`, but a parent instance could not be found for `#{selector_string()}`"; } } @else { \ No newline at end of file