Skip to content

Commit 4772d4b

Browse files
committed
ioet#71 adding styles for login screen and defining default colors for buttons
1 parent 81a853c commit 4772d4b

File tree

7 files changed

+90
-36
lines changed

7 files changed

+90
-36
lines changed

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

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,8 @@
33
<h1 class="card-title">Activity</h1>
44
<div class="form-group">
55
<label for="name">Name:</label>
6-
<input
7-
class="form-control"
8-
id="name"
9-
type="text"
10-
formControlName="name"
11-
[class.is-invalid]="name.invalid && name.touched"
12-
required
13-
/>
6+
<input class="form-control" id="name" type="text" formControlName="name"
7+
[class.is-invalid]="name.invalid && name.touched" required />
148
<div class="text-danger" *ngIf="(name.dirty || name.touched) && name.invalid && name.errors.required">
159
Activity name is required.
1610
</div>
@@ -22,9 +16,7 @@ <h1 class="card-title">Activity</h1>
2216
</div>
2317

2418
<div class="btn-toolbar" role="toolbar">
25-
<div class="btn-group mr-2" role="group">
26-
<button class="btn save-button-style mb-2" type="submit" [disabled]="!activityForm.valid">Save</button>
27-
</div>
19+
<button class="btn btn-primary" type="submit" [disabled]="!activityForm.valid">Save</button>
2820
</div>
2921
</form>
30-
</div>
22+
</div>
Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,14 @@
1-
<button (click)="login()">login</button>
1+
<div class="login-container">
2+
3+
<div class="login-header">
4+
<img src="../../../assets/img/ioet.png" />
5+
</div>
6+
<div class="login-body">
7+
<h1>Please sign in</h1>
8+
</div>
9+
10+
<div class="login-controls">
11+
<button (click)="login()" class="btn btn-primary">login</button>
12+
</div>
13+
14+
</div>
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
@import '../../../scss/orange-theme';
2+
3+
.login-container {
4+
display: flex;
5+
flex-direction: column;
6+
justify-content: center;
7+
align-items: center;
8+
margin: auto;
9+
padding: 50px;
10+
}
11+
12+
.login-header {
13+
margin: 5px;
14+
text-align: center;
15+
img {
16+
max-width: 200px;
17+
height: auto;
18+
}
19+
}
20+
21+
.login-body {
22+
margin: 5px;
23+
text-align: center;
24+
}
25+
26+
.login-controls {
27+
margin: 5px;
28+
display: flex;
29+
text-align: center;
30+
min-width: 250px;
31+
button {
32+
flex-grow: 1;
33+
}
34+
}
35+
36+
h1 {
37+
color: $dark;
38+
}

src/app/modules/time-clock/pages/time-clock.component.html

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,24 +57,13 @@ <h6 class="text-left"><strong>Projects</strong></h6>
5757
<hr />
5858
<div class="container">
5959
<div class="row">
60-
<div class="col text-left">
61-
<button
62-
class="btn btn-light btn-sm dropdown-toggle"
63-
type="button"
64-
data-toggle="dropdown"
65-
aria-haspopup="true"
66-
aria-expanded="false"
67-
>
68-
Options
69-
</button>
70-
</div>
7160
<div class="col text-right">
72-
<button *ngIf="isClockIn" class="btn button-clock-in-style btn-sm" type="button" (click)="employeClockIn()">
61+
<button *ngIf="isClockIn" class="btn btn-primary" type="button" (click)="employeClockIn()">
7362
Clock In
7463
</button>
7564
<button
7665
*ngIf="!isClockIn"
77-
class="btn button-clock-out-style btn-sm"
66+
class="btn btn-primary"
7867
type="button"
7968
(click)="employeClockOut()"
8069
>

src/app/modules/time-clock/pages/time-clock.component.scss

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,6 @@
1111
justify-content: center;
1212
}
1313

14-
.button-clock-in-style {
15-
background-image: $button-primary-color;
16-
color: white;
17-
}
18-
19-
.button-clock-out-style {
20-
background: $button-secondary-color;
21-
color: white;
22-
}
23-
2414
.text-clock-in-color {
2515
color: $modal-button-secondary;
2616
}

src/scss/_orange-theme.scss

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
$primary:#fc5630;
2+
$secondary:#ff3f56;
3+
$success:#16bac5;
4+
$info:#30bced;
5+
$warning:#fc5630;
6+
$danger:#ff3663;
7+
$light:#ffffff;
8+
$dark:#5c4e63;
9+
10+
.bg-primary,
11+
.btn-primary,
12+
.badge-primary,
13+
.alert-primary {
14+
background-image: linear-gradient(
15+
to right,
16+
#ff3948,
17+
#ff384d,
18+
#ff3752,
19+
#ff3657,
20+
#ff365c,
21+
#ff385a,
22+
#ff3b59,
23+
#ff3d57,
24+
#ff434e,
25+
#ff4944,
26+
#fe4f3a,
27+
#fc5630
28+
);
29+
}

src/styles.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
/* You can add global styles to this file, and also import other style files */
2+
3+
@import "scss/orange-theme";
4+
@import "~bootstrap/scss/bootstrap";

0 commit comments

Comments
 (0)