aiden
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update navbar, fix icon

Browse Source
pull/5828/head
Daniel Supernault 2 months ago
parent bb79415a10
commit c93a0b6aeb
No known key found for this signature in database
GPG Key ID: 23740873EE6F76A1
1 changed files with 879 additions and 977 deletions
Show Stats Download Patch File Download Diff File

100
resources/assets/components/partials/navbar.vue
Unescape Escape View File

@ -10,10 +10,6 @@
<div class="collapse navbar-collapse"> <div class="collapse navbar-collapse">
<div class="navbar-nav ml-auto"> <div class="navbar-nav ml-auto">
<!-- <form class="form-inline search-bar" method="get" action="/i/results">
<input class="form-control" name="q" placeholder="Search ..." aria-label="search" autocomplete="off" required style="position: relative;line-height: 0.6;width:100%;min-width: 300px;max-width: 500px;border-radius: 8px;" role="search">
</form> -->
<autocomplete <autocomplete
class="searchbox" class="searchbox"
:search="autocompleteSearch" :search="autocompleteSearch"
@ -161,31 +157,6 @@
</div> </div>
<div class="ml-auto"> <div class="ml-auto">
<ul class="navbar-nav align-items-center"> <ul class="navbar-nav align-items-center">
<!-- <li class="nav-item px-md-2 d-none d-md-block">
<router-link class="nav-link font-weight-bold text-dark" to="/i/web" title="Home" data-toggle="tooltip" data-placement="bottom">
<i class="far fa-home fa-lg"></i>
<span class="sr-only">Home</span>
</router-link>
</li>
<li class="nav-item px-md-2 d-none d-md-block">
<router-link class="nav-link font-weight-bold text-dark" title="Compose" data-toggle="tooltip" data-placement="bottom" to="/i/web/compose">
<i class="far fa-plus-square fa-lg"></i>
<span class="sr-only">Compose</span>
</router-link>
</li> -->
<!-- <li class="nav-item px-md-2">
<router-link class="nav-link font-weight-bold text-dark" to="/i/web/direct" title="Direct" data-toggle="tooltip" data-placement="bottom">
<i class="far fa-comment-dots fa-lg"></i>
<span class="sr-only">Direct</span>
</router-link>
</li>
<li class="nav-item px-md-2 d-none d-md-block">
<router-link class="nav-link font-weight-bold text-dark fa-layers fa-fw" to="/i/web/notifications" title="Notifications" data-toggle="tooltip" data-placement="bottom">
<i class="far fa-bell fa-lg"></i>
<span class="fa-layers-counter" style="background:Tomato"></span>
<span class="sr-only">Notifications</span>
</router-link>
</li> -->
<li class="nav-item dropdown ml-2"> <li class="nav-item dropdown ml-2">
<a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="User Menu"> <a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="User Menu">
<i class="d-none far fa-user fa-lg text-dark"></i> <i class="d-none far fa-user fa-lg text-dark"></i>
@ -247,13 +218,6 @@
</router-link> </router-link>
</li> </li>
<!-- <li class="nav-item">
<router-link class="nav-link" to="/i/web/discover">
<span class="icon text-lighter"><i class="far fa-compass"></i></span>
{{ $t('navmenu.discover') }}
</router-link>
</li> -->
<li class="nav-item"> <li class="nav-item">
<router-link class="nav-link d-flex justify-content-between align-items-center" to="/i/web/direct"> <router-link class="nav-link d-flex justify-content-between align-items-center" to="/i/web/direct">
<span> <span>
@ -262,8 +226,6 @@
</span> </span>
{{ $t('navmenu.directMessages') }} {{ $t('navmenu.directMessages') }}
</span> </span>
<!-- <span class="badge badge-danger font-weight-light rounded-pill px-2" style="transform:scale(0.86)">99+</span> -->
</router-link> </router-link>
</li> </li>
@ -276,32 +238,11 @@
<li class="nav-item"> <li class="nav-item">
<router-link class="nav-link" to="/settings/home"> <router-link class="nav-link" to="/settings/home">
<span class="icon text-lighter"><i class="fa-cog"></i></span> <span class="icon text-lighter"><i class="far fa-cog"></i></span>
{{ $t('navmenu.settings') }} {{ $t('navmenu.settings') }}
</router-link> </router-link>
</li> </li>
<!-- <li class="nav-item">
<router-link class="nav-link d-flex justify-content-between align-items-center" to="/i/web/notifications">
<span>
<span class="icon text-lighter">
<i class="far fa-bell"></i>
</span>
{{ $t('navmenu.notifications') }}
</span>
</router-link>
</li> -->
<!-- <li class="nav-item">
<hr class="mt-n1" style="opacity: 0.4;margin-bottom: 0;" />
<router-link class="nav-link" :to="'/i/web/profile/' + user.id">
<span class="icon text-lighter">
<i class="far fa-user"></i>
</span>
{{ $t('navmenu.profile') }}
</router-link>
</li> -->
<li v-if="user.is_admin" class="nav-item"> <li v-if="user.is_admin" class="nav-item">
<hr class="mt-n1" style="opacity: 0.4;margin-bottom: 0;" /> <hr class="mt-n1" style="opacity: 0.4;margin-bottom: 0;" />
<a class="nav-link" href="/i/admin/dashboard"> <a class="nav-link" href="/i/admin/dashboard">
@ -312,16 +253,6 @@
</a> </a>
</li> </li>
<li class="nav-item">
<hr class="mt-n1" style="opacity: 0.4;margin-bottom: 0;" />
<a class="nav-link" href="/">
<span class="icon text-lighter">
<i class="fas fa-chevron-left"></i>
</span>
{{ $t('navmenu.backToPreviousDesign') }}
</a>
</li>
<li class="nav-item"> <li class="nav-item">
<hr class="mt-n1" style="opacity: 0.4;margin-bottom: 0;" /> <hr class="mt-n1" style="opacity: 0.4;margin-bottom: 0;" />
<a class="nav-link" href="/" @click.prevent="logout()"> <a class="nav-link" href="/" @click.prevent="logout()">
@ -561,13 +492,7 @@
tag.s_type = 'hashtag'; tag.s_type = 'hashtag';
return tag; return tag;
}) })
// let statuses = res.data.statuses.map(res => {
// let status = res;
// status.s_type = 'status';
// return status;
// });
// results.push(...statuses.slice(0,5));
results.push(...accounts.slice(0,5)); results.push(...accounts.slice(0,5));
results.push(...hashtags.slice(0,5)); results.push(...hashtags.slice(0,5));
@ -610,37 +535,14 @@
this.$refs.autocomplete.value = ''; this.$refs.autocomplete.value = '';
switch(result.s_type) { switch(result.s_type) {
case 'account': case 'account':
// this.$router.push({
// name: 'profile',
// path: `/i/web/profile/${result.id}`,
// params: {
// id: result.id,
// cachedProfile: result,
// cachedUser: this.user
// }
// });
location.href = `/i/web/profile/${result.id}`; location.href = `/i/web/profile/${result.id}`;
break; break;
case 'hashtag': case 'hashtag':
// this.$router.push({
// name: 'hashtag',
// path: `/i/web/hashtag/${result.name}`,
// params: {
// id: result.name,
// }
// });
location.href = `/i/web/hashtag/${result.name}`; location.href = `/i/web/hashtag/${result.name}`;
break; break;
case 'status': case 'status':
// this.$router.push({
// name: 'post',
// path: `/i/web/post/${result.id}`,
// params: {
// id: result.id,
// }
// });
location.href = `/i/web/post/${result.id}`; location.href = `/i/web/post/${result.id}`;
break; break;
} }

Write Preview
Loading…
Cancel
Save