Merge branch 'navigation-update' into shigusegubu-vue3

* navigation-update:
  fix lists edit page
  change ugly checkbox to a list element that doesn't look too much out of place
  a11y
  squeeze/stretch pinned items as long as there's enough space for it, hide items that won't fitc
This commit is contained in:
Henry Jameson 2022-08-24 20:34:48 +03:00
commit 13023ad29d
5 changed files with 21 additions and 8 deletions

View file

@ -5,7 +5,7 @@
{{ $t('lists.lists') }} {{ $t('lists.lists') }}
</div> </div>
<router-link <router-link
:to="{ name: 'lists-edit' }" :to="{ name: 'lists-new' }"
class="button-default btn new-list-button" class="button-default btn new-list-button"
> >
{{ $t("lists.new") }} {{ $t("lists.new") }}

View file

@ -96,14 +96,21 @@
:show-pin="editMode || forceEditMode" :show-pin="editMode || forceEditMode"
:item="item" :item="item"
/> />
<div <li
v-if="!forceEditMode && currentUser" v-if="!forceEditMode && currentUser"
class="panel-footer"
> >
<Checkbox v-model="editMode"> <button
{{ $t('nav.edit_pinned') }} class="menu-item button-unstyled"
</Checkbox> @click="toggleEditMode"
</div> >
<FAIcon
fixed-width
class="fa-scale-110"
:icon="editMode ? 'check' : 'wrench'"
/>
{{ editMode ? $t('nav.edit_finish') : $t('nav.edit_pinned') }}
</button>
</li>
</ul> </ul>
</div> </div>
</div> </div>

View file

@ -18,6 +18,8 @@
<button <button
type="button" type="button"
class="button-unstyled" class="button-unstyled"
:title="$t(isPinned ? 'general.unpin' : 'general.pin' )"
:aria-pressed="!!isPinned"
@click.stop.prevent="togglePin(item.name)" @click.stop.prevent="togglePin(item.name)"
> >
<FAIcon <FAIcon

View file

@ -5,6 +5,7 @@
:key="item.name" :key="item.name"
class="pinned-item" class="pinned-item"
:to="getRouteTo(item)" :to="getRouteTo(item)"
:title="item.labelRaw || $t(item.label)"
> >
<FAIcon <FAIcon
v-if="item.icon" v-if="item.icon"

View file

@ -88,6 +88,8 @@
"admin": "Admin", "admin": "Admin",
"moderator": "Moderator" "moderator": "Moderator"
}, },
"unpin": "Unpin item",
"pin": "Pin item",
"flash_content": "Click to show Flash content using Ruffle (Experimental, may not work).", "flash_content": "Click to show Flash content using Ruffle (Experimental, may not work).",
"flash_security": "Note that this can be potentially dangerous since Flash content is still arbitrary code.", "flash_security": "Note that this can be potentially dangerous since Flash content is still arbitrary code.",
"flash_fail": "Failed to load flash content, see console for details.", "flash_fail": "Failed to load flash content, see console for details.",
@ -154,7 +156,8 @@
"chats": "Chats", "chats": "Chats",
"lists": "Lists", "lists": "Lists",
"edit_nav_mobile": "Customize navigation bar", "edit_nav_mobile": "Customize navigation bar",
"edit_pinned": "Edit pinned items" "edit_pinned": "Edit pinned items",
"edit_finish": "Done editing"
}, },
"notifications": { "notifications": {
"broken_favorite": "Unknown status, searching for it…", "broken_favorite": "Unknown status, searching for it…",