Skip to content
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

Jump to bottom

[stable3.0] Fix navigation icon bullet accessibility #3990

Closed
wants to merge 1 commit into from
+14 −65
Closed

[stable3.0] Fix navigation icon bullet accessibility #3990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 0 additions & 14 deletions css/app-navigation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,20 +187,6 @@
}
}

.app-navigation-entry__icon-bullet-disabled {
display: block;
// there is 2 margins
padding: 15px;
div {
border: 1px solid var(--color-border-dark);
width: 15px;
height: 15px;
cursor: pointer;
transition: background 100ms ease-in-out;
border-radius: 50%;
}
}

.app-navigation-entry__utils {
.action-checkbox__label {
padding-right: 0 !important;
Expand Down
37 changes: 0 additions & 37 deletions src/components/AppNavigation/CalendarList/AppNavigationDisabledCalendarIconBullet.vue
View file
Open in desktop

This file was deleted.

28 changes: 14 additions & 14 deletions src/components/AppNavigation/CalendarList/CalendarListItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,18 @@
:title="calendar.displayName || $t('calendar', 'Untitled calendar')"
:class="{deleted: !!deleteTimeout, disabled: !calendar.enabled, 'open-sharing': shareMenuOpen}"
@click.prevent.stop="toggleEnabled">
<AppNavigationIconBullet
v-if="calendar.enabled"
slot="icon"
:color="calendar.color"
@click.prevent.stop="toggleEnabled" />
<AppNavigationDisabledCalendarIconBullet
v-if="!calendar.enabled"
slot="icon"
@click.prevent.stop="toggleEnabled" />
<template slot="icon">
<Actions>
<ActionButton @click.prevent.stop="toggleEnabled">
<template #icon>
<CheckboxBlankCircle
:title="calendar.enabled ? $t('calendar', 'Disable calendar') : $t('calendar', 'Enable calendar') "
:size="20"
:fill-color="calendar.enabled ? calendar.color : 'var(--color-text-lighter)'" />
</template>
</ActionButton>
</Actions>
</template>

<template v-if="!deleteTimeout" slot="counter">
<Actions v-if="showSharingIcon" class="sharing">
Expand Down Expand Up @@ -171,7 +174,6 @@ import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
import ActionInput from '@nextcloud/vue/dist/Components/ActionInput'
import ActionLink from '@nextcloud/vue/dist/Components/ActionLink'
import ActionText from '@nextcloud/vue/dist/Components/ActionText'
import AppNavigationIconBullet from '@nextcloud/vue/dist/Components/AppNavigationIconBullet'
import AppNavigationItem from '@nextcloud/vue/dist/Components/AppNavigationItem'
import ClickOutside from 'vue-click-outside'
import {
Expand All @@ -183,11 +185,10 @@ import {
generateRemoteUrl,
} from '@nextcloud/router'
import AppNavigationDisabledCalendarIconBullet from './AppNavigationDisabledCalendarIconBullet.vue'
import CalendarListItemSharingSearch from './CalendarListItemSharingSearch.vue'
import CalendarListItemSharingPublishItem from './CalendarListItemSharingPublishItem.vue'
import CalendarListItemSharingShareItem from './CalendarListItemSharingShareItem.vue'
import CheckboxBlankCircle from 'vue-material-design-icons/CheckboxBlankCircle.vue'
import Close from 'vue-material-design-icons/Close.vue'
import Delete from 'vue-material-design-icons/Delete.vue'
import Download from 'vue-material-design-icons/Download.vue'
Expand All @@ -205,12 +206,11 @@ export default {
ActionInput,
ActionLink,
ActionText,
AppNavigationDisabledCalendarIconBullet,
AppNavigationIconBullet,
AppNavigationItem,
CalendarListItemSharingSearch,
CalendarListItemSharingPublishItem,
CalendarListItemSharingShareItem,
CheckboxBlankCircle,
Close,
Delete,
Download,
Expand Down