From d22d5d6557204b8f80ba8ec0b6089fd08363521a Mon Sep 17 00:00:00 2001 From: Boris Voropaev Date: Thu, 2 Nov 2023 16:17:57 +0300 Subject: [PATCH] jumbotron --- projects/app-root/src/assets/css/grid.scss | 72 ++++++++++++++++++- .../app-vniigaz/src/assets/css/basics.scss | 6 +- .../app/_services/authentication.service.ts | 1 - 3 files changed, 74 insertions(+), 5 deletions(-) diff --git a/projects/app-root/src/assets/css/grid.scss b/projects/app-root/src/assets/css/grid.scss index a4d1772..7a61d42 100644 --- a/projects/app-root/src/assets/css/grid.scss +++ b/projects/app-root/src/assets/css/grid.scss @@ -156,4 +156,74 @@ footer{ padding: 0 16px; margin-top: 48px; } - } \ No newline at end of file + } + + + + + + .user { + + position: relative; + display: flex; + padding: 11px; + height: 64px; + justify-content: center; + background-color: #fff; + border-radius: 32px; + border: 1px solid var(--second-dis); + + .avatar { + width: 38px; + height: 38px; + color: var(--prime); + border: 1px solid var(--prime); + background: #fff; + border-radius: 100%; + display: flex; + justify-content: center; + align-items: center; + cursor: pointer; + overflow: hidden; + .initials { + } + img { + display: block; + width: 100%; + height: 100%; + object-fit: cover; + } + } + + .name{ + margin: 8px 4px 0 12px; + color: var(--second-act); + white-space: nowrap; + + } + + + + + drop-down { + + margin-top: 6px; + + } + + + } + @media screen and (max-width: 1330px) { + .user { + .avatar { + background-color: var(--white); + margin-right: 18px; + } + .name{ + display: none; + } + } + + } + + \ No newline at end of file diff --git a/projects/app-vniigaz/src/assets/css/basics.scss b/projects/app-vniigaz/src/assets/css/basics.scss index 92bb561..0bba4dc 100644 --- a/projects/app-vniigaz/src/assets/css/basics.scss +++ b/projects/app-vniigaz/src/assets/css/basics.scss @@ -118,8 +118,8 @@ body { .left-content{ width: 100%; height: 100%; - max-width: 1280px; - margin: 0 40px; + max-width: 1360px; + padding: 0 40px; position: relative; display: flex; flex-direction: row; @@ -136,7 +136,7 @@ body { } header-user-bar{ position: absolute; - right: 0; + right: 40px; top: 32px; } .menu{ diff --git a/projects/app/_services/authentication.service.ts b/projects/app/_services/authentication.service.ts index 53b3de3..02ed5b1 100644 --- a/projects/app/_services/authentication.service.ts +++ b/projects/app/_services/authentication.service.ts @@ -57,7 +57,6 @@ export class AuthenticationService { if (!params) params = {include: 'avatar,privileges'}; console.log('URL',environment.apiUrl) this.http.get(`${environment.apiUrl}/api/me`, {params: params}).subscribe((res: any) => { - console.log('USER',res.data) this.user.next(res?.data); }); }