Skip to content

Commit

Permalink
Merge pull request #37 from brysonreece/master
Browse files Browse the repository at this point in the history
Replaced deprecated @elseif with @else if
  • Loading branch information
atomicpages authored Jan 21, 2019
2 parents 9cac17b + 9466ae2 commit c45d100
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions skeleton/core/_functions.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
@function relative($size) {
@if($use-rem == true and $use-em == false and $use-percent == false) {
@return rem($size);
} @elseif($use-em == true and $use-rem == false and $use-percent == false) {
} @else if($use-em == true and $use-rem == false and $use-percent == false) {
@return em($size);
} @elseif($use-percent == true and $use-rem == false and $use-em == false) {
} @else if($use-percent == true and $use-rem == false and $use-em == false) {
@return percent($size);
}

Expand Down
4 changes: 2 additions & 2 deletions skeleton/core/_mixins.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@

@if($use-rem and not $use-em and not $use-percent) {
font-size: rem($size);
} @elseif($use-em and not $use-rem and not $use-percent) {
} @else if($use-em and not $use-rem and not $use-percent) {
font-size: em($size);
} @elseif($use-percent and not $use-rem and not $use-em) {
} @else if($use-percent and not $use-rem and not $use-em) {
font-size: percent($size);
} @else {
@debug "More than one option is chosen for the default unit. Choose only one. Defaulting to px.";
Expand Down

0 comments on commit c45d100

Please sign in to comment.