From c29f58e0143f17c01981fe30448a0858e453b114 Mon Sep 17 00:00:00 2001 From: Boris Voropaev Date: Thu, 30 Nov 2023 10:57:18 +0300 Subject: [PATCH] jumbotron & greed --- .../pages/menu/pages-menu.component.scss | 8 -------- .../feedback/feedback-section.component.html | 3 --- .../layout/footer/footer.component.html | 2 +- .../layout/jumbotron/jumbotron.component.html | 1 - .../layout/jumbotron/jumbotron.component.ts | 5 +++-- src/vniigaz-v2/css/_dropdown.scss | 4 ++-- src/vniigaz-v2/css/_grid.scss | 15 ++++++++++----- src/vniigaz-v2/css/_main-menu.scss | 16 +++++++++++++++- src/vniigaz-v2/css/_pages-section.scss | 2 -- 9 files changed, 31 insertions(+), 25 deletions(-) diff --git a/src/app/_modules/pages/menu/pages-menu.component.scss b/src/app/_modules/pages/menu/pages-menu.component.scss index 49e499e..e69de29 100644 --- a/src/app/_modules/pages/menu/pages-menu.component.scss +++ b/src/app/_modules/pages/menu/pages-menu.component.scss @@ -1,8 +0,0 @@ -:host(pages-menu){ - display:flex; - flex-direction: column; - padding-left: 0; -} -pages-menu{ - padding-left: 24px; -} \ No newline at end of file diff --git a/src/app/_modules/pages/sections/types/basic/feedback/feedback-section.component.html b/src/app/_modules/pages/sections/types/basic/feedback/feedback-section.component.html index 370cb92..cd5c92b 100644 --- a/src/app/_modules/pages/sections/types/basic/feedback/feedback-section.component.html +++ b/src/app/_modules/pages/sections/types/basic/feedback/feedback-section.component.html @@ -7,9 +7,6 @@
-
diff --git a/src/vniigaz-v2/component/layout/footer/footer.component.html b/src/vniigaz-v2/component/layout/footer/footer.component.html index d50e841..697e6a0 100644 --- a/src/vniigaz-v2/component/layout/footer/footer.component.html +++ b/src/vniigaz-v2/component/layout/footer/footer.component.html @@ -21,7 +21,7 @@
- +
diff --git a/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.html b/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.html index 5ba35c1..2a25ffb 100644 --- a/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.html +++ b/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.html @@ -2,7 +2,6 @@

{{name}}

-
diff --git a/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.ts b/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.ts index 8795ff7..850ddc6 100644 --- a/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.ts +++ b/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.ts @@ -59,7 +59,7 @@ export class JumbotronComponent { } get bgStyle(){ - let height = 50; + let height = 150; let pictURL:string; if (this.contentPage){ height = 150; @@ -77,7 +77,8 @@ export class JumbotronComponent { color: this.contentPage?.picture?'var(--white)':'var(--second-act)', 'align-self': this.mainPage?'center':'left', 'text-align': this.mainPage?'center':'left', - 'width': this.mainPage?'900px':'100%' + 'width': this.mainPage?'900px':null, + 'border-bottom':this.mainPage?null:'12px solid #2EB2E8' } } diff --git a/src/vniigaz-v2/css/_dropdown.scss b/src/vniigaz-v2/css/_dropdown.scss index 2584d1b..6ecfb6a 100644 --- a/src/vniigaz-v2/css/_dropdown.scss +++ b/src/vniigaz-v2/css/_dropdown.scss @@ -1,8 +1,8 @@ .dropdown { position: absolute; width: 250px; - left: 48px; - top: 32px; + right: 24px; + top: 62px; z-index: 10; z-index: 1000; diff --git a/src/vniigaz-v2/css/_grid.scss b/src/vniigaz-v2/css/_grid.scss index 4f42cda..d3e47df 100644 --- a/src/vniigaz-v2/css/_grid.scss +++ b/src/vniigaz-v2/css/_grid.scss @@ -28,17 +28,20 @@ jumbotron{ height: 100%; display: flex; flex-direction: column; - justify-content: space-between; + justify-content: center; + align-items: flex-start; + position: relative; .user-bar{ justify-content: flex-end; } header-user-bar{ - margin-top: $pl; - align-self: flex-end; + top: $pl; + right: 40px; + position: absolute; } h1{ - margin-top: calc( 0px - $pl ); - width: 100%; + margin: 0; + padding: $ps 0; } } } @@ -65,6 +68,8 @@ jumbotron{ .content-grid{ display: flex; justify-content: center; + margin: 40px 0 120px; + left-content{ display: none; } diff --git a/src/vniigaz-v2/css/_main-menu.scss b/src/vniigaz-v2/css/_main-menu.scss index 4c1ca71..1cf8778 100644 --- a/src/vniigaz-v2/css/_main-menu.scss +++ b/src/vniigaz-v2/css/_main-menu.scss @@ -1,3 +1,14 @@ +pages-menu{ + display:flex; + flex-direction: column; + padding-left: 0; +} +pages-menu{ + padding-left: 24px; +} + + + header{ background-color: var(--white); @@ -53,6 +64,7 @@ header{ width: 100%; justify-content: center; padding-bottom: 36px; + z-index: 1; } @@ -134,10 +146,12 @@ slider-menu{ } } right-content{ - padding-top: 40px; drop-down{ display: none; } + pages-menu{ + padding-left: 0; + } .item{ min-height: 0; padding: 10px 20px; diff --git a/src/vniigaz-v2/css/_pages-section.scss b/src/vniigaz-v2/css/_pages-section.scss index bb1195b..d2057b3 100644 --- a/src/vniigaz-v2/css/_pages-section.scss +++ b/src/vniigaz-v2/css/_pages-section.scss @@ -1,6 +1,4 @@ page-sections{ - margin-top: 40px; - margin-bottom: 120px; display: flex; flex-direction: column; gap:24px;