This commit is contained in:
Henry Jameson 2020-11-01 16:44:57 +02:00
parent 994b49ddfe
commit 8b1213ea1e
7 changed files with 41 additions and 40 deletions

View file

@ -37,7 +37,7 @@ export default {
GlobalNoticeList GlobalNoticeList
}, },
data: () => ({ data: () => ({
mobileActivePanel: 'timeline', mobileActivePanel: 'timeline'
}), }),
created () { created () {
// Load the locale from the storage // Load the locale from the storage

View file

@ -69,7 +69,7 @@ export default {
hideSitename () { return this.$store.state.instance.hideSitename }, hideSitename () { return this.$store.state.instance.hideSitename },
logoLeft () { return this.$store.state.instance.logoLeft }, logoLeft () { return this.$store.state.instance.logoLeft },
currentUser () { return this.$store.state.users.currentUser }, currentUser () { return this.$store.state.users.currentUser },
privateMode () { return this.$store.state.instance.private }, privateMode () { return this.$store.state.instance.private }
}, },
methods: { methods: {
scrollToTop () { scrollToTop () {
@ -84,6 +84,6 @@ export default {
}, },
openSettingsModal () { openSettingsModal () {
this.$store.dispatch('openSettingsModal') this.$store.dispatch('openSettingsModal')
}, }
} }
} }

View file

@ -4,7 +4,7 @@
class="DesktopNav" class="DesktopNav"
:class="{ '-logoLeft': logoLeft }" :class="{ '-logoLeft': logoLeft }"
@click="scrollToTop()" @click="scrollToTop()"
> >
<div class="inner-nav"> <div class="inner-nav">
<div class="item sitename"> <div class="item sitename">
<router-link <router-link
@ -12,7 +12,7 @@
class="site-name" class="site-name"
:to="{ name: 'root' }" :to="{ name: 'root' }"
active-class="home" active-class="home"
> >
{{ sitename }} {{ sitename }}
</router-link> </router-link>
</div> </div>
@ -20,58 +20,58 @@
class="logo" class="logo"
:to="{ name: 'root' }" :to="{ name: 'root' }"
:style="logoBgStyle" :style="logoBgStyle"
> >
<div <div
class="mask" class="mask"
:style="logoMaskStyle" :style="logoMaskStyle"
/> />
<img <img
:src="logo" :src="logo"
:style="logoStyle" :style="logoStyle"
> >
</router-link> </router-link>
<div class="item right actions"> <div class="item right actions">
<search-bar <search-bar
v-if="currentUser || !privateMode" v-if="currentUser || !privateMode"
@toggled="onSearchBarToggled" @toggled="onSearchBarToggled"
@click.stop.native @click.stop.native
/> />
<a <a
href="#" href="#"
class="nav-icon" class="nav-icon"
@click.stop="openSettingsModal" @click.stop="openSettingsModal"
> >
<FAIcon <FAIcon
fixed-width fixed-width
class="fa-scale-110 fa-old-padding" class="fa-scale-110 fa-old-padding"
icon="cog" icon="cog"
:title="$t('nav.preferences')" :title="$t('nav.preferences')"
/> />
</a> </a>
<a <a
v-if="currentUser && currentUser.role === 'admin'" v-if="currentUser && currentUser.role === 'admin'"
href="/pleroma/admin/#/login-pleroma" href="/pleroma/admin/#/login-pleroma"
class="nav-icon" class="nav-icon"
target="_blank" target="_blank"
><FAIcon ><FAIcon
fixed-width fixed-width
class="fa-scale-110 fa-old-padding" class="fa-scale-110 fa-old-padding"
icon="tachometer-alt" icon="tachometer-alt"
:title="$t('nav.administration')" :title="$t('nav.administration')"
/></a> /></a>
<a <a
v-if="currentUser" v-if="currentUser"
href="#" href="#"
class="nav-icon" class="nav-icon"
@click.prevent="logout" @click.prevent="logout"
><FAIcon ><FAIcon
fixed-width fixed-width
class="fa-scale-110 fa-old-padding" class="fa-scale-110 fa-old-padding"
icon="sign-out-alt" icon="sign-out-alt"
:title="$t('login.logout')" :title="$t('login.logout')"
/></a> /></a>
</div>
</div> </div>
</div>
</nav> </nav>
</template> </template>
<script src="./desktop_nav.js"></script> <script src="./desktop_nav.js"></script>

View file

@ -1,7 +1,7 @@
<template> <template>
<div <div
class="MobileNav" class="MobileNav"
> >
<nav <nav
id="nav" id="nav"
class="mobile-nav" class="mobile-nav"

View file

@ -87,7 +87,8 @@
</a> </a>
<div <div
v-show="previewLoading" v-show="previewLoading"
class="preview-spinner"> class="preview-spinner"
>
<FAIcon <FAIcon
class="fa-old-padding" class="fa-old-padding"
spin spin

View file

@ -11,8 +11,8 @@
> >
<div class="reaction-picker-filter"> <div class="reaction-picker-filter">
<input <input
size="1"
v-model="filterWord" v-model="filterWord"
size="1"
:placeholder="$t('emoji.search_emoji')" :placeholder="$t('emoji.search_emoji')"
> >
</div> </div>

View file

@ -1,19 +1,19 @@
<template> <template>
<div <div
class="SearchBar" class="SearchBar"
:class="{ '-expanded': !hidden }" :class="{ '-expanded': !hidden }"
> >
<a <a
v-if="hidden" v-if="hidden"
href="#" href="#"
class="nav-icon" class="nav-icon"
:title="$t('nav.search')" :title="$t('nav.search')"
><FAIcon ><FAIcon
fixed-width fixed-width
class="fa-scale-110 fa-old-padding" class="fa-scale-110 fa-old-padding"
icon="search" icon="search"
@click.prevent.stop="toggleHidden" @click.prevent.stop="toggleHidden"
/></a> /></a>
<template v-else> <template v-else>
<input <input
id="search-bar-input" id="search-bar-input"
@ -23,15 +23,15 @@
:placeholder="$t('nav.search')" :placeholder="$t('nav.search')"
type="text" type="text"
@keyup.enter="find(searchTerm)" @keyup.enter="find(searchTerm)"
> >
<button <button
class="btn search-button" class="btn search-button"
@click="find(searchTerm)" @click="find(searchTerm)"
> >
<FAIcon <FAIcon
fixed-width fixed-width
icon="search" icon="search"
/> />
</button> </button>
<span> <span>
<FAIcon <FAIcon
@ -39,7 +39,7 @@
icon="times" icon="times"
class="cancel-icon fa-scale-110 fa-old-padding" class="cancel-icon fa-scale-110 fa-old-padding"
@click.prevent.stop="toggleHidden" @click.prevent.stop="toggleHidden"
/> />
</span> </span>
</template> </template>
</div> </div>