From cce1b8fc1b4bbcaa4e31878a470327e1c0cb8fe9 Mon Sep 17 00:00:00 2001 From: Boris Voropaev Date: Tue, 24 Oct 2023 17:15:59 +0300 Subject: [PATCH] bag-fix --- .../user-bar/header-user-bar.component.ts | 6 +- .../_modules/pages/page/page.component.html | 7 - .../_modules/pages/page/page.component.scss | 153 +----------------- .../sections/item/page-section.component.html | 2 +- src/assets/css/basics.scss | 3 + 5 files changed, 11 insertions(+), 160 deletions(-) diff --git a/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts b/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts index 471ff1e..7f74903 100644 --- a/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts +++ b/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts @@ -2,6 +2,8 @@ import {Component, Input} from '@angular/core'; import {AuthenticationService} from "@app/_services"; import {Router} from "@angular/router"; import {Subscription} from "rxjs"; +import { PagesService } from '@app/_services/pages.service'; + @Component({ selector: 'header-user-bar', @@ -16,7 +18,8 @@ export class HeaderUserBarComponent { constructor( public authService: AuthenticationService, - private router: Router) { + private router: Router, + private pagesService: PagesService) { this.subscriptionUser = this.authService.user.subscribe(user => { this.user = user; }); @@ -47,6 +50,7 @@ export class HeaderUserBarComponent { logout() { if (confirm('Вы деествительно хотите выйти из системы?')) { + this.pagesService.editMode.next(false) this.authService.logout(); this.ddHidden = true; this.router.navigate(['']).then(); diff --git a/src/app/_modules/pages/page/page.component.html b/src/app/_modules/pages/page/page.component.html index 8f24a0a..f9c2569 100644 --- a/src/app/_modules/pages/page/page.component.html +++ b/src/app/_modules/pages/page/page.component.html @@ -2,7 +2,6 @@ -
@@ -11,12 +10,6 @@

Page type {{page?.type?.name}} is undefined

-
- - - -
-
diff --git a/src/app/_modules/pages/page/page.component.scss b/src/app/_modules/pages/page/page.component.scss index a60bdeb..33f8f35 100644 --- a/src/app/_modules/pages/page/page.component.scss +++ b/src/app/_modules/pages/page/page.component.scss @@ -1,158 +1,9 @@ -.content { - background-color: var(--light); - padding-bottom: 120px; - .limiter{ - max-width: 1280px; - } - .row { - display: block; - width: 100%; - border-bottom: 1px solid var(--second-dis); - background-color: #FFF; - .page-header { - display: flex; - flex-direction: column; - justify-content: center; - align-items: start; - width: 100%; - height: 400px; - background-color: #86898E; - background-size: cover; - background-position: center; - overflow: hidden; - .block{ - position: absolute; - top:136px; - left: calc((100% - 1280px) / 2); - } - .limiter{ - - display: block; - - .line{ - display: inline-block; - border-bottom: 12px solid var(--blue-0); - h1{ - display: inline; - padding-right: 40px; - vertical-align: 2px; - font-family: PT Sans Narrow; - font-size: 76px; - font-style: normal; - font-weight: 700; - line-height:100%; - letter-spacing: 0.76px; - color: white; - } - } - - } - - } - .left { - flex-grow: 1; - } - .right { - margin-left: 32px; - display: flex; - flex-direction: row; - align-items: center; - flex-shrink: 0; - cursor: pointer; - .label { - margin-right: 8px; - font-size: 20px; - color: var(--second-act); - } - } - } - - .nav-info{ - display: flex; - justify-content: end; - padding: 16px 0; - - } - - @media screen and (min-width: 1330px){ - .double-column{ - display: flex; - align-items: flex-start; - gap: 40px; - .pages{ - flex-grow: 1; - flex-shrink: 1; - } - .sub-menu{ - flex-grow: 0; - flex-shrink: 0; - flex-basis: 360px; - width: 360px; - - margin-top: 40px; - } - } - } - - @media screen and (max-width: 1330px) { - .nav-info{ - display: none; - } - } - - .holder { - margin-bottom: 32px; - } +@media screen and (min-width: 1330px){ } - -.dual-cols { - display: flex; - flex-direction: row; - width: 100%; - - .col { - &.left { - flex-grow: 1; - } - - &.right { - flex-shrink: 0; - width: 400px; - margin-left: 40px; - } - } -} - @media screen and (max-width: 480px) { - .content { - h1 { - font-size: 1.5rem; - line-height: 2rem; - } - .row { - flex-direction: column-reverse; - //padding-top: 24px; - .right { - visibility: hidden; - } - } - .row .page-header .limiter .line h1 { - font-size: 50px; - line-height: 60px; - letter-spacing: 0.5px; - } - } - .dual-cols { - flex-direction: column; - .col { - &.right { - width: 100%; - margin-left: 0 !important; - } - } - } + } diff --git a/src/app/_modules/pages/sections/item/page-section.component.html b/src/app/_modules/pages/sections/item/page-section.component.html index ec57989..3fe3261 100644 --- a/src/app/_modules/pages/sections/item/page-section.component.html +++ b/src/app/_modules/pages/sections/item/page-section.component.html @@ -1,7 +1,7 @@
-
+
diff --git a/src/assets/css/basics.scss b/src/assets/css/basics.scss index aaaad69..b8a3854 100644 --- a/src/assets/css/basics.scss +++ b/src/assets/css/basics.scss @@ -156,6 +156,9 @@ body { } .main-content{ flex-basis: 840px; + .pages{ + width: 100%; + } } right-content{ flex-basis: 400px;