Skip to content

Commit

Permalink
Use pull request foundation#11379 from absolunet/fix-elseif for v6.5.0
Browse files Browse the repository at this point in the history
28c348b Replace deprecated `@elseif` for `@else if`

Signed-off-by: Nicolas Coden <nicolas@ncoden.fr>
  • Loading branch information
jblandry authored and ncoden committed Jul 6, 2018
1 parent 0d41752 commit 5485900
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions scss/components/_table.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand Down
12 changes: 6 additions & 6 deletions scss/xy-grid/_cell.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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".';
}
Expand All @@ -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;
}
}
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion scss/xy-grid/_gutters.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5485900

Please sign in to comment.