Skip to content

Commit bdf5bc6

Browse files
committed
content adjust in navbar
1 parent 4886ac4 commit bdf5bc6

File tree

7 files changed

+30
-58
lines changed

7 files changed

+30
-58
lines changed

src/app/app.module.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import { CreateProjectComponent } from './components/shared/create-project/creat
1818
import { DetailsFieldsComponent } from './components/shared/details-fields/details-fields.component';
1919
import { ProjectListHoverComponent } from './components/shared/project-list-hover/project-list-hover.component';
2020
import { ModalComponent } from './components/shared/modal/modal.component';
21-
import { HighlightedDirective } from './directives/highlighted.directive';
21+
2222
@NgModule({
2323
declarations: [
2424
AppComponent,
@@ -34,7 +34,6 @@ import { HighlightedDirective } from './directives/highlighted.directive';
3434
DetailsFieldsComponent,
3535
ProjectListHoverComponent,
3636
ModalComponent,
37-
HighlightedDirective
3837
],
3938
imports: [
4039
CommonModule,
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
.time-clock-color {
2-
color: white;
3-
}
Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
<div class="row">
2-
<div class="col mt-1 time-clock-color">
3-
<i *ngIf="!displayTime" class="fas fa-sync-alt fa fa-spin"></i>
4-
</div>
5-
<div *ngIf="displayTime" class="col time-clock-color">
6-
<h3>{{ hour | number: '2.0-2' }}:{{ minutes | number: '2.0-2' }}:{{ seconds | number: '2.0-2' }}</h3>
7-
</div>
1+
<div>
2+
<i *ngIf="!displayTime" class="fas fa-sync-alt fa fa-spin text-white"></i>
3+
</div>
4+
<div *ngIf="displayTime" class="text-white">
5+
<h3>{{ hour | number: '2.0-2' }}:{{ minutes | number: '2.0-2' }}:{{ seconds | number: '2.0-2' }}</h3>
86
</div>
Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,21 @@
1-
<nav class="navbar navbar-dark bg-dark ">
2-
<a class="navbar-brand" href="/">
3-
<img src="assets/img/ioet.png" width="20" height="35" class="d-inline-block align-top" alt="">
4-
</a>
1+
<nav class="navbar navbar-dark bg-dark">
52

6-
<app-clock class="text-center"></app-clock>
7-
<app-user></app-user>
3+
<div class="container-fluid row">
4+
5+
<div class="col text-left">
6+
<a class="navbar-brand" href="/">
7+
<img src="assets/img/ioet.png" width="20" height="35" class="align-top" alt="">
8+
</a>
9+
</div>
10+
11+
<div class="col text-center">
12+
<app-clock></app-clock>
13+
</div>
14+
15+
<div class="col text-right" style="background-color: sienna;">
16+
<app-user></app-user>
17+
</div>
18+
19+
</div>
820

921
</nav>

src/app/components/shared/sidebar/sidebar.component.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<!-- Sidebar -->
33
<div class="bg-dark border-right rounded-right " id="sidebar-wrapper">
44
<div class="list-group options-sidebar-hover">
5-
<a [routerLink]="['/getting-started']" routerLinkActive="color-item-avtive" class="list-group-item list-group-item-action bg-dark text-white" style="border-top-color: #565264; border-color: #565264;"><i class="fas fa-flag "></i> Getting Started</a>
6-
<a [routerLink]="['/time-clock']" routerLinkActive="color-item-avtive" class="list-group-item list-group-item-action bg-dark text-white " style="border-color: #565264;"><i class="far fa-clock "></i> Time Clock</a>
7-
<a [routerLink]="['/time-entries']" routerLinkActive="color-item-avtive" class="list-group-item list-group-item-action bg-dark text-white " style="border-color: #565264;"><i class="far fa-list-alt "></i> Time Entries</a>
8-
<a [routerLink]="['/time-off']" routerLinkActive="color-item-avtive" class="list-group-item list-group-item-action bg-dark text-white " style="border-color: #565264;"><i class="far fa-paper-plane "></i> Time Off</a>
9-
<a [routerLink]="['/reports']" routerLinkActive="color-item-avtive" class="list-group-item list-group-item-action bg-dark text-white " style="border-color: #565264;"><i class="fas fa-chart-pie "></i> Reports</a>
10-
<a [routerLink]="['/project-management']" routerLinkActive="color-item-avtive" class="list-group-item list-group-item-action bg-dark text-white " style="border-color: #565264;"><i class="far fa-folder-open "></i> Projects</a>
5+
<a [routerLink]="['/getting-started']" routerLinkActive="color-item-avtive" class="list-group-item list-group-item-action bg-dark text-white" style="border-top-color: #565264; border-color: #565264;"><i class="fas fa-flag"></i> Getting Started</a>
6+
<a [routerLink]="['/time-clock']" routerLinkActive="color-item-avtive" class="list-group-item list-group-item-action bg-dark text-white " style="border-color: #565264;"><i class="far fa-clock"></i> Time Clock</a>
7+
<a [routerLink]="['/time-entries']" routerLinkActive="color-item-avtive" class="list-group-item list-group-item-action bg-dark text-white " style="border-color: #565264;"><i class="far fa-list-alt"></i> Time Entries</a>
8+
<a [routerLink]="['/time-off']" routerLinkActive="color-item-avtive" class="list-group-item list-group-item-action bg-dark text-white " style="border-color: #565264;"><i class="far fa-paper-plane"></i> Time Off</a>
9+
<a [routerLink]="['/reports']" routerLinkActive="color-item-avtive" class="list-group-item list-group-item-action bg-dark text-white " style="border-color: #565264;"><i class="fas fa-chart-pie"></i> Reports</a>
10+
<a [routerLink]="['/project-management']" routerLinkActive="color-item-avtive" class="list-group-item list-group-item-action bg-dark text-white " style="border-color: #565264;"><i class="far fa-folder-open"></i> Projects</a>
1111
</div>
1212
</div>
1313
<!-- /#sidebar-wrapper -->

src/app/directives/highlighted.directive.spec.ts

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/app/directives/highlighted.directive.ts

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)