Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
#19 added navbar and sidebar styles
  • Loading branch information
daros10 committed Apr 1, 2020
commit b390e14e93d03e5d147acfb46a5afd1388d4159d
4 changes: 1 addition & 3 deletions src/app/app.component.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
<app-navbar></app-navbar>

<app-sidebar>
<router-outlet></router-outlet>
</app-sidebar>
</app-sidebar>
12 changes: 5 additions & 7 deletions src/app/modules/shared/components/clock/clock.component.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<div class="row">
<div class="col mt-1 time-clock-color">
<i *ngIf="!displayTime" class="fas fa-sync-alt fa fa-spin"></i>
</div>
<div *ngIf="displayTime" class="col time-clock-color">
<h3>{{ hour | number: '2.0-2' }}:{{ minutes | number: '2.0-2' }}:{{ seconds | number: '2.0-2' }}</h3>
</div>
<div class="col time-clock-color">
<i *ngIf="!displayTime" class="fas fa-sync-alt fa fa-spin"></i>
</div>
<div *ngIf="displayTime" class="col time-clock-color">
<h3>{{ hour | number: '2.0-2' }}:{{ minutes | number: '2.0-2' }}:{{ seconds | number: '2.0-2' }}</h3>
</div>
3 changes: 2 additions & 1 deletion src/app/modules/shared/components/clock/clock.component.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.time-clock-color {
color: white;
color: black
}

16 changes: 8 additions & 8 deletions src/app/modules/shared/components/navbar/navbar.component.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<nav class="navbar navbar-dark bg-dark">
<a class="navbar-brand" href="#">
<img src="assets/img/ioet.png" width="20" height="35" class="d-inline-block align-top" alt="">
</a>

<app-clock class="text-center"></app-clock>
<app-user></app-user>
</nav>
<nav class="navbar navbar-light bg-white border-light border-bottom mt-1">
<div class="col-10 text-center">
<app-clock></app-clock>
</div>
<div class="col-2 text-right">
<app-user></app-user>
</div>
</nav>
24 changes: 13 additions & 11 deletions src/app/modules/shared/components/sidebar/sidebar.component.html
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
<div class="d-flex" id="wrapper">
<!-- Sidebar -->
<div class="bg-light border-right" id="sidebar-wrapper" *ngIf="itemsSidebar?.length > 0">
<div class="list-group list-group-flush">
<a *ngFor="let item of itemsSidebar" [routerLink]="item.route" routerLinkActive="dark"
class="list-group-item list-group-item-action bg-light"><i class="{{item.icon}}"></i> {{item.text}}</a>
<div class="mt-1 ml-1 rounded-lg sidebar-background" id="sidebar-wrapper" *ngIf="itemsSidebar?.length > 0">
<div class="text-center mt-5 mb-5">
<img src="assets/img/ioet-logo-light.png" width="100" height="100" class="img-fluid text-center" alt="Ioet logo">
</div>
<div class="list-group list-group-flush rounded-lg items-sidebar-hover">
<a *ngFor="let item of itemsSidebar" [routerLink]="item.route" routerLinkActive="bg-item-active" class="list-group-item list-group-item-action items-navbar-style"><i class="{{item.icon}} mr-3 ml-3"></i> {{item.text}}</a>
</div>
</div>
<!-- /#sidebar-wrapper -->

<!-- Page Content -->
<div class="container">
<router-outlet></router-outlet>
<div class="container-fluid mt-1">
<app-navbar></app-navbar>
<div class="container">
<!-- Page Content -->
<router-outlet></router-outlet>
</div>
</div>
<!-- /#page-content-wrapper -->

</div>
<!-- /#wrapper -->
<!-- /#wrapper -->
25 changes: 24 additions & 1 deletion src/app/modules/shared/components/sidebar/sidebar.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ body {

#sidebar-wrapper {
min-height: 100vh;
margin-left: -15rem;
margin-left: -15vw;
-webkit-transition: margin .25s ease-out;
-moz-transition: margin .25s ease-out;
-o-transition: margin .25s ease-out;
Expand Down Expand Up @@ -40,3 +40,26 @@ body {
margin-left: -15rem;
}
}

.items-navbar-style {
border-color: transparent;
background-color: transparent;
font-weight: bold;
color: white;
}

.sidebar-background {
background-color: #FC5630 ;
}

.bg-item-active {
background-color: #FD927D;
border-top-right-radius: 25px;
border-bottom-right-radius: 25px;
}

.items-sidebar-hover :hover {
background-color: #FD927D;
border-top-right-radius: 25px;
border-bottom-right-radius: 25px;
}
17 changes: 3 additions & 14 deletions src/app/modules/shared/components/user/user.component.html
Original file line number Diff line number Diff line change
@@ -1,19 +1,8 @@
<div>
<a
class="nav-link dropdown-toggle help-color"
id="navbarDropdown"
role="button"
data-toggle="dropdown"
aria-haspopup="true"
aria-expanded="false"
>
<a class="nav-link dropdown-toggle user-profile user-profile-hover border border-ligth rounded-pill text-center" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="far fa-user-circle"></i> Dario Herrera
</a>

<div
class="dropdown-menu dropdown-menu-right"
aria-labelledby="navbarDropdown"
>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
<a class="dropdown-item">Sign Out</a>
</div>
</div>
</div>
9 changes: 7 additions & 2 deletions src/app/modules/shared/components/user/user.component.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
.help-color {
color: white;
.user-profile {
color: black;
}

.user-profile-hover:hover {
background-color: #F8F9FA;
cursor: pointer;
}

.dropdown-menu {
Expand Down
Binary file added src/assets/img/ioet-logo-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.