From 38b1214ba7fc1bc3b2ae666747f067f3b7aacd95 Mon Sep 17 00:00:00 2001 From: Boris Voropaev Date: Wed, 6 Sep 2023 12:46:59 +0300 Subject: [PATCH] groups sections --- .../image-group-section.component.html | 4 ++- .../image-group-section.component.scss | 12 +++++--- .../images/images-section.component.html | 2 +- .../images/images-section.component.scss | 6 +++- .../item/member-section-item.component.html | 6 ++-- .../item/member-section-item.component.scss | 29 +++++++++++++++++++ .../list/member-section-list.component.html | 4 ++- .../list/member-section-list.component.scss | 27 ++++++++++++----- src/environments/environment.ts | 2 +- 9 files changed, 72 insertions(+), 20 deletions(-) diff --git a/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.html b/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.html index 7ce6aa7..2456035 100644 --- a/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.html +++ b/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.html @@ -1,6 +1,8 @@
-
+
+

+
diff --git a/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.scss b/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.scss index 429bf50..7be1d8f 100644 --- a/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.scss +++ b/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.scss @@ -26,10 +26,10 @@ } .list { margin: 32px 0; - display: grid; - gap: 32px 40px; + display: flex; + gap: 40px; width: 100%; - grid-template-columns: repeat(3, 1fr); + flex-wrap: wrap; .item { object-fit: cover; .menu { @@ -37,8 +37,12 @@ } .image { img { - width: calc(100%); + width: 273px; + object-fit: cover; + height: 204px; border-radius: 12px; + border: 2px solid var(--blue-4); + cursor: pointer; } } .name { diff --git a/src/app/_modules/pages/sections/types/basic/images/images-section.component.html b/src/app/_modules/pages/sections/types/basic/images/images-section.component.html index fc8bf37..09ba90a 100644 --- a/src/app/_modules/pages/sections/types/basic/images/images-section.component.html +++ b/src/app/_modules/pages/sections/types/basic/images/images-section.component.html @@ -4,7 +4,7 @@
-
+
diff --git a/src/app/_modules/pages/sections/types/basic/images/images-section.component.scss b/src/app/_modules/pages/sections/types/basic/images/images-section.component.scss index 342a124..f6107ab 100644 --- a/src/app/_modules/pages/sections/types/basic/images/images-section.component.scss +++ b/src/app/_modules/pages/sections/types/basic/images/images-section.component.scss @@ -15,7 +15,11 @@ } } } - +.large img{ + max-width: 100%; + border-radius: 12px; + border: 1px solid rgba(45, 45, 45, 0.27); +} .items { display: flex; diff --git a/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.html b/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.html index 6b6f12b..f9bd0b4 100644 --- a/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.html +++ b/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.html @@ -1,9 +1,9 @@
-
{{item | json}}
+

-

-

Документ

+

+

Документ

{{email}}

{{phone}}

diff --git a/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.scss b/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.scss index 9087971..16eeb20 100644 --- a/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.scss +++ b/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.scss @@ -1,3 +1,32 @@ .member { + font-size: 20px; + font-style: normal; + font-weight: 400; + line-height: 32px; + font-style: normal; + + + + color:#2D2D2D; + h1{ + font-family: PT Sans Narrow; + font-weight: 700; + letter-spacing: 0.5px; + font-size: 50px; + line-height: 60px; /* 120% */ + font-weight: 700; + } + .doc{ + display: block; + background: url('~src/assets/images/icons/document_pdf_60dp.svg') top left no-repeat; + padding-left: 62px; + min-height: 60px; + } + img{ + max-width: 345px; + border-radius: 12px; + border: 1px solid rgba(45, 45, 45, 0.27); + } + } diff --git a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.html b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.html index ff8df0b..d38ee63 100644 --- a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.html +++ b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.html @@ -1,6 +1,8 @@
-
+
+

+
diff --git a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.scss b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.scss index a833c0d..7d033ca 100644 --- a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.scss +++ b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.scss @@ -26,29 +26,40 @@ } .list { margin: 32px 0; - display: grid; - gap: 32px 40px; + display: flex; + gap: 40px; width: 100%; - grid-template-columns: repeat(3, 1fr); + flex-wrap: wrap; + .item { object-fit: cover; + display: flex; + flex-direction: column; + grid-gap: 16px; .menu { } .image { img { - width: calc(100%); + width: 273px; + object-fit: cover; + height: 370px; border-radius: 12px; + border: 1px solid rgba(45, 45, 45, 0.27); } } .name { - + font-size: 24px; + font-weight: 700; + line-height: 32px; /* 133.333% */ + letter-spacing: 0.24px; + color:#6C6C6C } - .description { - + .position { + font-size: 20px; } .more { - + font-size: 20px; } } } diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 30738e7..40e04c9 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -6,7 +6,7 @@ export const environment = { production: false, apiUrl: 'http://api.vniigazv2.lc', clientId: 2, - clientSecret: 'pwyOjmmtHGUUM8KFPjgZrpbbrrJkQ45PkthQ5Xtp', + clientSecret: 'AbV5mDVEimNQb2dKJTx9PYALFCiiYOHTsbeMEtp2', }; /*