Skip to content

Commit 35651ef

Browse files
daros10daros10
committed
change application colors
1 parent c197040 commit 35651ef

29 files changed

+361
-130
lines changed

‎src/app/modules/activities-management/components/activity-list/activity-list.component.html

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
<div class="card-body">
2-
<div class="scroll">
3-
<div class="accordion" id="accordionActivities">
4-
<div *ngIf="activities?.length > 0; else notShow">
5-
<div class="card" *ngFor="let activity of activities; let rowIndex = index">
6-
<div class="card-header">
7-
<h2 class="mb-0">
8-
<a type="button" data-toggle="collapse" [attr.data-target]="'#row'+rowIndex">
9-
{{activity.name}}
10-
</a>
11-
<div class="btn-group float-right" role="group">
12-
<i class="far fa-edit btn btn-link"></i>
13-
<i class="far fa-trash-alt btn btn-link"></i>
14-
</div>
15-
</h2>
16-
</div>
2+
<div class="scroll">
3+
<div class="accordion" id="accordionActivities">
4+
<div *ngIf="activities?.length > 0; else notShow">
5+
<div class="card" *ngFor="let activity of activities; let rowIndex = index">
6+
<div class="card-header style-list-project">
7+
<h2 class="mb-0">
8+
<a type="button" data-toggle="collapse" [attr.data-target]="'#row' + rowIndex">
9+
{{ activity.name }}
10+
</a>
11+
<div class="btn-group float-right" role="group">
12+
<i class="far fa-edit btn btn-link text-white"></i>
13+
<i class="far fa-trash-alt btn btn-link text-white"></i>
14+
</div>
15+
</h2>
16+
</div>
1717

18-
<div [id]="'row'+rowIndex" class="collapse" data-parent="#accordionActivities">
19-
<div class="card-body">
20-
<h5>Description:</h5>
21-
<p>{{activity.description}}</p>
22-
</div>
23-
</div>
24-
</div>
18+
<div [id]="'row' + rowIndex" class="collapse" data-parent="#accordionActivities">
19+
<div class="card-body">
20+
<h5>Description:</h5>
21+
<p>{{ activity.description }}</p>
2522
</div>
26-
<ng-template #notShow>
27-
<app-empty-state></app-empty-state>
28-
</ng-template>
23+
</div>
2924
</div>
25+
</div>
26+
<ng-template #notShow>
27+
<app-empty-state></app-empty-state>
28+
</ng-template>
3029
</div>
30+
</div>
3131
</div>

‎src/app/modules/activities-management/components/activity-list/activity-list.component.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
@import '../../../../../styles/colors.scss';
2+
3+
.style-list-project {
4+
background-image: $background-gradient-items;
5+
color: white;
6+
}

‎src/app/modules/activities-management/components/create-activity/create-activity.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ <h1 class="card-title">Activity</h1>
2323

2424
<div class="btn-toolbar" role="toolbar">
2525
<div class="btn-group mr-2" role="group">
26-
<button class="btn btn-primary mb-2" type="submit" [disabled]="!activityForm.valid">Save</button>
26+
<button class="btn save-button-style mb-2" type="submit" [disabled]="!activityForm.valid">Save</button>
2727
</div>
2828
</div>
2929
</form>

‎src/app/modules/activities-management/components/create-activity/create-activity.component.scss

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
@import '../../../../../styles/colors.scss';
2+
3+
.save-button-style {
4+
background-image: $button-primary-color;
5+
color: white;
6+
}
7+
8+
.cancel-button-style {
9+
background-color: $modal-button-secondary;
10+
color: white;
11+
}

‎src/app/modules/home/home.component.html

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
<app-navbar></app-navbar>
2-
31
<app-sidebar>
4-
<router-outlet></router-outlet>
5-
</app-sidebar>
2+
<router-outlet></router-outlet>
3+
</app-sidebar>

‎src/app/modules/project-management/components/create-project/create-project.component.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,12 @@ <h1 class="card-title">Project</h1>
5454
</div>
5555
<div class="btn-toolbar" role="toolbar">
5656
<div class="btn-group mr-2" role="group">
57-
<button class="btn btn-primary mb-2" type="submit" [disabled]="!projectForm.valid">Save</button>
57+
<button class="btn save-button-style mb-2" type="submit" [disabled]="!projectForm.valid">Save</button>
5858
</div>
5959
<div class="btn-group mr-2" role="group">
60-
<button class="btn btn-primary mb-2" type="reset" [hidden]="!projectToEdit" (click)="reset()">Cancel</button>
60+
<button class="btn cancel-button-style mb-2" type="reset" [hidden]="!projectToEdit" (click)="reset()">
61+
Cancel
62+
</button>
6163
</div>
6264
</div>
6365
</form>

‎src/app/modules/project-management/components/create-project/create-project.component.scss

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
@import '../../../../../styles/colors.scss';
2+
3+
.save-button-style {
4+
background-image: $button-primary-color;
5+
color: white;
6+
}
7+
8+
.cancel-button-style {
9+
background-color: $modal-button-secondary;
10+
color: white;
11+
}

‎src/app/modules/project-management/components/project-list/project-list.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<div class="accordion" id="accordionProject">
66
<div *ngIf="projects?.length > 0; else notShow">
77
<div class="card" *ngFor="let project of projects | filterProject: filterProjects; let rowIndex = index">
8-
<div class="card-header">
8+
<div class="card-header style-list-project">
99
<h2 class="mb-0">
1010
<a
1111
type="button"
@@ -16,12 +16,12 @@ <h2 class="mb-0">
1616
{{ project.name }}
1717
</a>
1818
<div class="btn-group float-right" role="group">
19-
<i (click)="editProject.emit(project.id)" class="far fa-edit btn btn-link"></i>
19+
<i (click)="editProject.emit(project.id)" class="far fa-edit btn btn-link text-white"></i>
2020
<i
2121
(click)="openModal(project)"
2222
data-toggle="modal"
2323
data-target="#deleteModal"
24-
class="far fa-trash-alt btn btn-link"
24+
class="far fa-trash-alt btn btn-link text-white"
2525
></i>
2626
</div>
2727
</h2>

‎src/app/modules/project-management/components/project-list/project-list.component.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1+
@import '../../../../../styles/colors.scss';
2+
13
.scroll {
24
max-height: 400px;
35
overflow-y: auto;
46
}
7+
8+
.style-list-project {
9+
background-image: $background-gradient-items;
10+
color: white;
11+
}

‎src/app/modules/shared/components/clock/clock.component.html

Lines changed: 6 additions & 8 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>
8-
</div>
1+
<div class="col text-dark">
2+
<i *ngIf="!displayTime" class="fas fa-sync-alt fa fa-spin"></i>
3+
</div>
4+
<div *ngIf="displayTime" class="col text-dark">
5+
<h3>{{ hour | number: '2.0-2' }}:{{ minutes | number: '2.0-2' }}:{{ seconds | number: '2.0-2' }}</h3>
6+
</div>

0 commit comments

Comments
 (0)