Skip to content

Commit 48bf21a

Browse files
authored
Fix Nav title's cursor and tag (#850)
* Change nav-title to be h2 * Delete cursor default * Delete unnecessary property * Fix test * Move nav-title style to the base components
1 parent 4559767 commit 48bf21a

File tree

7 files changed

+18
-16
lines changed

7 files changed

+18
-16
lines changed

src/components/DocumentationLayout.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
:displaySidenav="enableNavigator"
2020
@toggle-sidenav="handleToggleSidenav"
2121
>
22-
<template #title>
23-
<slot name="nav-title" />
22+
<template #title="{ className }">
23+
<slot name="nav-title" :className="className" />
2424
</template>
2525
</Nav>
2626
<AdjustableSidebarWidth
@@ -62,8 +62,8 @@
6262
<template v-if="enableQuickNavigation" #filter>
6363
<QuickNavigationButton @click.native="openQuickNavigationModal" />
6464
</template>
65-
<template #navigator-head>
66-
<slot name="nav-title" />
65+
<template #navigator-head="{ className }">
66+
<slot name="nav-title" :className="className" />
6767
</template>
6868
</Navigator>
6969
</transition>

src/components/DocumentationTopic/DocumentationNav.vue

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
</div>
3939
</template>
4040
<template #default>
41-
<slot name="title" />
41+
<slot name="title" className="nav-title" />
4242
</template>
4343
<template #tray="{ closeNav }">
4444
<NavMenuItems
@@ -194,10 +194,7 @@ $sidenav-icon-padding-size: 5px;
194194
.sidenav-toggle-wrapper {
195195
display: flex;
196196
margin-top: 1px;
197-
198-
@include breakpoints-from(large, nav) {
199-
margin-right: $nav-padding / 2;
200-
}
197+
margin-right: $nav-padding / 2;
201198
202199
// This is a hack to enforce the toggle to be visible when in breakpoint,
203200
// even if already toggled off on desktop. Conditionally checking the current breakpoint,

src/components/NavBase.vue

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -668,15 +668,13 @@ $content-max-width: map-deep-get($breakpoint-attributes, (nav, large, content-wi
668668
669669
@include nav-is-wide-format(true) {
670670
width: 100%;
671-
justify-content: center;
672671
}
673672
}
674673
}
675674
676675
.nav-title {
677676
height: $nav-height;
678677
@include font-styles(nav-title);
679-
cursor: default;
680678
display: flex;
681679
align-items: center;
682680
white-space: nowrap;

src/components/Navigator.vue

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
>
2929
<template #filter><slot name="filter" /></template>
3030
<template #navigator-head>
31-
<slot name="navigator-head"/>
31+
<slot name="navigator-head" className="nav-title"/>
3232
</template>
3333
</NavigatorCard>
3434
<LoadingNavigatorCard
@@ -177,4 +177,10 @@ export default {
177177
transition: none;
178178
}
179179
}
180+
181+
:deep(.nav-title) {
182+
font-size: inherit;
183+
font-weight: inherit;
184+
flex-grow: 1;
185+
}
180186
</style>

src/components/Navigator/BaseNavigatorCard.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ $close-icon-padding: 5px;
121121
}
122122
123123
.close-card {
124+
margin: 0;
124125
125126
.close-icon {
126127
width: $close-icon-size;

src/views/DocumentationTopic.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
v-if="topicData"
1515
v-bind="documentationLayoutProps"
1616
>
17-
<template #nav-title>
17+
<template #nav-title="{ className }">
1818
<component
19-
:is="rootLink ? 'router-link' : 'span'"
19+
:is="rootLink ? 'router-link' : 'h2'"
2020
:to="rootLink"
21-
class="nav-title"
21+
:class="className"
2222
>
2323
{{ $t('documentation.title') }}
2424
</component>

tests/unit/views/DocumentationTopic.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ describe('DocumentationTopic', () => {
261261

262262
wrapper.setData({ topicData });
263263

264-
const title = wrapper.find('span.nav-title');
264+
const title = wrapper.find('h2.nav-title');
265265
expect(title.exists()).toBe(true);
266266
expect(title.text()).toBe('documentation.title');
267267
});

0 commit comments

Comments
 (0)