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 09ba90a..e25b153 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,8 @@ -
+
@@ -33,11 +34,12 @@
+
-
+
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 f6107ab..baf57ef 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 @@ -4,6 +4,8 @@ display: block; width: 663px; height: 468px; + max-width: 80dvw; + max-height: 49dvw; margin-bottom: 8px; border-radius: 12px; border: 1px solid rgba(45, 45, 45, 0.27); @@ -136,6 +138,17 @@ align-items: center; justify-content: center; background-color: rgba(37, 46, 52, 60%); + .close{ + position: absolute; + top:24px; + right: 24px; + width: 48px; + height: 48px; + border-radius: 24px; + background: url('~src/assets/images/icons/close_blue_24dp.svg') center no-repeat; + background-color: #fff; + border: 2px solid var(--blue-1); + } .left { width: 72px; flex-grow: 0; 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 b9edad6..58e3ddc 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,10 +1,12 @@

- +

Документ

{{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 0407386..8362c50 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 @@ -29,4 +29,17 @@ border: 1px solid rgba(45, 45, 45, 0.27); } + + } +.full-screen{ + position: fixed; + top:0; + z-index: 200; + left: 0; + background-color: rgba(45, 45, 45, 0.63); + width: 100dvw; + height: 100vh; + object-fit: contain; + cursor: pointer; +} \ No newline at end of file diff --git a/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.ts b/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.ts index 4d08453..77027f4 100644 --- a/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.ts +++ b/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.ts @@ -18,6 +18,7 @@ export class MemberSectionItemComponent { } public item: any; + public fullScreen: boolean; ngOnInit() { this.fetch(); 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 d38ee63..ba0456c 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 @@ -10,13 +10,38 @@ + -
-
-
+
+ +
+
+
{{field?.value?.data[0]}}
+
+
+
{{field?.value?.data[0]}}
+
+
+
+
+
+
+
+
+
+ +
+ +
+
+
-
Подробнее
+
+ Подробнее +
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 1ed0e57..d40232b 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 @@ -35,8 +35,11 @@ object-fit: cover; display: flex; flex-direction: column; - grid-gap: 16px; + flex-basis: 30%; + >div{ + >*{margin-bottom: 16px;} + } .menu { } @@ -61,6 +64,45 @@ } .more { font-size: 20px; + img{ + vertical-align: -6px; + } + } + .link{ + font-size: 20px; + display: block; + } + + + .doc{ + width: 100%; + display: flex; + overflow: hidden; + text-overflow:ellipsis; + .doc-icon{ + flex-basis: 60px; + align-items: flex-start; + flex-shrink: 0; + height: 60px; + background: center no-repeat; + background-image: url('~src/assets/images/icons/document/document_pdf_60dp.svg'); + background-size: contain; + } + .doc-link{ + flex-shrink: 0; + flex-grow: 0; + flex-basis: 100%; + white-space: nowrap; + overflow: hidden; + text-overflow:ellipsis; + } + a{ + font-size: 20px; + + } + .description{ + color: #6C6C6C; + } } } } diff --git a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.ts b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.ts index 06db534..d4917a0 100644 --- a/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.ts +++ b/src/app/_modules/pages/sections/types/basic/member/list/member-section-list.component.ts @@ -38,10 +38,16 @@ export class MemberSectionListComponent { return this.section.id; } + iconUrl(name:string){ + return `url(/assets/images/icons/document/${name.toUpperCase()}.svg)` + } + get modelType() { return 'object'; } + public cover = '/assets/images/icons/view_man_273_370dp.svg'; + add() { let attach = {modelType: 'object', group: 'sections', modelId: this.section.id, ord: this.ord}; diff --git a/src/assets/images/icons/view_man_273_370dp.svg b/src/assets/images/icons/view_man_273_370dp.svg new file mode 100644 index 0000000..eb6993d --- /dev/null +++ b/src/assets/images/icons/view_man_273_370dp.svg @@ -0,0 +1,20 @@ + + + + + + + + + Layer 1 + + + + + + + + + + + \ No newline at end of file