diff --git a/angular.json b/angular.json index 309b708..71d5878 100644 --- a/angular.json +++ b/angular.json @@ -100,6 +100,10 @@ { "replace": "src/app/_modules/layout/jumbotron/jumbotron.component.ts", "with": "src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.ts" + }, + { + "replace": "src/app/_modules/pages/menu/slider-menu/slider-menu.component.ts", + "with": "src/vniigaz-v2/component/pages/menu/slider-menu/slider-menu.component.ts" } ], "inlineStyleLanguage": "scss", @@ -150,6 +154,10 @@ { "replace": "src/app/_modules/layout/jumbotron/jumbotron.component.ts", "with": "src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.ts" + }, + { + "replace": "src/app/_modules/pages/menu/slider-menu/slider-menu.component.ts", + "with": "src/vniigaz-v2/component/pages/menu/slider-menu/slider-menu.component.ts" } ], "inlineStyleLanguage": "scss", diff --git a/src/app/_modules/widjet/swiper-gallery/swiper-gallery.component.scss b/src/app/_modules/widjet/swiper-gallery/swiper-gallery.component.scss index d6dd5a6..acc914a 100644 --- a/src/app/_modules/widjet/swiper-gallery/swiper-gallery.component.scss +++ b/src/app/_modules/widjet/swiper-gallery/swiper-gallery.component.scss @@ -3,6 +3,7 @@ flex-direction: column; width: 100%; height: 100%; + max-height: 100vw; --swiper-navigation-color: #fff; --swiper-pagination-color: #fff; diff --git a/src/vniigaz-v2/component/pages/menu/slider-menu/slider-menu.component.html b/src/vniigaz-v2/component/pages/menu/slider-menu/slider-menu.component.html new file mode 100644 index 0000000..b602608 --- /dev/null +++ b/src/vniigaz-v2/component/pages/menu/slider-menu/slider-menu.component.html @@ -0,0 +1,13 @@ + + +
+ + +
+
\ No newline at end of file diff --git a/src/vniigaz-v2/component/pages/menu/slider-menu/slider-menu.component.scss b/src/vniigaz-v2/component/pages/menu/slider-menu/slider-menu.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/vniigaz-v2/component/pages/menu/slider-menu/slider-menu.component.ts b/src/vniigaz-v2/component/pages/menu/slider-menu/slider-menu.component.ts new file mode 100644 index 0000000..f2592bf --- /dev/null +++ b/src/vniigaz-v2/component/pages/menu/slider-menu/slider-menu.component.ts @@ -0,0 +1,22 @@ +import { Component } from '@angular/core'; +import {Router} from "@angular/router"; +import {PagesService} from "@app/_services/pages.service"; + +@Component({ + selector: 'slider-menu', + templateUrl: './slider-menu.component.html', + styleUrls: ['./slider-menu.component.scss'] +}) +export class SliderMenuComponent { + + constructor( + private router: Router, + public pagesService: PagesService + ) { + } + + get rootPages() { + return this.pagesService.rootPages; + } + +} diff --git a/src/vniigaz-v2/css/_basics.scss b/src/vniigaz-v2/css/_basics.scss index 2ade346..86e7521 100644 --- a/src/vniigaz-v2/css/_basics.scss +++ b/src/vniigaz-v2/css/_basics.scss @@ -375,6 +375,10 @@ footer{ } @media screen and (max-width: 480px) { + h1{ + font-size: 50px; + line-height: 60px; + } h2{ font-size: 36px; line-height: 44px; @@ -458,7 +462,8 @@ modal{ padding: 36px 24px; overflow-y: auto; img{ - max-width: 330px; + width: 330px; + max-width: 80vw; } } .modal-footer{ diff --git a/src/vniigaz-v2/css/_grid.scss b/src/vniigaz-v2/css/_grid.scss index 76f7701..304d2c6 100644 --- a/src/vniigaz-v2/css/_grid.scss +++ b/src/vniigaz-v2/css/_grid.scss @@ -67,7 +67,7 @@ jumbotron{ flex-grow: 1; .content-grid{ display: flex; - justify-content: center; + justify-content: space-between; margin: 40px 0 120px; left-content{ @@ -157,23 +157,6 @@ footer{ } } -@media screen and (max-width: 1330px){ - .footer{ - padding: 40px 24px; - } - .space{ - .layout-corral{ - max-width: 100vw; - } - } - right-content, left-content{ - display: none; - } -} - - - - pages-menu-item{ display: flex; @@ -195,8 +178,32 @@ pages-menu-item{ } - - .pages{ width: 100%; +} + + + +@media screen and (max-width: 1330px){ + .footer{ + padding: 40px 24px; + } + .space{ + .layout-corral{ + max-width: 100vw; + } + } + right-content, left-content{ + display: none; + } +} + + +@media screen and (max-width: 900px){ + .space{ + .layout-corral, .page-corral{ + padding: 0 24px; + } + } + } \ No newline at end of file diff --git a/src/vniigaz-v2/css/_main-menu.scss b/src/vniigaz-v2/css/_main-menu.scss index 4defb6b..672b7eb 100644 --- a/src/vniigaz-v2/css/_main-menu.scss +++ b/src/vniigaz-v2/css/_main-menu.scss @@ -135,6 +135,7 @@ slider[side="left"]{ } &.top-menu{ + margin-bottom: 20px; &>pages-menu-item>.item>a{ font-family: PT Sans Narrow; font-size: 24px; @@ -150,6 +151,20 @@ slider[side="left"]{ } } + .btn-menu{ + display: block; + padding: 20px 0 0 ; + border-top: 1px solid var(--prime); + a{ + font-family: PT Sans Narrow; + font-size: 24px; + font-style: normal; + font-weight: 700; + letter-spacing: 0.24px; + color: #FFF; + } + } + } diff --git a/src/vniigaz-v2/css/_pages-section.scss b/src/vniigaz-v2/css/_pages-section.scss index 1bc9194..6dd85f2 100644 --- a/src/vniigaz-v2/css/_pages-section.scss +++ b/src/vniigaz-v2/css/_pages-section.scss @@ -292,8 +292,8 @@ images-section{ .swiper-box{ - width: 100%; - height: 50vw; + width: 100% !important; + height: 75vw !important; max-height: 400px; } @@ -503,10 +503,10 @@ gellery{ video-section{ cursor: pointer; - width: 100%; .video-box{ max-width: 720px; - height: 400px; + height: 405px; + max-height: 52vw; position: relative; z-index: 0; diff --git a/src/vniigaz-v2/css/_slider.scss b/src/vniigaz-v2/css/_slider.scss index 1e22749..7ef212a 100644 --- a/src/vniigaz-v2/css/_slider.scss +++ b/src/vniigaz-v2/css/_slider.scss @@ -158,27 +158,7 @@ } } - .btn-menu{ - display: block; - padding: 15px var(--xl); - border-top: 1px solid var(--second); - div{ - - display: flex; - flex-direction: column; - gap: 15px; - button{ - display: flex; - justify-content: start; - font-weight: 300; - font-size: 15px; - &:hover{ - color: var(--active); - } - } - - } - } + [footer] {