diff --git a/src/app/_modules/layout/footer/footer.component.html b/src/app/_modules/layout/footer/footer.component.html index b5501a9..af71b53 100644 --- a/src/app/_modules/layout/footer/footer.component.html +++ b/src/app/_modules/layout/footer/footer.component.html @@ -47,7 +47,7 @@ Новости
- Вход для зарегистрированных пользователей + Вход для зарегистрированных пользователей
diff --git a/src/app/_modules/layout/footer/footer.component.ts b/src/app/_modules/layout/footer/footer.component.ts index 44c7130..32ee922 100644 --- a/src/app/_modules/layout/footer/footer.component.ts +++ b/src/app/_modules/layout/footer/footer.component.ts @@ -1,4 +1,6 @@ import {Component} from '@angular/core'; +import {AuthenticationService} from "@app/_services"; +import {Subscription} from "rxjs"; @Component({ selector: 'footer', @@ -6,10 +8,19 @@ import {Component} from '@angular/core'; styleUrls: ['footer.component.scss'] }) export class FooterComponent { - constructor() { + subscription: Subscription; + public user: any; + constructor(public authenticationService: AuthenticationService) { + this.subscription = this.authenticationService.user.subscribe(user => { + this.user = user; + }); } ngOnInit() { } + login() { + this.authenticationService.popup('login'); + } + } diff --git a/src/app/_modules/layout/grid/grid.component.html b/src/app/_modules/layout/grid/grid.component.html index a0c73e3..a4fdef8 100644 --- a/src/app/_modules/layout/grid/grid.component.html +++ b/src/app/_modules/layout/grid/grid.component.html @@ -2,9 +2,7 @@
-
-
diff --git a/src/app/_modules/pages/page/page.component.html b/src/app/_modules/pages/page/page.component.html index 85a8b33..51b05a8 100644 --- a/src/app/_modules/pages/page/page.component.html +++ b/src/app/_modules/pages/page/page.component.html @@ -1,11 +1,20 @@
-
+ +
+ +
Режим редактирования
-

{{page?.name}}

+
diff --git a/src/app/_modules/pages/page/page.component.scss b/src/app/_modules/pages/page/page.component.scss index f0581b3..c06869d 100644 --- a/src/app/_modules/pages/page/page.component.scss +++ b/src/app/_modules/pages/page/page.component.scss @@ -1,8 +1,36 @@ .content { .row { - display: flex; - flex-direction: row; + display: block; width: 100%; + .page-header { + display: flex; + flex-direction: column; + justify-content: center; + align-items: start; + width: 100%; + height: 400px; + background-color: #86898E; + .limiter{ + display: flex; + .line{ + border-bottom: 12px solid var(--blue-0); + h1{ + display: inline; + padding-right: 40px; + vertical-align: -20px; + font-family: PT Sans Narrow; + font-size: 76px; + font-style: normal; + font-weight: 700; + line-height: 60px; /* 100% */ + letter-spacing: 0.76px; + color: white; + } + } + + } + + } .left { flex-grow: 1; } @@ -21,13 +49,6 @@ } } - h1 { - font-weight: 700; - font-size: 2rem; - line-height: 2.5rem; - color: var(--grey-7); - } - .holder { margin-bottom: 32px; } diff --git a/src/assets/css/basics.scss b/src/assets/css/basics.scss index 876e010..af30f35 100644 --- a/src/assets/css/basics.scss +++ b/src/assets/css/basics.scss @@ -35,8 +35,7 @@ body { .limiter { width: 100%; - max-width: 1240px; - padding: 0 40px; + max-width: 900px; margin: 0 auto; } diff --git a/src/styles.scss b/src/styles.scss index 869972c..b18394d 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -3,10 +3,12 @@ --radius-2: 20px; --white: #ffffff; + --blue-0: #2EB2E8; --blue-1: #0070BA; --blue-2: #005799; --blue-3: #004077; --blue-4: #A1CAE5; + } * {