diff --git a/frontend/src/app/app.component.css b/frontend/src/app/app.component.css index 0aced99f4..04f34b17e 100644 --- a/frontend/src/app/app.component.css +++ b/frontend/src/app/app.component.css @@ -23,8 +23,11 @@ } .nav-bar { + position: sticky; + top: 0; flex-shrink: 0; background-color: #212121; + z-index: 3; } @media (prefers-color-scheme: dark) { @@ -33,18 +36,6 @@ } } -.nav-bar_interior { - --mat-toolbar-standard-height: 44px !important; - - position: sticky; - top: 0; - z-index: 3; -} - -.nav-bar_exterior { - --mat-toolbar-standard-height: 56px !important; -} - .nav-bar_home { display: flex; align-items: center; @@ -246,6 +237,14 @@ flex-direction: column; } +.main-menu-content_interior { + --mat-toolbar-standard-height: 44px !important; +} + +.main-menu-content_exterior { + --mat-toolbar-standard-height: 56px !important; +} + .tab-content-wrapper { flex: 1 0 auto; } diff --git a/frontend/src/app/app.component.html b/frontend/src/app/app.component.html index b253211a3..9696d3143 100644 --- a/frontend/src/app/app.component.html +++ b/frontend/src/app/app.component.html @@ -51,7 +51,8 @@ - + diff --git a/frontend/src/app/components/ui-components/alert/alert.component.css b/frontend/src/app/components/ui-components/alert/alert.component.css index cfc14ca7f..450b916d6 100644 --- a/frontend/src/app/components/ui-components/alert/alert.component.css +++ b/frontend/src/app/components/ui-components/alert/alert.component.css @@ -1,13 +1,16 @@ -.alert { +:host { position: sticky; - top: 44px; + top: var(--mat-toolbar-standard-height); + z-index: 2; +} + +.alert { display: flex; gap: 12px; background-color: var(--bg-color); border-left: 12px solid var(--alert-theme-color); margin-bottom: 8px; padding: 12px 16px; - z-index: 2; } @media (prefers-color-scheme: dark) { diff --git a/frontend/src/app/components/users/permissions-add-dialog/permissions-add-dialog.component.css b/frontend/src/app/components/users/permissions-add-dialog/permissions-add-dialog.component.css index ed6649f95..d8a20492f 100644 --- a/frontend/src/app/components/users/permissions-add-dialog/permissions-add-dialog.component.css +++ b/frontend/src/app/components/users/permissions-add-dialog/permissions-add-dialog.component.css @@ -2,6 +2,11 @@ margin-bottom: 12px; } +.permissions-alert { + position: relative; + top: -8px; +} + .permissions-form ::ng-deep .mat-mdc-dialog-content { color: var(--mat-sidenav-content-text-color); } diff --git a/frontend/src/app/components/users/permissions-add-dialog/permissions-add-dialog.component.html b/frontend/src/app/components/users/permissions-add-dialog/permissions-add-dialog.component.html index 4ba744b52..87982519f 100644 --- a/frontend/src/app/components/users/permissions-add-dialog/permissions-add-dialog.component.html +++ b/frontend/src/app/components/users/permissions-add-dialog/permissions-add-dialog.component.html @@ -1,8 +1,8 @@

Permissions for {{ group.title }} group

- - + +

Connection credentials