Skip to content

Commit 5ad96e3

Browse files
alerts fix:
- fix alerts wrapper component position; - define alerts position in mat-sidenav-content component; - fix alert position in Permissions dialog.
1 parent 1d2e678 commit 5ad96e3

5 files changed

Lines changed: 26 additions & 18 deletions

File tree

frontend/src/app/app.component.css

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,11 @@
2323
}
2424

2525
.nav-bar {
26+
position: sticky;
27+
top: 0;
2628
flex-shrink: 0;
2729
background-color: #212121;
30+
z-index: 3;
2831
}
2932

3033
@media (prefers-color-scheme: dark) {
@@ -33,18 +36,6 @@
3336
}
3437
}
3538

36-
.nav-bar_interior {
37-
--mat-toolbar-standard-height: 44px !important;
38-
39-
position: sticky;
40-
top: 0;
41-
z-index: 3;
42-
}
43-
44-
.nav-bar_exterior {
45-
--mat-toolbar-standard-height: 56px !important;
46-
}
47-
4839
.nav-bar_home {
4940
display: flex;
5041
align-items: center;
@@ -246,6 +237,14 @@
246237
flex-direction: column;
247238
}
248239

240+
.main-menu-content_interior {
241+
--mat-toolbar-standard-height: 44px !important;
242+
}
243+
244+
.main-menu-content_exterior {
245+
--mat-toolbar-standard-height: 56px !important;
246+
}
247+
249248
.tab-content-wrapper {
250249
flex: 1 0 auto;
251250
}

frontend/src/app/app.component.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@
5151
</a>
5252
</mat-sidenav>
5353

54-
<mat-sidenav-content class="main-menu-content">
54+
<mat-sidenav-content class="main-menu-content"
55+
[ngClass]="{'main-menu-content_exterior': userLoggedIn === false, 'main-menu-content_interior': userLoggedIn === true}">
5556
<mat-toolbar color="primary" class="nav-bar"
5657
[ngClass]="{'nav-bar_home': !connectionID, 'nav-bar_connection': connectionID,
5758
'nav-bar_exterior': userLoggedIn === false, 'nav-bar_interior': userLoggedIn === true}">

frontend/src/app/components/ui-components/alert/alert.component.css

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1-
.alert {
1+
:host {
22
position: sticky;
3-
top: 44px;
3+
top: var(--mat-toolbar-standard-height);
4+
z-index: 2;
5+
}
6+
7+
.alert {
48
display: flex;
59
gap: 12px;
610
background-color: var(--bg-color);
711
border-left: 12px solid var(--alert-theme-color);
812
margin-bottom: 8px;
913
padding: 12px 16px;
10-
z-index: 2;
1114
}
1215

1316
@media (prefers-color-scheme: dark) {

frontend/src/app/components/users/permissions-add-dialog/permissions-add-dialog.component.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
margin-bottom: 12px;
33
}
44

5+
.permissions-alert {
6+
position: relative;
7+
top: -8px;
8+
}
9+
510
.permissions-form ::ng-deep .mat-mdc-dialog-content {
611
color: var(--mat-sidenav-content-text-color);
712
}

frontend/src/app/components/users/permissions-add-dialog/permissions-add-dialog.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<h1 mat-dialog-title>Permissions for <strong>{{ group.title }}</strong> group</h1>
22
<form #addPermissionsForm="ngForm" class="permissions-form" (ngSubmit)="addPermissions()">
33
<mat-dialog-content>
4-
<app-alert *ngIf="connectionAccess === 'edit' && group.title === 'Admin'" [alert]="adminGroupAlert"></app-alert>
5-
<app-alert *ngIf="connectionAccess === 'edit' && group.title !== 'Admin'" [alert]="connectionFullAccessAlert"></app-alert>
4+
<app-alert *ngIf="connectionAccess === 'edit' && group.title === 'Admin'" [alert]="adminGroupAlert" class="permissions-alert"></app-alert>
5+
<app-alert *ngIf="connectionAccess === 'edit' && group.title !== 'Admin'" [alert]="connectionFullAccessAlert" class="permissions-alert"></app-alert>
66

77
<div class="permissions">
88
<h2 class="mat-subtitle-1 permissions__title">Connection credentials</h2>

0 commit comments

Comments
 (0)