Skip to content

revised _breakpoints.scss and _vendor.scss #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ajsaule wants to merge 2 commits into
base: master
Choose a base branch
from
Open

revised _breakpoints.scss and _vendor.scss #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4b67d0
fixed coniditional statements
ajsaule Sep 13, 2020
b829031
fixed conditional statements
ajsaule Sep 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions dist/_breakpoints.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,31 +41,31 @@
}

// Less than or equal.
@elseif (str-slice($query, 0, 2) == '<=') {
@else if (str-slice($query, 0, 2) == '<=') {

$op: 'lte';
$breakpoint: str-slice($query, 3);

}

// Greater than.
@elseif (str-slice($query, 0, 1) == '>') {
@else if (str-slice($query, 0, 1) == '>') {

$op: 'gt';
$breakpoint: str-slice($query, 2);

}

// Less than.
@elseif (str-slice($query, 0, 1) == '<') {
@else if (str-slice($query, 0, 1) == '<') {

$op: 'lt';
$breakpoint: str-slice($query, 2);

}

// Not.
@elseif (str-slice($query, 0, 1) == '!') {
@else if (str-slice($query, 0, 1) == '!') {

$op: 'not';
$breakpoint: str-slice($query, 2);
Expand Down Expand Up @@ -100,22 +100,22 @@
}

// Less than or equal (<= y)
@elseif ($op == 'lte') {
@else if ($op == 'lte') {
$media: 'screen and (max-width: ' + $y + ')';
}

// Greater than (> y)
@elseif ($op == 'gt') {
@else if ($op == 'gt') {
$media: 'screen and (min-width: ' + ($y + 1) + ')';
}

// Less than (< 0 / invalid)
@elseif ($op == 'lt') {
@else if ($op == 'lt') {
$media: 'screen and (max-width: -1px)';
}

// Not (> y)
@elseif ($op == 'not') {
@else if ($op == 'not') {
$media: 'screen and (min-width: ' + ($y + 1) + ')';
}

Expand All @@ -135,22 +135,22 @@
}

// Less than or equal (<= inf / anything)
@elseif ($op == 'lte') {
@else if ($op == 'lte') {
$media: 'screen';
}

// Greater than (> inf / invalid)
@elseif ($op == 'gt') {
@else if ($op == 'gt') {
$media: 'screen and (max-width: -1px)';
}

// Less than (< x)
@elseif ($op == 'lt') {
@else if ($op == 'lt') {
$media: 'screen and (max-width: ' + ($x - 1) + ')';
}

// Not (< x)
@elseif ($op == 'not') {
@else if ($op == 'not') {
$media: 'screen and (max-width: ' + ($x - 1) + ')';
}

Expand All @@ -170,22 +170,22 @@
}

// Less than or equal (<= y)
@elseif ($op == 'lte') {
@else if ($op == 'lte') {
$media: 'screen and (max-width: ' + $y + ')';
}

// Greater than (> y)
@elseif ($op == 'gt') {
@else if ($op == 'gt') {
$media: 'screen and (min-width: ' + ($y + 1) + ')';
}

// Less than (< x)
@elseif ($op == 'lt') {
@else if ($op == 'lt') {
$media: 'screen and (max-width: ' + ($x - 1) + ')';
}

// Not (< x and > y)
@elseif ($op == 'not') {
@else if ($op == 'not') {
$media: 'screen and (max-width: ' + ($x - 1) + '), screen and (min-width: ' + ($y + 1) + ')';
}

Expand Down
2 changes: 1 addition & 1 deletion dist/_vendor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@
}

// Expand just the value?
@elseif $expandValue {
@else if $expandValue {
@each $vendor in $vendor-prefixes {
#{$property}: #{str-replace-all($value, '-prefix-', $vendor)};
}
Expand Down
32 changes: 16 additions & 16 deletions src/_breakpoints.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,31 +41,31 @@
}

// Less than or equal.
@elseif (str-slice($query, 0, 2) == '<=') {
@else if (str-slice($query, 0, 2) == '<=') {

$op: 'lte';
$breakpoint: str-slice($query, 3);

}

// Greater than.
@elseif (str-slice($query, 0, 1) == '>') {
@else if (str-slice($query, 0, 1) == '>') {

$op: 'gt';
$breakpoint: str-slice($query, 2);

}

// Less than.
@elseif (str-slice($query, 0, 1) == '<') {
@else if (str-slice($query, 0, 1) == '<') {

$op: 'lt';
$breakpoint: str-slice($query, 2);

}

// Not.
@elseif (str-slice($query, 0, 1) == '!') {
@else if (str-slice($query, 0, 1) == '!') {

$op: 'not';
$breakpoint: str-slice($query, 2);
Expand Down Expand Up @@ -100,22 +100,22 @@
}

// Less than or equal (<= y)
@elseif ($op == 'lte') {
@else if ($op == 'lte') {
$media: 'screen and (max-width: ' + $y + ')';
}

// Greater than (> y)
@elseif ($op == 'gt') {
@else if ($op == 'gt') {
$media: 'screen and (min-width: ' + ($y + 1) + ')';
}

// Less than (< 0 / invalid)
@elseif ($op == 'lt') {
@else if ($op == 'lt') {
$media: 'screen and (max-width: -1px)';
}

// Not (> y)
@elseif ($op == 'not') {
@else if ($op == 'not') {
$media: 'screen and (min-width: ' + ($y + 1) + ')';
}

Expand All @@ -135,22 +135,22 @@
}

// Less than or equal (<= inf / anything)
@elseif ($op == 'lte') {
@else if ($op == 'lte') {
$media: 'screen';
}

// Greater than (> inf / invalid)
@elseif ($op == 'gt') {
@else if ($op == 'gt') {
$media: 'screen and (max-width: -1px)';
}

// Less than (< x)
@elseif ($op == 'lt') {
@else if ($op == 'lt') {
$media: 'screen and (max-width: ' + ($x - 1) + ')';
}

// Not (< x)
@elseif ($op == 'not') {
@else if ($op == 'not') {
$media: 'screen and (max-width: ' + ($x - 1) + ')';
}

Expand All @@ -170,22 +170,22 @@
}

// Less than or equal (<= y)
@elseif ($op == 'lte') {
@else if ($op == 'lte') {
$media: 'screen and (max-width: ' + $y + ')';
}

// Greater than (> y)
@elseif ($op == 'gt') {
@else if ($op == 'gt') {
$media: 'screen and (min-width: ' + ($y + 1) + ')';
}

// Less than (< x)
@elseif ($op == 'lt') {
@else if ($op == 'lt') {
$media: 'screen and (max-width: ' + ($x - 1) + ')';
}

// Not (< x and > y)
@elseif ($op == 'not') {
@else if ($op == 'not') {
$media: 'screen and (max-width: ' + ($x - 1) + '), screen and (min-width: ' + ($y + 1) + ')';
}

Expand Down
2 changes: 1 addition & 1 deletion src/_vendor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@
}

// Expand just the value?
@elseif $expandValue {
@else if $expandValue {
@each $vendor in $vendor-prefixes {
#{$property}: #{str-replace-all($value, '-prefix-', $vendor)};
}
Expand Down