Skip to content

fixed focus on navigation through the navigation drawer #3881

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

Merged
bjester merged 2 commits into from
Dec 16, 2022
Merged

fixed focus on navigation through the navigation drawer #3881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1ab0ff2
fixed focus on navigation through the navigation drawer
AllanOXDi Dec 14, 2022
a06a2bd
Updates main.less button styling with colored outline on focus and ma…
LianaHarris360 Dec 16, 2022
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
5 changes: 5 additions & 0 deletions contentcuration/contentcuration/frontend/shared/styles/main.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@ body {
max-width: 200px;
text-align: center;
}

.button:focus-visible,
.v-btn:focus-visible {
outline: 2px solid var(--v-secondary-base) !important;
}
}

/* RTL-related rules */
Expand Down
24 changes: 19 additions & 5 deletions contentcuration/contentcuration/frontend/shared/views/MainNavigationDrawer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,23 @@
:right="$isRTL"
>
<VToolbar color="primary" dark>
<VBtn flat icon @click="drawer = false">
<VBtn flat icon :tabindex="handleclickTab" @click="drawer = false">
<Icon>clear</Icon>
</VBtn>
<VToolbarTitle class="notranslate">
Kolibri Studio
</VToolbarTitle>
</VToolbar>
<VList>
<VListTile :href="channelsLink">
<VListTile :href="channelsLink" :tabindex="handleclickTab">
<VListTileAction>
<Icon>home</Icon>
</VListTileAction>
<VListTileContent class="subheading">
<VListTileTitle>{{ $tr('channelsLink') }}</VListTileTitle>
</VListTileContent>
</VListTile>
<VListTile v-if="user.is_admin" :href="administrationLink">
<VListTile v-if="user.is_admin" :href="administrationLink" :tabindex="handleclickTab">
<VListTileAction>
<Icon>people</Icon>
</VListTileAction>
Expand All @@ -34,7 +34,7 @@
</VListTileContent>

</VListTile>
<VListTile :href="settingsLink" @click="trackClick('Settings')">
<VListTile :href="settingsLink" :tabindex="handleclickTab" @click="trackClick('Settings')">
<VListTileAction>
<Icon>settings</Icon>
</VListTileAction>
Expand All @@ -50,7 +50,12 @@
<VListTileTitle v-text="$tr('changeLanguage')" />
</VListTileContent>
</VListTile>
<VListTile :href="helpLink" target="_blank" @click="trackClick('Help')">
<VListTile
:href="helpLink"
:tabindex="handleclickTab"
target="_blank"
@click="trackClick('Help')"
>
<VListTileAction>
<Icon>open_in_new</Icon>
</VListTileAction>
Expand All @@ -73,12 +78,14 @@
:text="$tr('copyright', { year: new Date().getFullYear() })"
href="https://learningequality.org/"
target="_blank"
:tabindex="handleclickTab"
/>
<p class="mt-4">
<ActionLink
href="https://community.learningequality.org/c/support/studio"
target="_blank"
:text="$tr('giveFeedback')"
:tabindex="handleclickTab"
/>
</p>
</VContainer>
Expand Down Expand Up @@ -123,6 +130,13 @@
...mapState({
user: state => state.session.currentUser,
}),
handleclickTab() {
if (this.value) {
return 0;
} else {
return -1;
}
},
drawer: {
get() {
return this.value;
Expand Down