Skip to content

Commit a0acc33

Browse files
committed
IOT-1163: Use flexbox for spaceing
1 parent 69779fb commit a0acc33

File tree

2 files changed

+6
-17
lines changed

2 files changed

+6
-17
lines changed

src/app/navbar/navbar.component.html

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<nav class="navbar navbar-expand-md navbar-light d-md-flex align-items-md-start flex-md-column p-2 pt-md-4"
22
aria-expanded="false">
33

4-
<a routerLink="/dashboard" class="navbar-brand p-0 pl-2" href="">
4+
<a routerLink="/dashboard" class="navbar-brand p-0 pl-2 mb-5" href="">
55
<img class="img-logo" alt="OS2IoT-logo" [src]="imagePath" />
66
</a>
77
<div *ngIf="!isLoggedIn(); else loggedInBlock" class="collapse navbar-collapse flex-grow-0" id="navbar">
8-
<ul class="navbar-nav flex-column mt-5">
8+
<ul class="navbar-nav flex-column">
99
<li class="nav-item">
1010
<a routerLink="/auth" [routerLinkActive]="['active']" class="nav-link pl-5 position-relative rounded" id="auth">
1111
{{ 'NAV.LOGIN' | translate }}
@@ -21,9 +21,9 @@
2121
<span class="navbar-toggler-icon"></span>
2222
</button>
2323
</div>
24-
<div class="navbar-collapse collapse overflow-auto flex-grow-0" id="navbar" [attr.aria-expanded]="!isCollapsed"
24+
<div class="navbar-collapse collapse overflow-auto flex-grow-0 h-100" id="navbar" [attr.aria-expanded]="!isCollapsed"
2525
[ngClass]="{collapse: !isCollapsed}">
26-
<ul class="navbar-nav d-flex flex-column marginY mt-lg-5" (click)="isCollapsed = !isCollapsed">
26+
<ul class="navbar-nav d-flex flex-column h-100" (click)="isCollapsed = !isCollapsed">
2727
<div>
2828
<fa-icon [icon]="faUser" class="navbar-icon" style="margin-right: 1em; margin-left: 1em;"></fa-icon>
2929
{{getUsername()}}
@@ -64,7 +64,8 @@
6464
</ul>
6565
</li>
6666
</div>
67-
<div class="logout-btn">
67+
<div class="flex-column flex-grow-1"></div>
68+
<div class="flex-column">
6869
<li class="nav-item">
6970
<a class="nav-link pl-5 position-relative rounded" (click)="goToHelp()" target="_blank">
7071
{{'NAV.HELP' | translate }}
Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +0,0 @@
1-
.logout-btn {
2-
position: absolute;
3-
bottom: 0;
4-
left: 0;
5-
background-color: white;
6-
width: 100%;
7-
}
8-
9-
.marginY {
10-
margin-top: 5rem;
11-
margin-bottom: 5rem;
12-
}

0 commit comments

Comments
 (0)