KevinMidboe/vinlottis
1
0
Fork 0
Code Issues 8 Pull Requests 14 Packages Projects Releases Wiki Activity

rework media breakpoints

Browse Source
This commit is contained in:
Adrian Thompson
2020-09-10 15:08:15 +02:00
parent e9e7b60f22
commit 036958b279
3 changed files with 26 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/AllRequestedWines.vue
View File

@@ -46,7 +46,7 @@ export default {
grid-gap: 1.5rem; grid-gap: 1.5rem;
justify-items: center; justify-items: center;
@media #{$mobileOnly}{ @include mobile {
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
flex-flow: row wrap; flex-flow: row wrap;
@@ -54,18 +54,18 @@ export default {
margin: 2rem; margin: 2rem;
} }
@media #{$tabletOnly}{ @include tablet {
margin: 1em; margin: 1em;
grid: 1fr / 1fr 1fr; grid: 1fr / 1fr 1fr;
justify-items: center; justify-items: center;
} }
@media #{$desktopOnly}{ @include desktop {
margin: 1em; margin: 1em;
grid: 1fr / repeat(4, 1fr); grid: 1fr / repeat(4, 1fr);
} }
@media #{$widescreenAndUp}{ @include widescreen {
width: 80%; width: 80%;
margin: auto; margin: auto;
grid: 1fr / repeat(5, 1fr); grid: 1fr / repeat(5, 1fr);

8
src/components/RequestWine.vue
View File

@@ -130,7 +130,7 @@ input[type="text"] {
display: grid; display: grid;
grid: 1fr / 1fr .2fr; grid: 1fr / 1fr .2fr;
@media #{$mobileOnly}{ @include mobile{
.vin-button{ .vin-button{
display: none; display: none;
} }
@@ -152,7 +152,7 @@ input[type="text"] {
margin-bottom: 1em; margin-bottom: 1em;
box-shadow: 0 1px 0 0 rgba(0,0,0,0.2); box-shadow: 0 1px 0 0 rgba(0,0,0,0.2);
@media #{$mobileOnly}{ @include mobile{
grid: 1fr .5fr / .5fr 1fr; grid: 1fr .5fr / .5fr 1fr;
grid-template-areas: "picture details" grid-template-areas: "picture details"
@@ -221,13 +221,13 @@ input[type="text"] {
grid-area: button2; grid-area: button2;
} }
@media #{$tabletOnly}{ @include tablet{
h2{ h2{
font-size: 1.2em; font-size: 1.2em;
} }
} }
@media #{$desktopAndUp}{ @include desktop{
h2{ h2{
font-size: 1.6em; font-size: 1.6em;
} }

46
src/styles/media-queries.scss
View File

@@ -1,15 +1,7 @@
$phone-xs-width: 480px;
$tablet-p-width: 768px;
$tablet-l-width: 1024px;
$desktop-width: 1200px;
$desktop-l-width: 1600px;
$mobile-width: 768px; $mobile-width: 768px;
$tablet-max: 1200px;
$desktop-max: 1704;
@mixin desktop {
@media (min-width: #{$mobile-width + 1px}) {
@content;
}
}
@mixin mobile { @mixin mobile {
@media (max-width: #{$mobile-width}) { @media (max-width: #{$mobile-width}) {
@@ -17,23 +9,21 @@ $mobile-width: 768px;
} }
} }
$sm: 320; @mixin tablet {
$md: 756; @media (min-width: #{$mobile-width + 1px}) {
$lg: 1200; @content;
$xl: 1704; }
}
$minMobileWidth: $sm + 0px;
$maxMobileWidth: $md - 1px;
$minTabletWidth: $md + 0px;
$maxTabletWidth: $lg - 1px;
$minDesktopWidth: $lg + 0px;
$maxDesktopWidth: $xl - 1px;
$minWidescreenWidth: $xl + 0px;
$mobileOnly: "only screen and ( max-width: #{$maxMobileWidth} )"; @mixin desktop {
$tabletOnly: "only screen and( min-width: #{$minTabletWidth} ) and ( max-width: #{$maxTabletWidth} )"; @media (min-width: #{$tablet-max + 1px}) {
$desktopOnly: "only screen and ( min-width: #{$minDesktopWidth} ) and ( max-width: #{$maxDesktopWidth} )"; @content;
$widescreenOnly: "only screen and ( min-width: #{$minWidescreenWidth} )"; }
$tabletAndUp: "only screen and ( min-width: #{$minTabletWidth} )"; }
$desktopAndUp: "only screen and ( min-width: #{$minDesktopWidth} )";
$widescreenAndUp: "only screen and ( min-width: #{$minWidescreenWidth} )"; @mixin widescreen {
@media (min-width: #{$desktop-max + 1px}){
@content;
}
}