Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#2357 - Replace separator component and vertical-divider class with v-divider component #2358

Merged
merged 3 commits into from
Sep 27, 2023
Merged

#2357 - Replace separator component and vertical-divider class with v-divider component #2358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78eedcb
#2357 - Replace separator component and vertical-divider class with v…
sh16011993 Sep 26, 2023
57dcc2c
Code Update
sh16011993 Sep 26, 2023
82d17d7
Code Update
sh16011993 Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions sources/packages/web/src/assets/css/base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,12 +215,6 @@ strong {
border: 1px solid #e8e8e8;
}

.vertical-divider {
border: 1px solid $brand-grey;
height: $line-height-header-sm;
background-color: $brand-grey;
}

//TODO: This style has been temporarily used to fix the alignment and responsiveness issue
//TODO: as an outcome of Vuetify beta upgrade.
.v-dialog .v-overlay__content {
Expand Down
23 changes: 20 additions & 3 deletions ...s/packages/web/src/components/aest/institution/ApplicationOfferingChangeDetailsHeader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,27 @@
: '-'
"
/>
<separator v-if="headerDetails.institutionName"></separator>
<v-divider
v-if="headerDetails.institutionName"
class="border-opacity-100 mx-2 my-0"
color="secondary"
:thickness="2"
vertical
/>
<header-title-value title="Institution"
><template #value
><span class="link-primary" @click="navigateToInstitutionProfile()">
{{ headerDetails.institutionName }}
</span>
</template></header-title-value
>
<separator v-if="headerDetails.locationName" />
<v-divider
v-if="headerDetails.locationName"
class="border-opacity-100 mx-2 my-0"
color="secondary"
:thickness="2"
vertical
/>
<header-title-value
v-if="headerDetails.locationName"
title="Location"
Expand All @@ -31,7 +43,12 @@
:title="assessedByLabel"
:value="assessedByLabelValue"
/>
<separator />
<v-divider
class="border-opacity-100 mx-2 my-0"
color="secondary"
:thickness="2"
vertical
/>
<header-title-value
:title="assessedDateLabel"
:value="assessedDateLabelValue"
Expand Down
34 changes: 24 additions & 10 deletions sources/packages/web/src/components/common/ProgramOfferingDetailHeader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,26 @@
: '-'
"
/>
<div class="mx-2 vertical-divider"></div>
<v-divider
class="border-opacity-100 mx-2 my-0"
color="secondary"
:thickness="2"
vertical
/>
<header-title-value title="Institution name"
><template #value
><span class="link-primary" @click="goToInstitutionProfile()">
{{ headerDetails.institutionName }}
</span>
</template></header-title-value
>
<div
<v-divider
v-if="headerDetails.locationName"
class="mx-2 vertical-divider"
></div>
class="border-opacity-100 mx-2 my-0"
color="secondary"
:thickness="2"
vertical
/>
<header-title-value
v-if="headerDetails.locationName"
title="Location"
Expand All @@ -34,19 +42,25 @@
:title="approvalLabel.assessedByLabel"
:value="headerDetails.assessedBy"
/>
<div
class="mx-2 vertical-divider"
<v-divider
v-if="headerDetails.assessedDate"
></div>
class="border-opacity-100 mx-2 my-0"
color="secondary"
:thickness="2"
vertical
/>
<header-title-value
:title="approvalLabel.assessedDateLabel"
v-if="headerDetails.assessedDate"
:value="dateOnlyLongString(headerDetails.assessedDate)"
/>
<div
class="mx-2 vertical-divider"
<v-divider
v-if="headerDetails.effectiveEndDate"
></div>
class="border-opacity-100 mx-2 my-0"
color="secondary"
:thickness="2"
vertical
/>
<header-title-value
v-if="headerDetails.effectiveEndDate"
title="Effective end date"
Expand Down
3 changes: 0 additions & 3 deletions sources/packages/web/src/components/generic/Separator.vue
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions sources/packages/web/src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import FooterButtons from "@/components/generic/FooterButtons.vue";
import TitleValue from "@/components/generic/TitleValue.vue";
import HeaderTitleValue from "@/components/generic/HeaderTitleValue.vue";
import StatusInfoLabel from "@/components/generic/StatusInfoLabel.vue";
import Separator from "@/components/generic/Separator.vue";

AppConfigService.shared.init().then(() => {
createApp(App)
Expand All @@ -61,6 +60,5 @@ AppConfigService.shared.init().then(() => {
.component("FooterButtons", FooterButtons)
.component("TitleValue", TitleValue)
.component("HeaderTitleValue", HeaderTitleValue)
.component("Separator", Separator)
.mount("#app");
});