From 6075ff23f5a99adc76d0c14a76ac6d670d773301 Mon Sep 17 00:00:00 2001 From: celineung Date: Tue, 13 Oct 2020 17:11:34 +0200 Subject: [PATCH] Fix design --- assets/scss/shared/_pages.scss | 1 + components/NewsItemPost.vue | 2 +- components/slices/Article.vue | 14 ++++++++++---- components/slices/Features.vue | 8 +++----- pages/pix-site/about.vue | 13 +++++++++++++ pages/pix-site/skills.vue | 1 + pages/pix-site/stats.vue | 1 + 7 files changed, 30 insertions(+), 10 deletions(-) diff --git a/assets/scss/shared/_pages.scss b/assets/scss/shared/_pages.scss index 81e66f477..cf8ea1d1f 100644 --- a/assets/scss/shared/_pages.scss +++ b/assets/scss/shared/_pages.scss @@ -42,6 +42,7 @@ &__description { h2 { font-weight: 400; + color: $grey-90; } ul { diff --git a/components/NewsItemPost.vue b/components/NewsItemPost.vue index a283740c4..bdfd20064 100644 --- a/components/NewsItemPost.vue +++ b/components/NewsItemPost.vue @@ -68,7 +68,7 @@ export default { position: relative; border-radius: 10px; background: #fff; - color: $grey-90; + color: $grey-45; box-shadow: 0 20px 20px rgba(0, 0, 0, 0.04); margin-bottom: 60px; diff --git a/components/slices/Article.vue b/components/slices/Article.vue index d9923d817..b5d58f3ae 100644 --- a/components/slices/Article.vue +++ b/components/slices/Article.vue @@ -303,6 +303,12 @@ export default { &__description { margin: 16px 0 24px 0; color: $grey-45; + font-size: 1.125rem; + line-height: 30px; + + h3 { + margin-top: 8px; + } ul { list-style: none; @@ -314,11 +320,11 @@ export default { } & p { - font-size: 1.25rem; + font-size: 1.125rem; font-weight: $font-normal; letter-spacing: 0; - line-height: 2rem; - margin: 15px 0px; + line-height: 1.875rem; + margin: 8px 0px; } &--only-text { @@ -330,7 +336,7 @@ export default { height: 26px; color: $blue; font-family: $font-roboto; - font-size: 1.25rem; + font-size: 1.125rem; font-weight: $font-medium; letter-spacing: 0; line-height: 0.009rem; diff --git a/components/slices/Features.vue b/components/slices/Features.vue index ad070d7a7..5c529848d 100644 --- a/components/slices/Features.vue +++ b/components/slices/Features.vue @@ -150,7 +150,6 @@ export default { img { margin-right: 25px; height: 62px; - width: 55px; } p { @@ -159,8 +158,9 @@ export default { } &-wrapper-item { - &__title h1 { - width: 217px; + &__title h3 { + margin-top: 16px; + width: 100%; color: $grey-90; font-size: 1rem; letter-spacing: 0px; @@ -193,7 +193,6 @@ export default { img { margin-right: 32px; height: 73px; - width: 65px; } } @@ -262,7 +261,6 @@ export default { img { height: 73px; - width: 65px; } } diff --git a/pages/pix-site/about.vue b/pages/pix-site/about.vue index 26bf90cb7..e77b0e813 100644 --- a/pages/pix-site/about.vue +++ b/pages/pix-site/about.vue @@ -269,6 +269,11 @@ export default { &__container { max-width: 1140px; margin: 0 auto; + + h2, + h3 { + color: $grey-90; + } } &-container { @@ -427,6 +432,10 @@ export default { } } + h2 { + color: $grey-90; + } + h3 { text-align: center; font-size: 1rem; @@ -528,6 +537,10 @@ export default { .background { background: $white; } + + h2 { + color: $grey-90; + } } .co-built-service { diff --git a/pages/pix-site/skills.vue b/pages/pix-site/skills.vue index b5e08d2de..f69cc0080 100644 --- a/pages/pix-site/skills.vue +++ b/pages/pix-site/skills.vue @@ -92,6 +92,7 @@ export default { h3, h4 { font-weight: 400; + color: $grey-90; } .competence { diff --git a/pages/pix-site/stats.vue b/pages/pix-site/stats.vue index e102193fc..595952e6d 100644 --- a/pages/pix-site/stats.vue +++ b/pages/pix-site/stats.vue @@ -113,6 +113,7 @@ export default { h2 { font-family: $font-open-sans; font-weight: 400; + color: $grey-90; } h1 { font-size: 44px;