Skip to content

Commit

Permalink
Merge pull request #95 from warrenrodrigues/v1-dev
Browse files Browse the repository at this point in the history
Fix breakpoint issue and incorrect min-width size
  • Loading branch information
ChildishGiant authored Mar 27, 2021
2 parents 58d1f53 + 7413ab1 commit 30801a9
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions sass/components/_global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ ul.staggered-list li {
}
}
.hide-on-med-only {
@media only screen and (min-width: $small-screen) and (max-width: $medium-screen) {
@media only screen and (min-width: $small-screen-up) and (max-width: $medium-screen) {
display: none !important;
}
}
Expand All @@ -347,7 +347,7 @@ ul.staggered-list li {
}
}
.show-on-medium {
@media only screen and (min-width: $small-screen) and (max-width: $medium-screen) {
@media only screen and (min-width: $small-screen-up) and (max-width: $medium-screen) {
display: block !important;
}
}
Expand Down
4 changes: 2 additions & 2 deletions sass/components/_typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ html{
font-size: 14px;
}

@media only screen and (min-width: $medium-screen) {
@media only screen and (min-width: $medium-screen-up) {
font-size: 14.5px;
}

@media only screen and (min-width: $large-screen) {
@media only screen and (min-width: $large-screen-up) {
font-size: 15px;
}

Expand Down
6 changes: 3 additions & 3 deletions sass/components/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,9 @@ $switch-radius: 15px !default;
$small-screen-up: 601px !default;
$medium-screen-up: 993px !default;
$large-screen-up: 1201px !default;
$small-screen: 600px !default;
$medium-screen: 992px !default;
$large-screen: 1200px !default;
$small-screen: 600.99px !default;
$medium-screen: 992.99px !default;
$large-screen: 1200.99px !default;

$medium-and-up: "only screen and (min-width : #{$small-screen-up})" !default;
$large-and-up: "only screen and (min-width : #{$medium-screen-up})" !default;
Expand Down

0 comments on commit 30801a9

Please sign in to comment.