Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 3 deletions frontend/src/assets/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,11 @@ label {
}

.app-error-background {
background-color: $app-error !important;
background-color: var(--p-red-1000) !important;
}

.app-error-border {
border-color: $app-error !important;
border-color: var(--p-red-1000)!important;
}

.app-error-color {
Expand Down Expand Up @@ -265,6 +265,6 @@ label {

/* common */
.disclaimer-block {
outline: solid 0.063rem $app-grey;
outline: solid 0.063rem var(--p-greyscale-200);
border-radius: 0.5rem;
}
51 changes: 0 additions & 51 deletions frontend/src/assets/variables.scss

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const { t } = useI18n();
border-color: var(--p-greyscale-100);
border-style: solid;
border-width: 0.063rem;
box-shadow: 0.25rem 0.25rem 0.25rem 0rem $app-proj-black;
box-shadow: 0.25rem 0.25rem 0.25rem 0rem var(--p-greyscale-50);
&--hover:hover {
background-color: var(--p-bcblue-50);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ const { t } = useI18n();
border-color: var(--p-greyscale-100);
border-style: solid;
border-width: 0.063rem;
box-shadow: 0.25rem 0.25rem 0.25rem 0rem $app-proj-black;
box-shadow: 0.25rem 0.25rem 0.25rem 0rem var(--p-greyscale-50);
&--hover:hover {
background-color: var(--p-bcblue-50);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,6 @@ const { t } = useI18n();
</template>
<style scoped lang="scss">
.border-color {
border-color: $app-proj-white-one;
border-color: var(--p-greyscale-100);
}
</style>
30 changes: 15 additions & 15 deletions frontend/src/components/authorization/AuthorizationStatusPill.vue
Original file line number Diff line number Diff line change
Expand Up @@ -163,38 +163,38 @@ const statePillDisplayText = {
}

.green {
background-color: $app-pill-lightgreen;
border-color: $app-pill-green;
color: $app-pill-green;
background-color: var(--p-green-75);
border-color: var(--p-green-500);
color: var(--p-green-500);
}

.grey {
background-color: $app-pill-grey;
border-color: $app-pill-lightgrey;
background-color: var(--p-greyscale-100);
border-color: var(--p-greyscale-900);
}

.outlined-green {
background-color: $app-pill-green;
border-color: $app-pill-green;
background-color: var(--p-green-500);
border-color: var(--p-green-500);
border-style: solid;
border-radius: 50%;
color: $app-pill-lightgreen;
color: var(--p-green-75);
}

.red {
background-color: $app-pill-lightred;
border-color: $app-pill-red;
color: $app-pill-red;
background-color: var(--p-red-50);
border-color: var(--p-red-400);
color: var(--p-red-400);
}

.yellow {
background-color: $app-pill-lightyellow;
border-color: $app-pill-yellow;
color: $app-pill-yellow;
background-color: var(--p-gold-200);
border-color: var(--p-gold-900);
color: var(--p-gold-900);
}

.text-color {
font-weight: normal;
color: $app-pill-text;
color: var(--p-greyscale-900);
}
</style>
2 changes: 1 addition & 1 deletion frontend/src/components/common/StatusPill.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const {
bgColor,
borderColor,
icon,
contentColor = '$app-pill-text'
contentColor = 'var(--p-greyscale-900)'
} = defineProps<{
enlarge?: boolean;
stage?: string;
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/form/StepperHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,6 @@ const {

.outer-border-error {
border-radius: 50% !important;
box-shadow: 0 0 0 3px $app-error !important;
box-shadow: 0 0 0 3px var(--p-red-400) !important;
}
</style>
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ const confirmSubmit = () => {
}

:deep(.assistance-tab:focus-visible) {
outline: 0.25rem solid $app-hover;
outline: 0.25rem solid var(--p-bcblue-700);
outline-offset: 0.125rem;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ watchEffect(() => {
}

.withinWeek {
background-color: $app-pill-lightyellow;
background-color: var(--p-gold-200);
}

.withinMonth {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/layout/Header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const { t } = useI18n();
<style lang="scss" scoped>
#header-branding {
background-color: white;
color: $app-primary;
color: var(--p-bcblue-950);
white-space: nowrap;
// TODO: Reference a surface colour once PrimeVue 4 changes come in
border-bottom: 1px solid #d8d8d8;
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/layout/LoginButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@ function logout() {

<style lang="scss" scoped>
button {
color: $app-primary !important;
color: var(--p-bcblue-950) !important;
}
</style>
4 changes: 2 additions & 2 deletions frontend/src/components/user/UserTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,10 @@ function getStatusClass(data: UserAccessRequest) {
}

.pending-approval-status {
color: $app-primary;
color: var(--p-bcblue-950);
}

.pending-revoke-status {
color: $app-error;
color: var(--p-red-400);
}
</style>
2 changes: 1 addition & 1 deletion frontend/src/views/oidc/OidcLoginView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ function login(kind: IdentityProviderKind) {

<style lang="scss" scoped>
.account-setup {
outline: solid 0.063rem $app-grey;
outline: solid 0.063rem var(--p-greyscale-200);
border-radius: 0.5rem;
}

Expand Down
1 change: 0 additions & 1 deletion frontend/vite.config.mts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ export default defineConfig({
css: {
preprocessorOptions: {
scss: {
additionalData: '@use "@/assets/variables.scss" as *;',
api: 'modern'
}
}
Expand Down