From: Nicolas Coden Date: Wed, 4 Jul 2018 19:20:20 +0000 (+0200) Subject: Merge pull request #11379 from absolunet/fix-elseif X-Git-Tag: v6.6.0~3^2~135 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f39562832f9bcfcf42d399b1bcc70e8c9e6ff03;p=thirdparty%2Ffoundation%2Ffoundation-sites.git Merge pull request #11379 from absolunet/fix-elseif Replace deprecated `@elseif` for `@else if` --- diff --git a/scss/components/_table.scss b/scss/components/_table.scss index bf6df2659..256f165c3 100644 --- a/scss/components/_table.scss +++ b/scss/components/_table.scss @@ -246,7 +246,7 @@ $table-stack-breakpoint: medium !default; } // Darkens the odd striped table rows. - @elseif($table-stripe == odd) { + @else if($table-stripe == odd) { &:not(.unstriped) tr:nth-of-type(odd):hover { background-color: $table-row-stripe-hover; } @@ -262,7 +262,7 @@ $table-stack-breakpoint: medium !default; } // Darkens the odd striped table rows. - @elseif($table-stripe == odd) { + @else if($table-stripe == odd) { &.striped tr:nth-of-type(odd):hover { background-color: $table-row-stripe-hover; } diff --git a/scss/xy-grid/_cell.scss b/scss/xy-grid/_cell.scss index 6e811e9e9..5ed44c80c 100644 --- a/scss/xy-grid/_cell.scss +++ b/scss/xy-grid/_cell.scss @@ -26,7 +26,7 @@ } // Parsing "n of n" or "n/n" expressions - @elseif type-of($size) == 'list' { + @else if type-of($size) == 'list' { @if length($size) != 3 { @error 'Wrong syntax for xy-cell-size(). Use the format "n of n" or "n/n".'; } @@ -52,13 +52,13 @@ min-height: 0px; min-width: 0px; } - @elseif ($size == 'auto') { + @else if ($size == 'auto') { flex: 1 1 0px; // sass-lint:disable-line zero-unit } - @elseif ($size == 'shrink') { + @else if ($size == 'shrink') { flex: 0 0 auto; } - @elseif ($size == 'grow') { + @else if ($size == 'grow') { flex: 1 0 auto; } } @@ -79,11 +79,11 @@ $val: if($margin-gutter == 0, 100%, calc(100% - #{rem-calc($margin-gutter)})); #{$direction}: $val; } - @elseif ($size == 'auto') { + @else if ($size == 'auto') { #{$direction}: auto; $val: if($margin-gutter == 0, 100%, calc(100% - #{rem-calc($margin-gutter)})); } - @elseif ($size == 'shrink') { + @else if ($size == 'shrink') { #{$direction}: auto; } @else { diff --git a/scss/xy-grid/_gutters.scss b/scss/xy-grid/_gutters.scss index e8efb714d..19e1db8ef 100644 --- a/scss/xy-grid/_gutters.scss +++ b/scss/xy-grid/_gutters.scss @@ -34,7 +34,7 @@ } } } - @elseif (type-of($gutters) == 'number') { + @else if (type-of($gutters) == 'number') { $gutter: rem-calc($gutters) / 2; // Loop through each gutter position