Merge branch 'various-css-fixes' into shigusegubu

* various-css-fixes:
  fix build warnings
  lint
  remove 'md' size that doesn't exist
This commit is contained in:
Henry Jameson 2020-11-01 16:47:43 +02:00
commit 5ab02e1668
10 changed files with 45 additions and 49 deletions

View file

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

View file

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

View file

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

View file

@ -16,7 +16,6 @@
@click.prevent="muteConversation"
>
<FAIcon
size="md"
fixed-width
icon="eye-slash"
/><span>{{ $t("status.mute_conversation") }}</span>
@ -27,7 +26,6 @@
@click.prevent="unmuteConversation"
>
<FAIcon
size="md"
fixed-width
icon="eye-slash"
/><span>{{ $t("status.unmute_conversation") }}</span>
@ -39,7 +37,6 @@
@click="close"
>
<FAIcon
size="md"
fixed-width
icon="thumbtack"
/><span>{{ $t("status.pin") }}</span>
@ -51,7 +48,6 @@
@click="close"
>
<FAIcon
size="md"
fixed-width
icon="thumbtack"
/><span>{{ $t("status.unpin") }}</span>
@ -63,7 +59,6 @@
@click="close"
>
<FAIcon
size="md"
fixed-width
:icon="['far', 'bookmark']"
/><span>{{ $t("status.bookmark") }}</span>
@ -75,7 +70,6 @@
@click="close"
>
<FAIcon
size="md"
fixed-width
icon="bookmark"
/><span>{{ $t("status.unbookmark") }}</span>
@ -87,7 +81,6 @@
@click="close"
>
<FAIcon
size="md"
fixed-width
icon="times"
/><span>{{ $t("status.delete") }}</span>
@ -98,7 +91,6 @@
@click="close"
>
<FAIcon
size="md"
fixed-width
icon="share-alt"
/><span>{{ $t("status.copy_link") }}</span>
@ -109,7 +101,6 @@
<FAIcon
class="ExtraButtons fa-scale-110 fa-old-padding"
icon="ellipsis-h"
size="md"
/>
</span>
</Popover>

View file

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

View file

@ -18,6 +18,8 @@ import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
library.add(
faCircleNotch
)
export default {}
</script>
<style lang="scss">

View file

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

View file

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

View file

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

View file

@ -126,6 +126,8 @@ library.add(
faRetweet,
faReply
)
export default {}
</script>
<style lang="scss">