diff --git a/client/src/components/AddContentBlockButton.vue b/client/src/components/AddContentBlockButton.vue index df46a5f2..dbff0f03 100644 --- a/client/src/components/AddContentBlockButton.vue +++ b/client/src/components/AddContentBlockButton.vue @@ -29,9 +29,14 @@ diff --git a/client/src/layouts/DefaultLayout.vue b/client/src/layouts/DefaultLayout.vue index 343007d3..56bf13ed 100644 --- a/client/src/layouts/DefaultLayout.vue +++ b/client/src/layouts/DefaultLayout.vue @@ -43,8 +43,7 @@ data() { return { - me: { - } + me: {} } }, @@ -67,6 +66,7 @@ grid-template-rows: auto auto 1fr; grid-row-gap: 32px; min-height: 100vh; + grid-template-areas: "h" "." "c"; padding-bottom: 50px; @@ -91,7 +91,9 @@ grid-auto-rows: 50px; width: 100%; - grid-template-columns: 1fr 1fr 1fr; + @include desktop { + grid-template-columns: 1fr 1fr 1fr; + } /* * For IE10+ diff --git a/client/src/layouts/SimpleLayout.vue b/client/src/layouts/SimpleLayout.vue index e0a7c3b9..a38d3a2d 100644 --- a/client/src/layouts/SimpleLayout.vue +++ b/client/src/layouts/SimpleLayout.vue @@ -8,15 +8,20 @@ diff --git a/client/src/pages/module-base.vue b/client/src/pages/module-base.vue index 6e2444f8..d3af86ef 100644 --- a/client/src/pages/module-base.vue +++ b/client/src/pages/module-base.vue @@ -16,6 +16,8 @@ diff --git a/client/src/pages/rooms.vue b/client/src/pages/rooms.vue index abea3366..44832296 100644 --- a/client/src/pages/rooms.vue +++ b/client/src/pages/rooms.vue @@ -60,16 +60,22 @@ diff --git a/client/src/pages/topic.vue b/client/src/pages/topic.vue index 322ba461..4e597609 100644 --- a/client/src/pages/topic.vue +++ b/client/src/pages/topic.vue @@ -53,6 +53,7 @@ diff --git a/client/src/styles/_mixins.scss b/client/src/styles/_mixins.scss index 8d7e202c..92a78309 100644 --- a/client/src/styles/_mixins.scss +++ b/client/src/styles/_mixins.scss @@ -44,3 +44,9 @@ background-color: $color-white; } } + +@mixin desktop { + @media (min-width: 1024px) { + @content + } +} diff --git a/client/src/styles/_typography.scss b/client/src/styles/_typography.scss index d2dcb5a0..5bc62692 100644 --- a/client/src/styles/_typography.scss +++ b/client/src/styles/_typography.scss @@ -1,5 +1,6 @@ @import "variables"; @import "functions"; +@import "mixins"; * { font-size: $base-font-size; @@ -27,10 +28,14 @@ a { } h1 { - font-size: 4rem; // 64px + font-size: 2rem; font-weight: 800; color: $header-color; margin-bottom: 35px; + + @include desktop { + font-size: 4rem; // 64px + } } h2 {