stylesheets/flint/mixins/lib/_flint-calculate.scss in flint-gs-1.0.3 vs stylesheets/flint/mixins/lib/_flint-calculate.scss in flint-gs-1.0.4

- old
+ new

@@ -1,5 +1,20 @@ +// Outputs calculated styles +// ------------------------------------------------------------------------------- +// @param $width [Value] : width +// @param $margin-right [Value] : right margin +// @param $margin-left [Value] : left margin +// ------------------------------------------------------------------------------- +// @output [Styles...] + +@mixin outputFlint ($width, $margin-right, $margin-left) { + width: $width; + margin-right: $margin-right; + margin-left: $margin-left; + @content; +} + // Calculate widths, save all variables to instance // ------------------------------------------------------------------------------- // @param $calcKey [Values...] : breakpoint key // @param $calcSpan [Values...] : span // @param $calcContext [Values...] : context @@ -42,34 +57,48 @@ (calc-margin($calcKey, $calcSpan)) + (calc-width($calcKey, $calcShift)), (calc-margin($calcKey, -$calcSpan)) + (calc-width($calcKey, $calcShift)) )); // Output styles - width: $outputWidth; - margin-right: $outputMarginRight; - margin-left: $outputMarginLeft; - @content; + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } // Create new instance for memoization @include newInstance ($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); // If debug mode, print instance @include debugPrintInstance($calcKey); + } @else if $calcGutter == "inside" and get-value(settings, gutter) != false { + + $outputWidth: (calc-width($calcKey, $calcSpan)) - ((calc-margin($calcKey, $calcSpan))*4); + $outputMarginRight: calc-margin($calcKey, $calcSpan); + $outputMarginLeft: ( if( $calcShift > 0, + (calc-margin($calcKey, $calcSpan)) + (calc-width($calcKey, $calcShift)), + (calc-margin($calcKey, -$calcSpan)) + (calc-width($calcKey, $calcShift)) + )); + + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } + + @include newInstance ($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); + @include debugPrintInstance($calcKey); + } @else if $calcGutter == "alpha" 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), calc-width($calcKey, $calcShift) )); - width: $outputWidth; - margin-right: $outputMarginRight; - margin-left: $outputMarginLeft; - @content; + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } @include newInstance ($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); @include debugPrintInstance($calcKey); } @else if $calcGutter == "omega" and get-value(settings, gutter) != false { @@ -79,14 +108,13 @@ $outputMarginLeft: ( if( $calcShift > 0, (calc-margin($calcKey, $calcSpan)) + (calc-width($calcKey, $calcShift)), (calc-margin($calcKey, -$calcSpan)) + (calc-width($calcKey, $calcShift)) )); - width: $outputWidth; - margin-right: $outputMarginRight; - margin-left: $outputMarginLeft; - @content; + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } @include newInstance ($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); @include debugPrintInstance($calcKey); } @else if $calcGutter == "row" or get-value(settings, gutter) == false { @@ -96,14 +124,13 @@ $outputMarginLeft: ( if( $calcShift > 0, calc-width($calcKey, $calcShift), calc-width($calcKey, $calcShift) )); - width: $outputWidth; - margin-right: $outputMarginRight; - margin-left: $outputMarginLeft; - @content; + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } @include newInstance ($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); @include debugPrintInstance($calcKey); } @@ -123,15 +150,55 @@ $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)))) )); - width: $outputWidth; - margin-right: $outputMarginRight; - margin-left: $outputMarginLeft; + @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: ( if( $calcShift > 0, + (calc-margin($calcKey, $calcSpan, $calcContext)) + (calc-width($calcKey, $calcShift, $calcContext)), + (calc-margin($calcKey, -$calcSpan, $calcContext)) + (calc-width($calcKey, $calcShift, $calcContext)) + )); + + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { @content; + } + @include newInstance ($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); + @include debugPrintInstance($calcKey); + } + + } @else if $calcGutter == "inside" 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))))*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` @@ -145,14 +212,13 @@ $outputMarginLeft: ( if( $calcShift > 0, (calc-margin($calcKey, $calcSpan, $calcContext)) + (calc-width($calcKey, $calcShift, $calcContext)), (calc-margin($calcKey, -$calcSpan, $calcContext)) + (calc-width($calcKey, $calcShift, $calcContext)) )); - width: $outputWidth; - margin-right: $outputMarginRight; - margin-left: $outputMarginLeft; - @content; + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } @include newInstance ($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); @include debugPrintInstance($calcKey); } @@ -166,14 +232,13 @@ $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))) )); - width: $outputWidth; - margin-right: $outputMarginRight; - margin-left: $outputMarginLeft; - @content; + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } @include newInstance ($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); @include debugPrintInstance($calcKey); } @else { @@ -186,14 +251,13 @@ $outputMarginLeft: ( if( $calcShift > 0, calc-width($calcKey, $calcShift, $calcContext), calc-width($calcKey, $calcShift, $calcContext) )); - width: $outputWidth; - margin-right: $outputMarginRight; - margin-left: $outputMarginLeft; - @content; + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } @include newInstance ($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); @include debugPrintInstance($calcKey); } @@ -207,14 +271,13 @@ $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)))) )); - width: $outputWidth; - margin-right: $outputMarginRight; - margin-left: $outputMarginLeft; - @content; + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } @include newInstance ($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); @include debugPrintInstance($calcKey); } @else { @@ -227,14 +290,13 @@ $outputMarginLeft: ( if( $calcShift > 0, (calc-margin($calcKey, $calcSpan, $calcContext)) + (calc-width($calcKey, $calcShift, $calcContext)), (calc-margin($calcKey, -$calcSpan, $calcContext)) + (calc-width($calcKey, $calcShift, $calcContext)) )); - width: $outputWidth; - margin-right: $outputMarginRight; - margin-left: $outputMarginLeft; - @content; + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } @include newInstance ($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); @include debugPrintInstance($calcKey); } @@ -248,14 +310,13 @@ $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))) )); - width: $outputWidth; - margin-right: $outputMarginRight; - margin-left: $outputMarginLeft; - @content; + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } @include newInstance ($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); @include debugPrintInstance($calcKey); } @else { @@ -268,14 +329,13 @@ $outputMarginLeft: ( if( $calcShift > 0, calc-width($calcKey, $calcShift, $calcContext), calc-width($calcKey, $calcShift, $calcContext) )); - width: $outputWidth; - margin-right: $outputMarginRight; - margin-left: $outputMarginLeft; - @content; + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } @include newInstance ($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); @include debugPrintInstance($calcKey); } } @@ -288,14 +348,13 @@ $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))); - width: $outputWidth; - margin-right: $outputMarginRight; - margin-left: $outputMarginLeft; - @content; + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } @include newInstance ($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); @include debugPrintInstance($calcKey); } @else { @@ -307,32 +366,63 @@ $outputWidth: (calc-width($calcKey, $calcSpan, $calcContext)) - ((calc-margin($calcKey, $calcSpan, $calcContext))*2); $outputMarginRight: calc-margin($calcKey, $calcSpan, $calcContext); $outputMarginLeft: calc-margin($calcKey, $calcSpan, $calcContext); - width: $outputWidth; - margin-right: $outputMarginRight; - margin-left: $outputMarginLeft; - @content; + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } @include newInstance ($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); @include debugPrintInstance($calcKey); } + } @else if $calcGutter == "inside" 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))))*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 { + + $outputWidth: (calc-width($calcKey, $calcSpan, $calcContext)) - ((calc-margin($calcKey, $calcSpan, $calcContext))*2); + $outputMarginRight: calc-margin($calcKey, $calcSpan, $calcContext); + $outputMarginLeft: calc-margin($calcKey, $calcSpan, $calcContext); + + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } + + @include newInstance ($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); + @include debugPrintInstance($calcKey); + } + } @else if $calcGutter == "alpha" 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)))); $outputMarginRight: calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); $outputMarginLeft: 0; - width: $outputWidth; - margin-right: $outputMarginRight; - margin-left: $outputMarginLeft; - @content; + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } @include newInstance ($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); @include debugPrintInstance($calcKey); } @else { @@ -342,14 +432,13 @@ $outputWidth: (calc-width($calcKey, $calcSpan, $calcContext)) - (calc-margin($calcKey, $calcSpan, $calcContext)); $outputMarginRight: calc-margin($calcKey, $calcSpan, $calcContext); $outputMarginLeft: 0; - width: $outputWidth; - margin-right: $outputMarginRight; - margin-left: $outputMarginLeft; - @content; + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } @include newInstance ($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); @include debugPrintInstance($calcKey); } @@ -360,14 +449,13 @@ $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))); - width: $outputWidth; - margin-right: $outputMarginRight; - margin-left: $outputMarginLeft; - @content; + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } @include newInstance ($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); @include debugPrintInstance($calcKey); } @else { @@ -377,14 +465,13 @@ $outputWidth: (calc-width($calcKey, $calcSpan, $calcContext)) - (calc-margin($calcKey, $calcSpan, $calcContext)); $outputMarginRight: 0; $outputMarginLeft: calc-margin($calcKey, $calcSpan, $calcContext); - width: $outputWidth; - margin-right: $outputMarginRight; - margin-left: $outputMarginLeft; - @content; + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } @include newInstance ($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); @include debugPrintInstance($calcKey); } @@ -395,14 +482,13 @@ $outputWidth: calc-width($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); $outputMarginRight: 0; $outputMarginLeft: 0; - width: $outputWidth; - margin-right: $outputMarginRight; - margin-left: $outputMarginLeft; - @content; + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } @include newInstance ($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); @include debugPrintInstance($calcKey); } @else { @@ -412,14 +498,13 @@ $outputWidth: calc-width($calcKey, $calcSpan, $calcContext); $outputMarginRight: 0; $outputMarginLeft: 0; - width: $outputWidth; - margin-right: $outputMarginRight; - margin-left: $outputMarginLeft; - @content; + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } @include newInstance ($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); @include debugPrintInstance($calcKey); } } @@ -431,55 +516,64 @@ $outputWidth: (calc-width($calcKey, $calcSpan)) - ((calc-margin($calcKey, $calcSpan))*2); $outputMarginRight: calc-margin($calcKey, $calcSpan); $outputMarginLeft: calc-margin($calcKey, $calcSpan); - width: $outputWidth; - margin-right: $outputMarginRight; - margin-left: $outputMarginLeft; - @content; + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } @include newInstance ($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); @include debugPrintInstance($calcKey); + } @else if $calcGutter == "inside" and get-value(settings, gutter) != false { + + $outputWidth: (calc-width($calcKey, $calcSpan)) - ((calc-margin($calcKey, $calcSpan))*4); + $outputMarginRight: calc-margin($calcKey, $calcSpan); + $outputMarginLeft: calc-margin($calcKey, $calcSpan); + + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } + + @include newInstance ($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); + @include debugPrintInstance($calcKey); + } @else if $calcGutter == "alpha" and get-value(settings, gutter) != false { $outputWidth: (calc-width($calcKey, $calcSpan)) - (calc-margin($calcKey, $calcSpan)); $outputMarginRight: calc-margin($calcKey, $calcSpan); $outputMarginLeft: 0; - width: $outputWidth; - margin-right: $outputMarginRight; - margin-left: $outputMarginLeft; - @content; + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } @include newInstance ($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); @include debugPrintInstance($calcKey); } @else if $calcGutter == "omega" and get-value(settings, gutter) != false { $outputWidth: (calc-width($calcKey, $calcSpan)) - (calc-margin($calcKey, $calcSpan)); $outputMarginRight: 0; $outputMarginLeft: calc-margin($calcKey, $calcSpan); - width: $outputWidth; - margin-right: $outputMarginRight; - margin-left: $outputMarginLeft; - @content; + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } @include newInstance ($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); @include debugPrintInstance($calcKey); } @else if $calcGutter == "row" or get-value(settings, gutter) == false { $outputWidth: calc-width($calcKey, $calcSpan); $outputMarginRight: 0; $outputMarginLeft: 0; - width: $outputWidth; - margin-right: $outputMarginRight; - margin-left: $outputMarginLeft; - @content; + @include outputFlint($outputWidth, $outputMarginRight, $outputMarginLeft) { + @content; + } @include newInstance ($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $outputWidth, $outputMarginRight, $outputMarginLeft); @include debugPrintInstance($calcKey); } \ No newline at end of file