Skip to content
Merged
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
#19 get last changes and fix some colors
  • Loading branch information
daros10 committed Apr 3, 2020
commit 5c28a59e734ba1858da291c20ad1c40d1d896f79
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@
background-color: $modal-button-secondary;
color: white;
}

.item-list-hover:link {
background-color: green;
}
4 changes: 2 additions & 2 deletions src/app/modules/shared/components/user/user.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
>
<i class="far fa-user-circle"></i> Dario Herrera
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
<a class="dropdown-item">Sign Out</a>
<div class="dropdown-menu style-click" aria-labelledby="navbarDropdown">
<a class="dropdown-item style-click" (click)="logout()">Sign Out</a>
</div>
</div>
7 changes: 7 additions & 0 deletions src/app/modules/shared/components/user/user.component.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import '../../../../../styles/colors.scss';

.user-profile {
color: black;
cursor: pointer;
Expand All @@ -7,3 +9,8 @@
margin-left: 50%;
transform: translateX(-50%);
}

.style-click:active {
background-image: $button-primary-color;
color: white;
}
2 changes: 1 addition & 1 deletion src/app/modules/time-clock/pages/time-clock.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="card">
<div class="card-body">
<p *ngIf="!isClockIn" class="card-title text-left">
<strong>{{ username }}</strong> clocked <strong class="text-success">in</strong> at
<strong>{{ username }}</strong> clocked <strong class="text-clock-in-color">in</strong> at
<strong>{{ hour | number: '2.0-2' }}:{{ minute | number: '2.0-2' }}:{{ seconds | number: '2.0-2' }}</strong>
</p>
<p *ngIf="isClockIn" class="card-title text-left">
Expand Down
4 changes: 4 additions & 0 deletions src/app/modules/time-clock/pages/time-clock.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,7 @@
background: $button-secondary-color;
color: white;
}

.text-clock-in-color {
color: $modal-button-secondary;
}