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

- old
+ new

@@ -7,11 +7,10 @@ // @param $calcShift [Values...] : shift // @param $i [Index] : index if variable length is > 1 // ------------------------------------------------------------------------------- // @output [Styles...] -// Calculates width and margins based on passed arguments @mixin calcFlint ($calcKey, $calcSpan, $calcContext, $calcGutter, $calcShift, $i: NULL) { @if $i != NULL { @if length($calcKey) > 1 { @@ -108,16 +107,16 @@ @include debugPrintInstance($calcKey); } } @else if $calcContext != NULL { // Check if context of parent instance exists - $exists: family-instance-exists($calcKey); + $exists: get-family-instance($calcKey); @if $calcShift != NULL { @if $calcGutter == NULL and get-value(settings, gutter) != false { // Check if context is set to auto @if $calcContext == "auto" { - // Did it exist? + // Does parent exist? @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))))*2); $outputMarginRight: calc-margin($calcKey, $calcSpan, to-number(get-instance-value($calcKey, span))); $outputMarginLeft: ( if( $calcShift > 0, \ No newline at end of file