From 1a5c72caa18052dd59827b2883e6fc055d1422f4 Mon Sep 17 00:00:00 2001 From: Ayronhayd <128861928+Ayronhayd@users.noreply.github.com> Date: Sun, 17 Dec 2023 15:51:01 +0300 Subject: [PATCH 01/31] $color-primary-500--opacity --- source/styles/blocks/hero.scss | 8 ++++---- source/styles/blocks/page.scss | 3 +++ source/styles/blocks/proposal.scss | 8 ++++---- source/styles/global/variables.scss | 2 ++ 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/source/styles/blocks/hero.scss b/source/styles/blocks/hero.scss index 0faa95e..2915665 100644 --- a/source/styles/blocks/hero.scss +++ b/source/styles/blocks/hero.scss @@ -7,13 +7,13 @@ background-repeat: no-repeat; background-position: 50% 0; background-size: cover; - background-image: linear-gradient(rgba(104, 183, 56, 0.85), rgba(104, 183, 56, 0.85)), url("../../images/background/index-background-mobile@1x.jpg"); + background-image: linear-gradient($color-primary-500--opacity, $color-primary-500--opacity), url("../../images/background/index-background-mobile@1x.jpg"); } @media (min-resolution: 2dppx) { background-repeat: no-repeat; background-size: cover; - background-image: linear-gradient(rgba(104, 183, 56, 0.85), rgba(104, 183, 56, 0.85)), url("../../images/background/index-background-mobile@2x.jpg"); + background-image: linear-gradient($color-primary-500--opacity, $color-primary-500--opacity), url("../../images/background/index-background-mobile@2x.jpg"); } @media (min-width: $tablet-width) { @@ -37,11 +37,11 @@ background-color: $color-primary-800; background-position: 0 100%; background-repeat: no-repeat; - background-image: linear-gradient(rgba(104, 183, 56, 0.85), rgba(104, 183, 56, 0.85)), url("../../images/background/index-background-desktop@1x.jpg"); + background-image: linear-gradient($color-primary-500--opacity, $color-primary-500--opacity), url("../../images/background/index-background-desktop@1x.jpg"); // @media (min-resolution: 2dppx) { // background-size: auto 700px; - // background-image: linear-gradient(rgba(104, 183, 56, 0.85), rgba(104, 183, 56, 0.85)), url("../../images/background/index-background-desktop@2x.jpg"); + // background-image: linear-gradient($color-primary-500--opacity, $color-primary-500--opacity), url("../../images/background/index-background-desktop@2x.jpg"); // } } } diff --git a/source/styles/blocks/page.scss b/source/styles/blocks/page.scss index 2b8c7c3..4fd5986 100644 --- a/source/styles/blocks/page.scss +++ b/source/styles/blocks/page.scss @@ -1,4 +1,7 @@ .page__body { + min-width: 320px; + height: 100%; + font-family: $font-body; font-size: 14px; line-height: 18px; diff --git a/source/styles/blocks/proposal.scss b/source/styles/blocks/proposal.scss index 68efaa8..3d86086 100644 --- a/source/styles/blocks/proposal.scss +++ b/source/styles/blocks/proposal.scss @@ -5,21 +5,21 @@ background-color: $color-primary-500; padding: 140px 140px; background-repeat: no-repeat; - background-image: linear-gradient(rgba(104, 183, 56, 0.85), rgba(104, 183, 56, 0.85)), url("../../images/background/washing-machine-mobile-desktop@1x.jpg"); + background-image: linear-gradient($color-primary-500--opacity, $color-primary-500--opacity), url("../../images/background/washing-machine-mobile-desktop@1x.jpg"); @media (min-resolution: 2dppx) { background-repeat: no-repeat; - background-image: linear-gradient(rgba(104, 183, 56, 0.85), rgba(104, 183, 56, 0.85)), url("../../images/background/washing-machine-mobile-desktop@2x.jpg"); + background-image: linear-gradient($color-primary-500--opacity, $color-primary-500--opacity), url("../../images/background/washing-machine-mobile-desktop@2x.jpg"); background-size: 280px 290px; } @media (min-width: $tablet-width) { background-repeat: no-repeat; - background-image: linear-gradient(rgba(104, 183, 56, 0.85), rgba(104, 183, 56, 0.85)), url("../../images/background/washing-machine-tablet@1x.jpg"); + background-image: linear-gradient($color-primary-500--opacity, $color-primary-500--opacity), url("../../images/background/washing-machine-tablet@1x.jpg"); background-size: 707px 200px; @media (min-resolution: 2dppx) { - background-image: linear-gradient(rgba(104, 183, 56, 0.85), rgba(104, 183, 56, 0.85)), url("../../images/background/washing-machine-tablet@2x.jpg"); + background-image: linear-gradient($color-primary-500--opacity, $color-primary-500--opacity), url("../../images/background/washing-machine-tablet@2x.jpg"); } } } diff --git a/source/styles/global/variables.scss b/source/styles/global/variables.scss index de38666..055b338 100644 --- a/source/styles/global/variables.scss +++ b/source/styles/global/variables.scss @@ -16,6 +16,8 @@ $color-gray-850: #222222; $color-gray-900: #111111; $color-primary-500: #68b738; $color-primary-800: #63a63b; + +$color-primary-500--opacity: rgba($color-primary-500, 0.85); $color-error-500: #ff8282; // background switcher $color-gray-150: #eaeaea; From cda382d264077c69285b10f6c4dbcc9aac89372e Mon Sep 17 00:00:00 2001 From: Ayronhayd <128861928+Ayronhayd@users.noreply.github.com> Date: Tue, 19 Dec 2023 19:25:46 +0300 Subject: [PATCH 02/31] =?UTF-8?q?=D0=9C=D0=B5=D0=BD=D1=8E=20=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D1=80=D1=8B=D0=B2=D0=B0=D0=B5=D1=82=D1=81=D1=8F=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=BA=D1=80=D1=8B=D0=B2=D0=B0=D0=B5=D1=82=D1=81=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/index.html | 14 ++++---- source/scripts/index.js | 15 ++++++++- source/styles/blocks/common-heading.scss | 1 + source/styles/blocks/page-header.scss | 43 +++++++++++++++++++++--- source/styles/blocks/page-main.scss | 13 ------- source/styles/blocks/page.scss | 11 ++++-- source/styles/blocks/site-menu.scss | 6 +++- source/styles/global/variables.scss | 2 +- 8 files changed, 76 insertions(+), 29 deletions(-) diff --git a/source/index.html b/source/index.html index 5293ca3..9bc70bd 100644 --- a/source/index.html +++ b/source/index.html @@ -16,7 +16,7 @@