From cc9677da77e844c5618125926118c5565579a1d7 Mon Sep 17 00:00:00 2001 From: ManjaroOne666 Date: Sun, 27 Jan 2019 15:52:30 +0000 Subject: [PATCH] about styling complete --- assets/scss/_base.scss | 19 +++++- assets/scss/style.scss | 4 ++ components/ContentPage.vue | 22 ++++-- pages/about.vue | 134 +++++++++++++++++++++++++++++++------ pages/services.vue | 3 +- 5 files changed, 153 insertions(+), 29 deletions(-) diff --git a/assets/scss/_base.scss b/assets/scss/_base.scss index 903e96c..a7030c5 100644 --- a/assets/scss/_base.scss +++ b/assets/scss/_base.scss @@ -10,12 +10,27 @@ html { body { font-family: 'Raleway', sans-serif; font-size: 100%; + line-height: 1.6; } a { font-family: 'Montserrat', sans-serif; } -h1, h2, h3, h4, h5, h6 { - font-family: 'Montserrat', sans-serif; +.content { + h1, h2, h3, h4, h5, h6 { + font-family: 'Montserrat', sans-serif; + margin: 0 0 3rem; + text-transform: none; + } + + h2, h3, h4, h5, h6 { + color: $color__neutral-400; + } + + blockquote { + background-color: initial; + @include font-cursive(); + border: 0; + } } diff --git a/assets/scss/style.scss b/assets/scss/style.scss index 12f2c7d..fecf12c 100644 --- a/assets/scss/style.scss +++ b/assets/scss/style.scss @@ -87,3 +87,7 @@ } } +.background-tint { + background-color: rgba($color__primary-100, .7); +} + diff --git a/components/ContentPage.vue b/components/ContentPage.vue index ef1ca0f..b81c199 100644 --- a/components/ContentPage.vue +++ b/components/ContentPage.vue @@ -49,7 +49,7 @@ $z-index-top: 10; padding: 0 0 0 $site-menu__header-width; } - background-color: rgba(black, .1); // TEMP + background-color: $color__neutral-100; } .content-container { @@ -75,13 +75,13 @@ $z-index-top: 10; top: 0; right: 0; - padding: .5rem; + padding: .5rem 1rem 2rem; @media (min-width: $bp__layout) { width: 50%; padding: 1rem; - background-color: rgba(0, 0, 0, .3); + background-color: rgba(0, 0, 0, .5); } color: #fff; // TEMP @@ -90,18 +90,24 @@ $z-index-top: 10; .page-heading { z-index: $z-index-top; position: relative; - margin: 2rem 1rem 1rem 2rem; + margin: 1rem; @media (min-width: $bp__layout) { width: 14em; max-width: calc(50% - #{$site-menu__header-width} - 3rem); + margin: 2rem 1rem 1rem 2rem; } } .title { @include font-title(); color: $color__neutral-900; - font-size: 3.7vw; + text-align: center; + + @media (min-width: $bp__layout) { + font-size: 3.7vw; + text-align: left; + } @media (min-width: 90em) { font-size: 3.5rem; @@ -115,5 +121,11 @@ $z-index-top: 10; height: 100%; top: 0; left: 0; + + opacity: .5; + + @media (min-width: $bp__layout) { + opacity: 1; + } } diff --git a/pages/about.vue b/pages/about.vue index 08a09ab..0696e2c 100644 --- a/pages/about.vue +++ b/pages/about.vue @@ -1,34 +1,47 @@ diff --git a/pages/services.vue b/pages/services.vue index 4a3abe5..8b570a8 100644 --- a/pages/services.vue +++ b/pages/services.vue @@ -6,7 +6,7 @@ :image-urls="backgroundImageUrls" :active-index="activeIndex" > -
+