moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor navigation-entry and use them in other nav items

This commit is contained in:
Henry Jameson 2022-08-30 00:15:42 +03:00
parent ea3ce55929
commit 768b3ea14f
4 changed files with 121 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/App.scss
View File

@ -132,11 +132,10 @@ i[class*=icon-],
.button-unstyled:hover, .button-unstyled:hover,
a:hover { a:hover {
i[class*=icon-], > i[class*=icon-],
.svg-inline--fa, > .svg-inline--fa,
.iconLetter { > .iconLetter {
color: $fallback--text; color: var(--text);
color: var(--text, $fallback--text);
} }
} }

190
src/components/nav_panel/nav_panel.vue
View File

@ -22,95 +22,77 @@
v-if="!collapsed || forceExpand" v-if="!collapsed || forceExpand"
class="panel-body" class="panel-body"
> >
<li v-if="currentUser || !privateMode"> <NavigationEntry
<button v-if="currentUser || !privateMode"
class="button-unstyled menu-item" :show-pin="false"
:aria-expanded="showTimelines ? 'true' : 'false'" :item="{ icon: 'stream', label: 'nav.timelines' }"
@click="toggleTimelines" :aria-expanded="showTimelines ? 'true' : 'false'"
> @click="toggleTimelines"
<FAIcon >
fixed-width <FAIcon
class="fa-scale-110" class="timelines-chevron"
icon="stream" fixed-width
/>{{ $t("nav.timelines") }} :icon="showTimelines ? 'chevron-up' : 'chevron-down'"
<FAIcon />
class="timelines-chevron" </NavigationEntry>
fixed-width <div
:icon="showTimelines ? 'chevron-up' : 'chevron-down'" v-show="showTimelines"
/> class="timelines-background"
</button> >
<div <div class="timelines">
v-show="showTimelines" <NavigationEntry
class="timelines-background" v-for="item in timelinesItems"
> :key="item.name"
<ul class="timelines">
<NavigationEntry
v-for="item in timelinesItems"
:key="item.name"
:show-pin="editMode || forceEditMode"
:item="item"
/>
</ul>
</div>
</li>
<li v-if="currentUser">
<button
class="button-unstyled menu-item"
:aria-expanded="showLists ? 'true' : 'false'"
@click="toggleLists"
>
<FAIcon
fixed-width
class="fa-scale-110"
icon="list"
/>{{ $t("nav.lists") }}
<FAIcon
class="timelines-chevron"
fixed-width
:icon="showLists ? 'chevron-up' : 'chevron-down'"
/>
<router-link
:to="{ name: 'lists' }"
@click.stop
>
<FAIcon
class="timelines-chevron"
fixed-width
icon="wrench"
/>
</router-link>
</button>
<div
v-show="showLists"
class="timelines-background"
>
<ListsMenuContent
:show-pin="editMode || forceEditMode" :show-pin="editMode || forceEditMode"
class="timelines" :item="item"
/> />
</div> </div>
</li> </div>
<NavigationEntry
v-if="currentUser"
:show-pin="false"
:item="{ icon: 'list', label: 'nav.lists' }"
:aria-expanded="showLists ? 'true' : 'false'"
@click="toggleLists"
>
<router-link
class="extra-button"
:to="{ name: 'lists' }"
@click.stop
>
<FAIcon
class="extra-button"
fixed-width
icon="wrench"
/>
</router-link>
<FAIcon
class="timelines-chevron"
fixed-width
:icon="showLists ? 'chevron-up' : 'chevron-down'"
/>
</NavigationEntry>
<div
v-show="showLists"
class="timelines-background"
>
<ListsMenuContent
:show-pin="editMode || forceEditMode"
class="timelines"
/>
</div>
<NavigationEntry <NavigationEntry
v-for="item in rootItems" v-for="item in rootItems"
:key="item.name" :key="item.name"
:show-pin="editMode || forceEditMode" :show-pin="editMode || forceEditMode"
:item="item" :item="item"
/> />
<li <NavigationEntry
v-if="!forceEditMode && currentUser" v-if="!forceEditMode && currentUser"
> :show-pin="false"
<button :item="{ label: editMode ? $t('nav.edit_finish') : $t('nav.edit_pinned'), icon: editMode ? 'check' : 'wrench' }"
class="menu-item button-unstyled" @click="toggleEditMode"
@click="toggleEditMode" />
>
<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>
@ -161,55 +143,23 @@
border: none; border: none;
} }
.menu-item {
display: block;
box-sizing: border-box;
height: 3.5em;
line-height: 3.5em;
padding: 0 1em;
width: 100%;
color: $fallback--link;
color: var(--link, $fallback--link);
&:hover {
background-color: $fallback--lightBg;
background-color: var(--selectedMenu, $fallback--lightBg);
color: $fallback--link;
color: var(--selectedMenuText, $fallback--link);
--faint: var(--selectedMenuFaintText, $fallback--faint);
--faintLink: var(--selectedMenuFaintLink, $fallback--faint);
--lightText: var(--selectedMenuLightText, $fallback--lightText);
--icon: var(--selectedMenuIcon, $fallback--icon);
}
&.router-link-active {
font-weight: bolder;
background-color: $fallback--lightBg;
background-color: var(--selectedMenu, $fallback--lightBg);
color: $fallback--text;
color: var(--selectedMenuText, $fallback--text);
--faint: var(--selectedMenuFaintText, $fallback--faint);
--faintLink: var(--selectedMenuFaintLink, $fallback--faint);
--lightText: var(--selectedMenuLightText, $fallback--lightText);
--icon: var(--selectedMenuIcon, $fallback--icon);
&:hover {
text-decoration: underline;
}
}
}
.timelines-chevron { .timelines-chevron {
margin-left: 0.8em; margin-left: 0.8em;
margin-right: 0.8em; margin-right: 0.8em;
font-size: 1.1em; font-size: 1.1em;
} }
.menu-item {
.timelines-chevron {
margin-right: 0;
}
}
.timelines-background { .timelines-background {
padding: 0 0 0 0.6em; padding: 0 0 0 0.6em;
background-color: $fallback--lightBg; background-color: $fallback--lightBg;
background-color: var(--selectedMenu, $fallback--lightBg); background-color: var(--selectedMenu, $fallback--lightBg);
border-top: 1px solid; border-bottom: 1px solid;
border-color: $fallback--border; border-color: $fallback--border;
border-color: var(--border, $fallback--border); border-color: var(--border, $fallback--border);
} }
@ -223,9 +173,5 @@
// breaks without a unit // breaks without a unit
--panel-heading-height-padding: 0em; --panel-heading-height-padding: 0em;
} }
.fa-scale-110 {
margin-right: 0.8em;
}
} }
</style> </style>

1
src/components/navigation/navigation_entry.js
View File

@ -22,6 +22,7 @@ const NavigationEntry = {
}, },
computed: { computed: {
routeTo () { routeTo () {
if (!this.item.route && !this.item.routeObject) return null
if (this.item.routeObject) { if (this.item.routeObject) {
return this.item.routeObject return this.item.routeObject
} }

74
src/components/navigation/navigation_entry.vue
View File

@ -1,23 +1,37 @@
<template> <template>
<li class="NavigationEntry"> <li class="NavigationEntry">
<router-link <component
class="menu-item" :is="routeTo ? 'router-link' : 'button'"
class="menu-item button-unstyled"
:to="routeTo" :to="routeTo"
> >
<FAIcon <span>
v-if="item.icon" <FAIcon
fixed-width v-if="item.icon"
class="fa-scale-110" fixed-width
:icon="item.icon" class="fa-scale-110 menu-icon"
/> :icon="item.icon"
/>
</span>
<span <span
v-if="item.iconLetter" v-if="item.iconLetter"
class="icon iconLetter fa-scale-110" class="icon iconLetter fa-scale-110 menu-icon"
>{{ item.iconLetter }} >{{ item.iconLetter }}
</span>{{ item.labelRaw || $t(item.label) }} </span>
<span class="label">
{{ item.labelRaw || $t(item.label) }}
</span>
<slot />
<div
v-if="item.badgeGetter && getters[item.badgeGetter]"
class="badge badge-notification"
>
{{ getters[item.badgeGetter] }}
</div>
<button <button
v-if="showPin && currentUser"
type="button" type="button"
class="button-unstyled" class="button-unstyled extra-button"
:title="$t(isPinned ? 'general.unpin' : 'general.pin' )" :title="$t(isPinned ? 'general.unpin' : 'general.pin' )"
:aria-pressed="!!isPinned" :aria-pressed="!!isPinned"
@click.stop.prevent="togglePin(item.name)" @click.stop.prevent="togglePin(item.name)"
@ -30,14 +44,8 @@
:transform="!isPinned(item.name) ? 'rotate-45' : ''" :transform="!isPinned(item.name) ? 'rotate-45' : ''"
icon="thumbtack" icon="thumbtack"
/> />
<div
v-if="item.badgeGetter && getters[item.badgeGetter]"
class="badge badge-notification"
>
{{ getters[item.badgeGetter] }}
</div>
</button> </button>
</router-link> </component>
</li> </li>
</template> </template>
@ -47,19 +55,27 @@
@import '../../_variables.scss'; @import '../../_variables.scss';
.NavigationEntry { .NavigationEntry {
.fa-scale-110 { .label {
flex: 1;
}
.menu-icon {
margin-right: 0.8em; margin-right: 0.8em;
} }
.badge { .extra-button {
position: absolute; width: 3em;
right: 0.6rem; text-align: center;
top: 1.25em;
&:last-child {
margin-right: -0.8em;
}
} }
.menu-item { .menu-item {
display: block; display: flex;
box-sizing: border-box; box-sizing: border-box;
align-items: baseline;
height: 3.5em; height: 3.5em;
line-height: 3.5em; line-height: 3.5em;
padding: 0 1em; padding: 0 1em;
@ -75,7 +91,10 @@
--faint: var(--selectedMenuFaintText, $fallback--faint); --faint: var(--selectedMenuFaintText, $fallback--faint);
--faintLink: var(--selectedMenuFaintLink, $fallback--faint); --faintLink: var(--selectedMenuFaintLink, $fallback--faint);
--lightText: var(--selectedMenuLightText, $fallback--lightText); --lightText: var(--selectedMenuLightText, $fallback--lightText);
--icon: var(--selectedMenuIcon, $fallback--icon);
.menu-icon {
--icon: var(--text, $fallback--icon);
}
} }
&.router-link-active { &.router-link-active {
@ -87,7 +106,10 @@
--faint: var(--selectedMenuFaintText, $fallback--faint); --faint: var(--selectedMenuFaintText, $fallback--faint);
--faintLink: var(--selectedMenuFaintLink, $fallback--faint); --faintLink: var(--selectedMenuFaintLink, $fallback--faint);
--lightText: var(--selectedMenuLightText, $fallback--lightText); --lightText: var(--selectedMenuLightText, $fallback--lightText);
--icon: var(--selectedMenuIcon, $fallback--icon);
.menu-icon {
--icon: var(--text, $fallback--icon);
}
&:hover { &:hover {
text-decoration: underline; text-decoration: underline;