Skip to content

Commit 913fad6

Browse files
authored
Merge pull request #538 from ioet/537_fix_forms_activities
fix: make responsive forms of activities section #537
2 parents ba5842c + 4ec56ed commit 913fad6

File tree

5 files changed

+13
-25
lines changed

5 files changed

+13
-25
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@import '../../../../../styles/colors.scss';
22

33
.activity-list {
4-
overflow: auto; display:inline-block; width: 60%;
4+
overflow: auto;
55
}

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

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
<h4>Activities</h4>
22
<hr/>
3-
<div style="width: 60%;">
3+
<div>
44

55
<form [formGroup]="activityForm" (ngSubmit)="onSubmit(activityForm.value)">
6-
<div class="input-group input-group-sm mb-3">
7-
<div class="input-group-prepend">
8-
<span class="input-group-text span-width">Name</span>
9-
</div>
10-
<input class="form-control" id="name" type="text" formControlName="name"
6+
<div class="form-group">
7+
<label>Name:</label>
8+
<div>
9+
<input class="form-control" id="name" type="text" formControlName="name"
1110
[class.is-invalid]="name.invalid && name.touched" required />
12-
<div class="text-danger" *ngIf="(name.dirty || name.touched) && name.invalid && name.errors.required">
13-
Activity name is required.
11+
<div class="text-danger" *ngIf="(name.dirty || name.touched) && name.invalid && name.errors.required">
12+
Activity name is required.
13+
</div>
1414
</div>
1515
</div>
1616

17-
<div class="input-group input-group-sm mb-3">
18-
<div class="input-group-prepend">
19-
<span class="input-group-text span-width">Description</span>
20-
</div>
17+
<div class="form-group">
18+
<label for="NotesTextarea">Description:</label>
2119
<textarea class="form-control" rows="2" id="description" type="text" formControlName="description"></textarea>
2220
</div>
2321

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="container">
1+
<div class="col-12 col-md-9 px-0">
22
<app-create-activity></app-create-activity>
33
<app-activity-list></app-activity-list>
44
</div>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<app-time-entries-summary></app-time-entries-summary>
22

3-
<div class="entry-container">
3+
<div class="col-12 col-md-9 px-0">
44

55
<div class="row pb-4">
66
<div class="col-12">

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,3 @@
1212
background-color: $primary;
1313
color: white;
1414
}
15-
16-
.entry-container{
17-
width: 100%;
18-
}
19-
20-
@media (min-width: 992px) {
21-
.entry-container{
22-
width: 70%;
23-
}
24-
}

0 commit comments

Comments
 (0)