diff --git a/src/app/_modules/pages/sections/types/basic/cards/items/item/types/slides/cards-item-slides.component.html b/src/app/_modules/pages/sections/types/basic/cards/items/item/types/slides/cards-item-slides.component.html index fa5bb05..3f4a6d2 100644 --- a/src/app/_modules/pages/sections/types/basic/cards/items/item/types/slides/cards-item-slides.component.html +++ b/src/app/_modules/pages/sections/types/basic/cards/items/item/types/slides/cards-item-slides.component.html @@ -1,6 +1,6 @@ -
+
{{header}}
{{subheader}}
{{text}}
- +
\ No newline at end of file diff --git a/src/app/_modules/pages/sections/types/basic/cards/items/item/types/slides/cards-item-slides.component.ts b/src/app/_modules/pages/sections/types/basic/cards/items/item/types/slides/cards-item-slides.component.ts index 2c1d4f6..e8056fc 100644 --- a/src/app/_modules/pages/sections/types/basic/cards/items/item/types/slides/cards-item-slides.component.ts +++ b/src/app/_modules/pages/sections/types/basic/cards/items/item/types/slides/cards-item-slides.component.ts @@ -1,5 +1,6 @@ import { Component, Input } from '@angular/core'; import {ObjectsService} from "@app/_services"; +import { Router } from '@angular/router'; @Component({ @@ -9,7 +10,7 @@ import {ObjectsService} from "@app/_services"; }) export class CardsItemSlidesComponent { - constructor(private objectsService: ObjectsService) {} + constructor(private objectsService: ObjectsService, private router: Router) {} @Input() card:any; @@ -26,10 +27,17 @@ export class CardsItemSlidesComponent { get image() { return this.objectsService.getValue(this.card, 'image')?.links?.full+'?width=500'; } + get isImage(){ + return this.objectsService.getValue(this.card, 'image') + } get link() { return this.objectsService.getValue(this.card, 'link'); } + navigate(){ + this.router.navigate([this.link]).then() + } + } diff --git a/src/app/_modules/pages/sections/types/basic/contact/contact-section.component.html b/src/app/_modules/pages/sections/types/basic/contact/contact-section.component.html index 8251a85..2e80829 100644 --- a/src/app/_modules/pages/sections/types/basic/contact/contact-section.component.html +++ b/src/app/_modules/pages/sections/types/basic/contact/contact-section.component.html @@ -1,5 +1,5 @@
-

+

Юридический адрес

Фактический адрес

diff --git a/src/gbu/css/_grid.scss b/src/gbu/css/_grid.scss index a4d081e..385cdf6 100644 --- a/src/gbu/css/_grid.scss +++ b/src/gbu/css/_grid.scss @@ -87,6 +87,7 @@ jumbotron{ width: 411px; height: 100%; align-items: center; + margin-bottom: 0; img{ height: 532px; width: 100%; diff --git a/src/nir/component/layout/jumbotron/jumbotron.component.html b/src/nir/component/layout/jumbotron/jumbotron.component.html index de022a5..1017cbd 100644 --- a/src/nir/component/layout/jumbotron/jumbotron.component.html +++ b/src/nir/component/layout/jumbotron/jumbotron.component.html @@ -1,17 +1,17 @@
- -
-
-
- Режим редактирования - -
-
-
+ +
+
+
+ Режим редактирования + +
+
+

{{name}}

diff --git a/src/nir/css/_admin.scss b/src/nir/css/_admin.scss index 2872ba2..b14d6ea 100644 --- a/src/nir/css/_admin.scss +++ b/src/nir/css/_admin.scss @@ -5,6 +5,7 @@ font-weight: 400; line-height: 24px; max-width: 1020px; + margin-inline: auto; h2{ color: var(--second-act); margin-bottom: 48px; diff --git a/src/nir/css/_basics.scss b/src/nir/css/_basics.scss index 0bf5e6f..07bd793 100644 --- a/src/nir/css/_basics.scss +++ b/src/nir/css/_basics.scss @@ -241,12 +241,12 @@ h2 { line-height: 125%; /* 50px */ } h3 { - color: var(--bk66); - font-family: PT Serif; - font-size: 40px; + color: var(--bk44); + font-family: "PT Serif"; + font-size: 32px; font-style: normal; font-weight: 400; - line-height: 125%; + line-height: 125%; /* 40px */ } h4 { color: var(--bk44); @@ -255,7 +255,6 @@ h4 { font-style: normal; font-weight: 700; line-height: 24px; - margin-top: -24px; } a { diff --git a/src/nir/css/_grid.scss b/src/nir/css/_grid.scss index 79925b2..01b96bf 100644 --- a/src/nir/css/_grid.scss +++ b/src/nir/css/_grid.scss @@ -28,21 +28,7 @@ jumbotron{ align-items: center; position: relative; background: linear-gradient(to top, var(--bg), transparent); - .jumbotron-edit-field{ - height: 60px; - width: 100%; - max-width: 720px; - padding-inline: 24px; - .jumbotron-edit-field-row{ - div{ - display: flex; - align-items: center; - gap: $pxs; - } - display: flex; - justify-content: flex-end; - } - } + } @@ -53,6 +39,23 @@ jumbotron{ margin: 0; } } + +.jumbotron-edit-field{ + width: 100%; + padding-inline: 24px; + margin-top: 8px; + .jumbotron-edit-field-row{ + max-width: 720px; + margin-inline: auto; + div{ + display: flex; + align-items: center; + gap: $pxs; + } + display: flex; + justify-content: flex-end; + } +} } diff --git a/src/nir/css/_main-menu.scss b/src/nir/css/_main-menu.scss index ef900a8..f4c92f1 100644 --- a/src/nir/css/_main-menu.scss +++ b/src/nir/css/_main-menu.scss @@ -25,7 +25,7 @@ header, slider-menu{ } padding: 4px 0 0 0; border-bottom: solid 4px transparent; - &.current{ + &.current, &.parent{ border-color: var(--prime); } } @@ -45,12 +45,21 @@ header{ display: flex; justify-content: center; align-items: center; + height: 100%; pages-menu{ display: flex; flex-direction: row; - gap: 16px; - margin: 0 60px; + align-items: center; + height: 100%; + margin: 0 40px; + pages-menu-item{ + padding-inline: 8px; + height: 100%; + display: flex; + flex-direction: row; + align-items: center; + } &:not(.lvl-0){ display: none; } @@ -66,6 +75,8 @@ header{ display: flex; align-items: center; gap: 8px; + height: 100%; + padding: 8px; color: var(--black); font-family: PT Sans; font-size: 16px; @@ -79,13 +90,15 @@ header{ .header-logo{ cursor: pointer; + padding: 8px; + } - .burger:hover, .header-logo:hover, .header-login:hover ico, .item:hover{ + .burger:hover, .header-logo:hover, .header-login:hover, pages-menu-item:hover{ background-color: var(--bk4); } - .burger:active, .header-logo:active, .header-login:active ico, .item:active{ + .burger:active, .header-logo:active, .header-login:active, pages-menu-item:active{ background-color: var(--bk8); } } diff --git a/src/nir/css/_page-top-panel.scss b/src/nir/css/_page-top-panel.scss index ba868a7..ef6b6b4 100644 --- a/src/nir/css/_page-top-panel.scss +++ b/src/nir/css/_page-top-panel.scss @@ -5,7 +5,7 @@ header-user-bar{ position: relative; display: flex; justify-content: center; - background-color: #fff; + background-color: var(--bg-lt); .avatar { width: 38px; diff --git a/src/nir/css/_pages-section.scss b/src/nir/css/_pages-section.scss index 229b989..9a6a5f9 100644 --- a/src/nir/css/_pages-section.scss +++ b/src/nir/css/_pages-section.scss @@ -1,16 +1,16 @@ page-sections{ display: flex; flex-direction: column; - gap:24px; .section{ display: flex; flex-direction: column; } h2{ - margin-bottom: 8px; + margin-bottom: -24px; } h4 { - margin-bottom: -16px; + margin-top: -40px; + margin-bottom: -24px; } p+p{ padding-top: 16px; @@ -34,6 +34,14 @@ page-sections{ page-section{ display: block; max-width: 100%; + .section{ + >div{ + >*{ + margin-block: 24px; + } + } + } + } >div{ width: 100%; @@ -54,6 +62,7 @@ add-section, page-menu, images-section{ html-section { + margin-block: -18px; ul{ padding: 0; margin-bottom: 0; @@ -139,6 +148,25 @@ add-section, publications-list{ } } + +.contact { + + h2 { + color: var(--bk44); + font-family: "PT Sans"; + font-size: 18px; + font-style: normal; + font-weight: 400; + line-height: 27px; + margin-bottom: 0; + } + + p{ + margin-top: 0; + } + +} + images-section{ display: block; @@ -229,6 +257,9 @@ images-section{ background-color: grey; } + + + @media screen and (max-width: 700px){ .carousel { @@ -431,6 +462,7 @@ gellery{ video-section{ + display: block; cursor: pointer; .video-box{ max-width: 720px; @@ -527,7 +559,7 @@ maps-section{ cards-section{ display: block; width: 100%; - max-width: 1100px; + width: 1100px; .cards-add{ direction: ltr; display: flex; @@ -560,6 +592,7 @@ cards-section{ flex-wrap: wrap; justify-content: center; gap: 40px; + width: 100%; cards-section-item{ flex-basis: 340px; flex-shrink: 1; @@ -762,6 +795,10 @@ cards-section{ @media screen and (max-width: 1200px) { + cards-section{ + width: 100%; + } + .cards-section-slides.items{ margin-left: 0; } diff --git a/src/nir/images/ico/phone_24.svg b/src/nir/images/ico/phone_24.svg index 746d689..912a327 100644 --- a/src/nir/images/ico/phone_24.svg +++ b/src/nir/images/ico/phone_24.svg @@ -1,12 +1,9 @@ - - - - - - + + + - + diff --git a/src/nir/index.html b/src/nir/index.html index 6ce3a9e..89f7c1e 100644 --- a/src/nir/index.html +++ b/src/nir/index.html @@ -2,7 +2,7 @@ - ЧУ СЦ ВНИИГАЗ-Сертификат + НИР