Skip to content

Commit

Permalink
Merge pull request #41683 from nextcloud/fix/41677-ab_navigation_stop…
Browse files Browse the repository at this point in the history
…s_on_2_elements_inside

Remove unneeded links and add `focus-visible` state on a link
  • Loading branch information
susnux authored Nov 24, 2023
2 parents 9dd8382 + 58d34f0 commit 4e84846
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 27 deletions.
32 changes: 8 additions & 24 deletions core/src/components/ContactsMenu/Contact.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,35 +21,13 @@

<template>
<li class="contact">
<a v-if="contact.profileUrl && contact.avatar"
:href="contact.profileUrl"
class="contact__avatar-wrapper">
<NcAvatar class="contact__avatar"
:size="44"
:user="contact.isUser ? contact.uid : undefined"
:is-no-user="!contact.isUser"
:display-name="contact.avatarLabel"
:url="contact.avatar"
:preloaded-user-status="preloadedUserStatus" />
</a>
<a v-else-if="contact.profileUrl"
:href="contact.profileUrl">
<NcAvatar class="contact__avatar"
:size="44"
:user="contact.isUser ? contact.uid : undefined"
:is-no-user="!contact.isUser"
:display-name="contact.avatarLabel"
:preloaded-user-status="preloadedUserStatus" />
</a>
<NcAvatar v-else
<NcAvatar class="contact__avatar"
:size="44"
class="contact__avatar"
:user="contact.isUser ? contact.uid : undefined"
:is-no-user="!contact.isUser"
:disable-menu="true"
:display-name="contact.avatarLabel"
:url="contact.avatar"
:preloaded-user-status="preloadedUserStatus" />

<a class="contact__body"
:href="contact.profileUrl || contact.topAction?.hyperlink">
<div class="contact__body__full-name">{{ contact.fullName }}</div>
Expand Down Expand Up @@ -147,6 +125,7 @@ export default {
&__body {
flex-grow: 1;
padding-left: 10px;
margin-left: 10px;
min-width: 0;
div {
Expand All @@ -166,6 +145,11 @@ export default {
&__last-message, &__status-message, &__email-address {
color: var(--color-text-maxcontrast);
}
&:focus-visible {
box-shadow: 0 0 0 4px var(--color-main-background) !important;
outline: 2px solid var(--color-main-text) !important;
}
}
.other-actions {
Expand Down
4 changes: 2 additions & 2 deletions dist/core-main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-main.js.map

Large diffs are not rendered by default.

0 comments on commit 4e84846

Please sign in to comment.