Skip to content

Commit

Permalink
Merge branch 'main' into feat/FSADT1-1026
Browse files Browse the repository at this point in the history
  • Loading branch information
paulushcgcj authored Dec 11, 2023
2 parents f8cc09b + c21809d commit f8bc7ed
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 4 deletions.
6 changes: 6 additions & 0 deletions frontend/src/assets/styles/global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -937,6 +937,12 @@ div#app {
align-self: stretch;
}

.review-icon-title {
display: flex;
align-items: center;
gap: 8px;
}

.cds-text-input-label {
color: var(--light-theme-text-text-primary, #131315);
font-family: BC Sans;
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/FormBCeIDPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ const scrollToNewContact = () => {
</div>
</div>

<hr class="divider"/>
<hr v-if="currentTab < 3" class="divider"/>
</div>

<div class="form-footer">
Expand Down
16 changes: 13 additions & 3 deletions frontend/src/pages/bceidform/ReviewWizardStep.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ import { useEventBus } from "@vueuse/core";
import type { FormDataDto } from "@/dto/ApplyClientNumberDto";
// @ts-ignore
import Edit16 from "@carbon/icons-vue/es/edit/16";
import Enterprise20 from "@carbon/icons-vue/es/enterprise/20"
import LocationStar20 from "@carbon/icons-vue/es/location--star/20"
import Location20 from "@carbon/icons-vue/es/location/20"
import User20 from "@carbon/icons-vue/es/user/20"
import { useFetchTo } from "@/composables/useFetch";
import { CodeNameType } from "@/dto/CommonTypesDto";
import { codeConversionFn } from "@/services/ForestClientService";
Expand Down Expand Up @@ -53,7 +57,8 @@ onMounted(() => {
<div class="grouping-05">
<label class="heading-03">Business information</label>
<div class="grouping-01">
<p class="heading-02">
<p class="heading-02 review-icon-title">
<Enterprise20 />
{{ formData.businessInformation.businessName }}
</p>
<p class="body-compact-01" id="clientTypeId">
Expand All @@ -76,7 +81,10 @@ onMounted(() => {
:key="address.locationName"
class="grouping-07">
<hr class="divider" v-if="index > 0" />
<span class="heading-02">{{ address.locationName }}</span>
<span class="heading-02 review-icon-title">
<LocationStar20 v-if="index === 0" />
<Location20 v-else />{{ address.locationName }}
</span>
<span class="body-compact-01">{{ address.streetAddress }}</span>
<span class="body-compact-01">{{ address.city }}, {{ address.province.text }}</span>
<span class="body-compact-01">{{ address.country.text }}</span>
Expand All @@ -96,7 +104,9 @@ onMounted(() => {
class="grouping-07">
<hr class="divider"
v-if="index > 0" />
<span class="heading-02">{{ contact.firstName }} {{ contact.lastName }}</span>
<span class="heading-02 review-icon-title">
<User20 />{{ contact.firstName }} {{ contact.lastName }}
</span>
<span class="body-compact-01">
{{ contact.locationNames.map((codeDesc) => codeDesc.text).join(', ') }}
</span>
Expand Down

0 comments on commit f8bc7ed

Please sign in to comment.