Skip to content

Commit 14cc8df

Browse files
Merge pull request #674 from bcgov/sam-student-profile
Fix users needing to click on link text in header navbar instead of just anywhere on the button
2 parents cdfdc75 + 5446ca7 commit 14cc8df

File tree

2 files changed

+26
-23
lines changed

2 files changed

+26
-23
lines changed

frontend/src/assets/css/global.css

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,13 @@ th {
149149
.v-table > .v-table__wrapper > table > tbody > tr > td, .v-table > .v-table__wrapper > table > thead > tr > th {
150150
padding: var(--v-table-padding);
151151
}
152-
.router-link-active{
152+
.router-link-active, .v-btn--active:not(.v-btn--disabled) {
153153
font-weight: bold;
154154
color: rgb(var(--v-theme-bcGovBlue));
155155
}
156+
.v-btn--active .v-btn__overlay {
157+
background-color: transparent;
158+
}
156159
.bg-primary .v-btn.v-tab, .bg-bcGovLightGrey .v-btn.v-tab {
157160
border-radius: 4px 4px 0 0;
158161
margin: 2px 1px 0 1px;

frontend/src/components/Header/BCHeader.vue

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -72,26 +72,28 @@
7272
:key="link.id"
7373
class="text-none"
7474
size="small"
75+
:to="link.route"
7576
>
76-
<router-link :to="link.route">
77-
{{ link.title }}
78-
</router-link>
77+
{{ link.title }}
7978
</v-btn>
80-
<v-btn v-if="!profile.pen" size="small" class="text-none">
81-
<a
82-
id="profile-route"
83-
class="text-decoration-none text-disabled"
84-
:disabled="true"
85-
>Profile (Student Not Loaded)</a
86-
>
79+
<v-btn
80+
v-if="!profile.pen"
81+
id="profile-route"
82+
size="small"
83+
disabled
84+
class="text-none"
85+
to="#"
86+
>
87+
Profile (Student Not Loaded)
8788
</v-btn>
88-
<v-btn size="small" v-else>
89-
<router-link
90-
:to="`/student-profile/${profile.studentID}`"
91-
id="profile-route"
92-
class="text-none"
93-
>Profile ({{ profile.pen }})</router-link
94-
>
89+
<v-btn
90+
id="profile-route"
91+
size="small"
92+
:to="`/student-profile/${profile.studentID}`"
93+
class="text-none"
94+
v-else
95+
>
96+
Profile ({{ profile.pen }})
9597
</v-btn>
9698
<v-spacer />
9799
<div class="form-group top-search mb-0">
@@ -267,8 +269,10 @@ export default {
267269
border-right: 1px solid
268270
rgba(var(--v-theme-on-background), var(--v-disabled-opacity));
269271
border-radius: 0;
272+
color: rgba(var(--v-theme-on-surface-light), var(--v-high-emphasis-opacity));
273+
text-decoration: none !important;
270274
}
271-
:deep(.header-nav .v-btn):hover {
275+
:deep(.header-nav .v-btn .v-btn__content):hover {
272276
background-color: transparent;
273277
text-decoration: underline;
274278
border-radius: 2px;
@@ -282,10 +286,6 @@ export default {
282286
:deep(.header-nav .v-btn):last-of-type {
283287
border-right: none;
284288
}
285-
:deep(.header-nav .v-btn a) {
286-
color: rgba(var(--v-theme-on-surface-light), var(--v-high-emphasis-opacity));
287-
text-decoration: none !important;
288-
}
289289
:deep(#header-pen-search) {
290290
padding: 4px 16px;
291291
min-height: 0;

0 commit comments

Comments
 (0)