diff --git a/src/nir/component/layout/footer/footer.component.html b/src/nir/component/layout/footer/footer.component.html index b647a4c..002e8cb 100644 --- a/src/nir/component/layout/footer/footer.component.html +++ b/src/nir/component/layout/footer/footer.component.html @@ -1,42 +1,17 @@ -
-
- -
-
- +7 (498) 657-45-18 -
-
- info@vniigaz-cert.ru -
-
- 142717, Российская Федерация, Московская область, г. Видное, посёлок Развилка, ВНИИГАЗ -
-
- - - - - - - - - -
- -
+
+ + + info@nirgroup.ru + +
+ + +7 (499) 490-04-65
-
-
-
- © 1998–{{year}} ЧУ СЦ ВНИИГАЗ-Сертификат -
-
- Работает на платформе НИР -
+
+ + 121170, Москва, Кутузовский пр-т, д. 36, стр. 3, оф. 222 +
+
+ © 2016–2023 ООО «НИР»
diff --git a/src/nir/component/layout/jumbotron/jumbotron.component.ts b/src/nir/component/layout/jumbotron/jumbotron.component.ts index fef0b6d..254feb0 100644 --- a/src/nir/component/layout/jumbotron/jumbotron.component.ts +++ b/src/nir/component/layout/jumbotron/jumbotron.component.ts @@ -24,7 +24,6 @@ export class JumbotronComponent { this.subscription = this.pagesService.currentPageSubject.subscribe( resp=> { this.currentPage = resp; - console.log(this.currentPage) if (this.currentPage) { if(this.currentPage.picture){ this.pagePicture = this.currentPage.picture.data.links.open diff --git a/src/nir/css/_grid.scss b/src/nir/css/_grid.scss index 5a0d842..2eb9625 100644 --- a/src/nir/css/_grid.scss +++ b/src/nir/css/_grid.scss @@ -115,76 +115,27 @@ jumbotron{ } footer{ - background-color: var(--prime-act); - align-self: stretch; - - .footer { - width: 100%; - padding: 40px 0; - margin-top: 48px; - font-size: 16px; - color: white; + background-color: var(--bg-lt); + box-shadow: 0px 2px 8px 0px rgba(0, 0, 0, 0.12); + display: flex; + justify-content: center; + padding: 32px; + .footer{ display: flex; flex-direction: column; - .block{ - display: flex; - justify-content: space-between; - flex-wrap: wrap; - gap: 40px; - .logo{ - display: flex; - flex-direction: column; - justify-content: space-between; - align-items: flex-start; - } - a{ - cursor: pointer; - color: white; - :hover{ - color: white; - } - } - - &>div{ - padding-bottom: 40px; - max-width: fit-content; - flex-basis: 400px; - } - >div{ - display: block; - flex-shrink: 0; - margin-bottom: -16px; - >div { - margin-bottom: 16px; - } - } - .icons a{ - margin-right: 16px; - } - .menu{ - display: block; + gap: 16px; + flex-basis: 720px; + >*{ + display: inline-flex; + align-items: center; + gap: 16px; + svg{ + color: var(--bk44); } } - - .line{ - width: 100%; - height: 1px; - background-color: var(--prime); - } - - .copyright{ - display: flex; - justify-content: space-between; - font-size: 16px; - font-style: normal; - font-weight: 400; - margin: 40px 0; - .nir a{ - color: #6C6C6C; - &:hover{ - color: #7c7c7c; - } - } + .nir-link{ + margin-top: 16px; + color: var(--bk44); } } } @@ -216,12 +167,9 @@ pages-menu-item{ -@media screen and (max-width: 1330px){ - .footer{ - padding: 40px 24px; - .footer-login{ - display: none; - } +@media screen and (max-width: 1024px){ + footer{ + padding: 24px; } .space{ .layout-corral{ @@ -237,7 +185,10 @@ pages-menu-item{ } -@media screen and (max-width: 900px){ +@media screen and (max-width: 720px){ + footer{ + padding: 16px; + } .space{ .layout-corral, .page-corral{ padding: 0 24px; diff --git a/src/nir/css/_pages-section.scss b/src/nir/css/_pages-section.scss index 8503de7..491c395 100644 --- a/src/nir/css/_pages-section.scss +++ b/src/nir/css/_pages-section.scss @@ -391,6 +391,10 @@ publications-list{ &:last-child{ border-bottom: 1px solid var(--second-dis); } + + .not-published{ + opacity: 0.5; + } .date{ color: var(--second); diff --git a/src/nir/images/Contacts.png b/src/nir/images/Contacts.png new file mode 100644 index 0000000..de4060c Binary files /dev/null and b/src/nir/images/Contacts.png differ diff --git a/src/nir/images/Portfolio.png b/src/nir/images/Portfolio.png new file mode 100644 index 0000000..8f0fbb3 Binary files /dev/null and b/src/nir/images/Portfolio.png differ diff --git a/src/nir/images/Services.png b/src/nir/images/Services.png new file mode 100644 index 0000000..9f68e8f Binary files /dev/null and b/src/nir/images/Services.png differ diff --git a/src/nir/images/Uslugi.png b/src/nir/images/Uslugi.png new file mode 100644 index 0000000..df40cba Binary files /dev/null and b/src/nir/images/Uslugi.png differ diff --git a/src/nir/images/home (1).png b/src/nir/images/home (1).png new file mode 100644 index 0000000..60826cc Binary files /dev/null and b/src/nir/images/home (1).png differ diff --git a/src/nir/images/home.png b/src/nir/images/home.png new file mode 100644 index 0000000..cd9149a Binary files /dev/null and b/src/nir/images/home.png differ diff --git a/src/nir/images/ico/location_24.svg b/src/nir/images/ico/location_24.svg new file mode 100644 index 0000000..9e900cd --- /dev/null +++ b/src/nir/images/ico/location_24.svg @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/nir/images/ico/mail_24.svg b/src/nir/images/ico/mail_24.svg new file mode 100644 index 0000000..0834b26 --- /dev/null +++ b/src/nir/images/ico/mail_24.svg @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/nir/images/ico/phone_24.svg b/src/nir/images/ico/phone_24.svg new file mode 100644 index 0000000..746d689 --- /dev/null +++ b/src/nir/images/ico/phone_24.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.ts b/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.ts index fef0b6d..254feb0 100644 --- a/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.ts +++ b/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.ts @@ -24,7 +24,6 @@ export class JumbotronComponent { this.subscription = this.pagesService.currentPageSubject.subscribe( resp=> { this.currentPage = resp; - console.log(this.currentPage) if (this.currentPage) { if(this.currentPage.picture){ this.pagePicture = this.currentPage.picture.data.links.open diff --git a/src/vniigaz-v2/css/_pages-section.scss b/src/vniigaz-v2/css/_pages-section.scss index e63796a..491c395 100644 --- a/src/vniigaz-v2/css/_pages-section.scss +++ b/src/vniigaz-v2/css/_pages-section.scss @@ -391,6 +391,10 @@ publications-list{ &:last-child{ border-bottom: 1px solid var(--second-dis); } + + .not-published{ + opacity: 0.5; + } .date{ color: var(--second); @@ -566,10 +570,11 @@ video-section{ &.next { margin-right: 20px; border-color: transparent; - font-size: 0.875rem; + font-family: PT Sans; + font-size: 16px; font-style: normal; font-weight: 400; - line-height: 18px; + line-height: 24px; } } .dots {