Skip to content

Commit

Permalink
DUP-468: Updating UI (#363)
Browse files Browse the repository at this point in the history
  • Loading branch information
danieltruong authored Jul 12, 2024
1 parent d0ae0a0 commit 5ce7f61
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 40 deletions.
2 changes: 1 addition & 1 deletion src/app/home/home.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ <h1>
<span>Day-Use Pass Admin System</span>
</h1>
</div>
<div class="row">
<div class="row mx-0 mx-lg-5">
<div
class="col-xxl-4 col-md-6 col-12 mb-4"
*ngFor="let card of cardConfig"
Expand Down
4 changes: 2 additions & 2 deletions src/app/metrics/metrics-filter/metrics-filter.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
}

.accordion-card {
border: 1px rgba(0,0,0,.25) solid;
border: 1px rgba(0, 0, 0, .25) solid;
border-radius: 4px;
}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<nav aria-label="breadcrumb" class="toggle-button-offset">
<ol class="breadcrumb">
<li class="breadcrumb-items" *ngFor="let breadcrumb of breadcrumbs">
<li class="breadcrumb-item" *ngFor="let breadcrumb of breadcrumbs">
<a class="btn-link" (click)="onNavigate(breadcrumb.url)">{{
breadcrumb.label
}}</a>
}}</a>
</li>
<li class="breadcrumb-items">
<li class="breadcrumb-item">
<span>{{ lastBreadcrumb?.label }}</span>
</li>
</ol>
</nav>
</nav>
23 changes: 6 additions & 17 deletions src/app/shared/components/breadcrumb/breadcrumb.component.scss
Original file line number Diff line number Diff line change
@@ -1,32 +1,21 @@
@import "src/assets/themes/variables";

.toggle-button-offset {
padding-left: 1rem;
padding-left: 0rem;
background-color: #FAF9F8;
}

@media (min-width: 992px) {
.toggle-button-offset {
padding-left: 3rem;
padding-left: 2.188rem;
}
}

nav {
padding-top: 1.25rem;
padding-bottom: 0.2rem;
background: $light;
.breadcrumb {
margin: 0;
padding: 1.3rem;
}

a:hover {
cursor: pointer;
}

.breadcrumb .breadcrumb-items::before {
content: "/";
padding-left: 0.3rem;
padding-right: 0.3rem;
}

.breadcrumb .breadcrumb-items:nth-child(1)::before {
content: "";
padding-left: 0rem;
}
Original file line number Diff line number Diff line change
@@ -1,32 +1,25 @@
<label
*ngIf="label"
for="{{ id }}"
class="fw-bold mb-2 small d-flex justify-content-center"
>{{ label
}}<span *ngIf="isRequired()" class="text-danger">&nbsp;*</span></label
>
class="fw-bold mb-2 small d-flex justify-content-center">{{ label
}}<span *ngIf="isRequired()" class="text-danger">&nbsp;*</span></label>
<div
class="d-flex flex-row"
[ngClass]="{ 'invalid-field': isInvalid(), 'btn-group': group }"
>
[ngClass]="{ 'invalid-field': isInvalid(), 'btn-group': group }">
<div
class="col"
[ngClass]="{ 'btn-group': group, 'me-2': !group && option !== options }"
*ngFor="let option of options"
>
*ngFor="let option of options">
<input
type="radio"
[formControl]="control"
class="btn-check"
name="{{ id }}"
id="{{ id }}-{{ option }}"
(change)="changeValue(option)"
/>
(change)="changeValue(option)" />
<label
class="d-block"
class="d-block radio-button"
[ngClass]="setClass(option)"
for="{{ id }}-{{ option }}"
>{{ optionsLabels[options.indexOf(option)] }}</label
>
for="{{ id }}-{{ option }}">{{ optionsLabels[options.indexOf(option)] }}</label>
</div>
</div>
</div>
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.radio-button {
font-size: medium !important;
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<label *ngIf="label" for="{{ id }}" class="fw-bold mb-2"
<label *ngIf="label" for="{{ id }}" class="h2 mb-2"
>{{ label
}}<span *ngIf="isRequired()" class="text-danger">&nbsp;*</span></label
>
Expand Down

0 comments on commit 5ce7f61

Please sign in to comment.