small fix

master
Boris Voropaev 2023-08-28 18:05:53 +03:00
parent 97c978fd1d
commit 22c474aeae
10 changed files with 24 additions and 8 deletions

View File

@ -46,7 +46,7 @@
<div>
<a href="#">Новости</a>
</div>
<div>
<div *ngIf="!user">
<a (click)="login()">Вход для зарегистрированных пользователей</a>
</div>
</div>

View File

@ -17,6 +17,7 @@
</div>
</div>
</div> -->
<div class="bottom" [ngClass]="{hidemobile:!showBottom,showmobile:showBottom}">
<div class="logo">
</div>
@ -29,3 +30,4 @@
</div>
</div>
</div>
<header-user-bar *ngIf="user" [user]="user"></header-user-bar>

View File

@ -118,6 +118,10 @@
}
}
}
header-user-bar{
position: absolute;
right: 0;
}
}

View File

@ -1,4 +1,4 @@
<div class="user" *ngIf="user">
<div class="user">
<div class="avatar">
<img *ngIf="avatar" [src]="avatar.links?.thumb" />
<span *ngIf="!avatar" class="initials">{{user.initials}}</span>

View File

@ -1,4 +1,6 @@
.user {
width: 100px;
height: 100px;
position: relative;
.avatar {
width: 40px;

View File

@ -1,5 +1,5 @@
import {Component, Input} from '@angular/core';
import {AuthenticationService, ListsService} from "@app/_services";
import {AuthenticationService} from "@app/_services";
import {Router} from "@angular/router";
@Component({
@ -23,7 +23,7 @@ export class HeaderUserBarComponent {
}
ngOnInit() {
console.log(this.user)
}

View File

@ -15,6 +15,7 @@ export class PageComponent {
private url: string;
private inited = false;
routeSubscription?: Subscription;
subscription: Subscription;
constructor(private router: Router, private pagesService: PagesService, private listsService: ListsService) {
this.routeSubscription = this.router.events.subscribe(event => {
@ -23,6 +24,7 @@ export class PageComponent {
}
get permissions() {
return this.page?.permissions;
}

View File

@ -1,6 +1,6 @@
<div class="add">
<div class="toggle" (click)="toggleDD()">Добавить элемент</div>
<div class="dropdown" [class.active]="ddVisible" (mouseleave)="hideDD()">
<div class="dropdown active" [class.active]="ddVisible" (mouseleave)="hideDD()">
<div class="menu">
<div *ngFor="let type of types" class="type">
<div class="row" *ngIf="type?.children?.data?.length > 0; else addItem" (click)="submenu(type)">

View File

@ -61,10 +61,16 @@
}
&:last-child {
border-radius: 0 0 12px 12px;
.row {
border-bottom: none;
}
a, span {
border-bottom: none;
}
}
>&:hover {
background-color: #f7f7f7;
}
.row {
display: flex;
flex-direction: row;
@ -74,11 +80,11 @@
column-gap: 12px;
cursor: pointer;
color: #2D2D2D;
background: transparent;
&:hover {
background-color: #f7f7f7;
}
}
.sub-row {

View File

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB