Skip to content

Commit 4e84846

Browse files
authored
Merge pull request #41683 from nextcloud/fix/41677-ab_navigation_stops_on_2_elements_inside
Remove unneeded links and add `focus-visible` state on a link
2 parents 9dd8382 + 58d34f0 commit 4e84846

File tree

3 files changed

+11
-27
lines changed

3 files changed

+11
-27
lines changed

core/src/components/ContactsMenu/Contact.vue

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,35 +21,13 @@
2121

2222
<template>
2323
<li class="contact">
24-
<a v-if="contact.profileUrl && contact.avatar"
25-
:href="contact.profileUrl"
26-
class="contact__avatar-wrapper">
27-
<NcAvatar class="contact__avatar"
28-
:size="44"
29-
:user="contact.isUser ? contact.uid : undefined"
30-
:is-no-user="!contact.isUser"
31-
:display-name="contact.avatarLabel"
32-
:url="contact.avatar"
33-
:preloaded-user-status="preloadedUserStatus" />
34-
</a>
35-
<a v-else-if="contact.profileUrl"
36-
:href="contact.profileUrl">
37-
<NcAvatar class="contact__avatar"
38-
:size="44"
39-
:user="contact.isUser ? contact.uid : undefined"
40-
:is-no-user="!contact.isUser"
41-
:display-name="contact.avatarLabel"
42-
:preloaded-user-status="preloadedUserStatus" />
43-
</a>
44-
<NcAvatar v-else
24+
<NcAvatar class="contact__avatar"
4525
:size="44"
46-
class="contact__avatar"
4726
:user="contact.isUser ? contact.uid : undefined"
4827
:is-no-user="!contact.isUser"
28+
:disable-menu="true"
4929
:display-name="contact.avatarLabel"
50-
:url="contact.avatar"
5130
:preloaded-user-status="preloadedUserStatus" />
52-
5331
<a class="contact__body"
5432
:href="contact.profileUrl || contact.topAction?.hyperlink">
5533
<div class="contact__body__full-name">{{ contact.fullName }}</div>
@@ -147,6 +125,7 @@ export default {
147125
&__body {
148126
flex-grow: 1;
149127
padding-left: 10px;
128+
margin-left: 10px;
150129
min-width: 0;
151130
152131
div {
@@ -166,6 +145,11 @@ export default {
166145
&__last-message, &__status-message, &__email-address {
167146
color: var(--color-text-maxcontrast);
168147
}
148+
149+
&:focus-visible {
150+
box-shadow: 0 0 0 4px var(--color-main-background) !important;
151+
outline: 2px solid var(--color-main-text) !important;
152+
}
169153
}
170154
171155
.other-actions {

dist/core-main.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/core-main.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)