From 13f7f83308e38fbf6e0353ae886f38bd85178f25 Mon Sep 17 00:00:00 2001 From: Boris Voropaev Date: Wed, 30 Aug 2023 14:14:47 +0300 Subject: [PATCH] peges components CSS interval --- .../page-breadcrumbs.component.scss | 2 +- .../_modules/pages/page/page.component.html | 7 ++-- .../_modules/pages/page/page.component.scss | 6 ++-- .../sections/add/add-section.component.scss | 3 +- .../sections/item/page-section.component.scss | 7 ++-- .../contact/contact-section.component.scss | 7 ++-- .../header/header-section.component.scss | 28 +-------------- .../basic/html/html-section.component.scss | 6 +++- src/assets/css/basics.scss | 36 ++++++++++++++++--- src/styles.scss | 2 +- 10 files changed, 60 insertions(+), 44 deletions(-) diff --git a/src/app/_modules/pages/page/breadcrumbs/page-breadcrumbs.component.scss b/src/app/_modules/pages/page/breadcrumbs/page-breadcrumbs.component.scss index 7abaa65..62c62f7 100644 --- a/src/app/_modules/pages/page/breadcrumbs/page-breadcrumbs.component.scss +++ b/src/app/_modules/pages/page/breadcrumbs/page-breadcrumbs.component.scss @@ -1,5 +1,5 @@ .breadcrumbs { - padding: 12px 0; + padding: 12px 0 0 0; display: flex; flex-wrap: wrap; row-gap: 12px; diff --git a/src/app/_modules/pages/page/page.component.html b/src/app/_modules/pages/page/page.component.html index 1a0eb75..77eee0a 100644 --- a/src/app/_modules/pages/page/page.component.html +++ b/src/app/_modules/pages/page/page.component.html @@ -8,14 +8,17 @@ +
+ +
-
+ +
diff --git a/src/app/_modules/pages/page/page.component.scss b/src/app/_modules/pages/page/page.component.scss index fe0beec..3be5f53 100644 --- a/src/app/_modules/pages/page/page.component.scss +++ b/src/app/_modules/pages/page/page.component.scss @@ -52,15 +52,17 @@ .nav-info{ display: flex; - justify-content: space-between; - + justify-content: end; + padding: 16px 0; } .holder { margin-bottom: 32px; } + } + .dual-cols { display: flex; flex-direction: row; diff --git a/src/app/_modules/pages/sections/add/add-section.component.scss b/src/app/_modules/pages/sections/add/add-section.component.scss index 353af27..1d61c26 100644 --- a/src/app/_modules/pages/sections/add/add-section.component.scss +++ b/src/app/_modules/pages/sections/add/add-section.component.scss @@ -2,8 +2,9 @@ position: relative; display: inline-block; height: 24px; + margin-top: 16px; margin-bottom: 40px; - margin-top: 40px; + .toggle { position: relative; diff --git a/src/app/_modules/pages/sections/item/page-section.component.scss b/src/app/_modules/pages/sections/item/page-section.component.scss index 344632a..43813e3 100644 --- a/src/app/_modules/pages/sections/item/page-section.component.scss +++ b/src/app/_modules/pages/sections/item/page-section.component.scss @@ -1,5 +1,8 @@ -.add { - margin-bottom: 12px; + +.section { + margin-top: 24px; + display: flex; + flex-direction: column; } @media screen and (max-width: 768px) { diff --git a/src/app/_modules/pages/sections/types/basic/contact/contact-section.component.scss b/src/app/_modules/pages/sections/types/basic/contact/contact-section.component.scss index 5dd025a..b1e93a4 100644 --- a/src/app/_modules/pages/sections/types/basic/contact/contact-section.component.scss +++ b/src/app/_modules/pages/sections/types/basic/contact/contact-section.component.scss @@ -1,5 +1,4 @@ .contact { - margin-bottom: 40px; h2 { color: #2D2D2D; @@ -9,11 +8,13 @@ font-weight: 700; line-height: 32px; /* 133.333% */ letter-spacing: 0.24px; - margin-bottom: 32px; + margin-bottom: 0px; + margin-top: 8px; } p{ - margin-bottom: 24px; + margin-top: 24px; + margin-bottom: 0px; } } diff --git a/src/app/_modules/pages/sections/types/basic/header/header-section.component.scss b/src/app/_modules/pages/sections/types/basic/header/header-section.component.scss index ab1f908..8b13789 100644 --- a/src/app/_modules/pages/sections/types/basic/header/header-section.component.scss +++ b/src/app/_modules/pages/sections/types/basic/header/header-section.component.scss @@ -1,27 +1 @@ -h2 { - color: var(--dark-1); - font-family: PT Sans Narrow; - font-size: 50px; - font-style: normal; - font-weight: 700; - line-height: 60px; /* 120% */ - letter-spacing: 0.5px; -} -h3 { - color: var(--dark-1); - font-family: PT Sans Narrow; - font-size: 36px; - font-style: normal; - font-weight: 700; - line-height: 60px; /* 120% */ - letter-spacing: 0.36px; -} -h4 { - color: var(--dark-1); - font-family: PT Sans Narrow; - font-size: 24px; - font-style: normal; - font-weight: 700; - line-height: 44px; /* 133.333% */ - letter-spacing: 0.24px; -} + diff --git a/src/app/_modules/pages/sections/types/basic/html/html-section.component.scss b/src/app/_modules/pages/sections/types/basic/html/html-section.component.scss index 68e5e37..6a1f6c8 100644 --- a/src/app/_modules/pages/sections/types/basic/html/html-section.component.scss +++ b/src/app/_modules/pages/sections/types/basic/html/html-section.component.scss @@ -11,6 +11,10 @@ color: var(--blue-3); }; } - + >div{ + display: block; + margin-top: -16px; + margin-bottom: -16px; + } } diff --git a/src/assets/css/basics.scss b/src/assets/css/basics.scss index 3e142b3..64fe8cc 100644 --- a/src/assets/css/basics.scss +++ b/src/assets/css/basics.scss @@ -40,10 +40,38 @@ body { } -h1 { - margin: 0 0 24px; - font-size: 2rem; - font-weight: bold; +h2 { + color: var(--dark-1); + font-family: PT Sans Narrow; + font-size: 50px; + font-style: normal; + font-weight: 700; + line-height: 60px; /* 120% */ + letter-spacing: 0.5px; + padding-top: 16px; + margin:0; +} +h3 { + color: var(--dark-1); + font-family: PT Sans Narrow; + font-size: 36px; + font-style: normal; + font-weight: 700; + line-height: 60px; /* 120% */ + letter-spacing: 0.36px; + padding-top: 8px; + margin:0; +} +h4 { + color: var(--dark-1); + font-family: PT Sans Narrow; + font-size: 24px; + font-style: normal; + font-weight: 700; + line-height: 44px; /* 133.333% */ + letter-spacing: 0.24px; + padding-top: 8px; + margin:0; } a { diff --git a/src/styles.scss b/src/styles.scss index 70876d5..89c3e58 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -31,12 +31,12 @@ .menu { display: flex; .block { - margin-bottom: 24px; background: #fff; border: 1px solid #C0C0C0; border-radius: 12px; padding: 12px 24px; display: flex; + margin-bottom: 24px; column-gap: 20px; button { background-position: center;