This commit is contained in:
Henry Jameson 2020-10-21 00:31:16 +03:00
parent 1ec41302f7
commit f561e75553
41 changed files with 497 additions and 140 deletions

View file

@ -54,7 +54,8 @@
<FAIcon <FAIcon
fixed-width fixed-width
size="lg" size="lg"
class="button-icon" icon="cog" class="button-icon"
icon="cog"
:title="$t('nav.preferences')" :title="$t('nav.preferences')"
/> />
</a> </a>
@ -66,7 +67,8 @@
><FAIcon ><FAIcon
fixed-width fixed-width
size="lg" size="lg"
class="button-icon" icon="tachometer-alt" class="button-icon"
icon="tachometer-alt"
:title="$t('nav.administration')" :title="$t('nav.administration')"
/></a> /></a>
<a <a
@ -77,7 +79,8 @@
><FAIcon ><FAIcon
fixed-width fixed-width
size="lg" size="lg"
class="button-icon" icon="sign-out-alt" class="button-icon"
icon="sign-out-alt"
:title="$t('login.logout')" :title="$t('login.logout')"
/></a> /></a>
</div> </div>

View file

@ -63,7 +63,10 @@
slot="trigger" slot="trigger"
class="btn btn-default ellipsis-button" class="btn btn-default ellipsis-button"
> >
<FAIcon class="icon" icon="ellipsis-v" /> <FAIcon
class="icon"
icon="ellipsis-v"
/>
</div> </div>
</Popover> </Popover>
</div> </div>

View file

@ -38,7 +38,8 @@
> >
<FAIcon <FAIcon
v-if="type === 'video'" v-if="type === 'video'"
class="play-icon" icon="play-circle" class="play-icon"
icon="play-circle"
/> />
</a> </a>
<div <div
@ -85,7 +86,8 @@
/> />
<FAIcon <FAIcon
v-if="!allowPlay" v-if="!allowPlay"
class="play-icon" icon="play-circle" class="play-icon"
icon="play-circle"
/> />
</a> </a>

View file

@ -14,7 +14,10 @@
class="go-back-button" class="go-back-button"
@click="goBack" @click="goBack"
> >
<FAIcon size="lg" icon="chevron-left" /> <FAIcon
size="lg"
icon="chevron-left"
/>
</a> </a>
<div class="title text-center"> <div class="title text-center">
<ChatTitle <ChatTitle

View file

@ -11,12 +11,19 @@
class="go-back-button" class="go-back-button"
@click="goBack" @click="goBack"
> >
<FAIcon size="lg" icon="chevron-left" /> <FAIcon
size="lg"
icon="chevron-left"
/>
</a> </a>
</div> </div>
<div class="input-wrap"> <div class="input-wrap">
<div class="input-search"> <div class="input-search">
<FAIcon size="lg" class="search-icon button-icon" icon="search" /> <FAIcon
size="lg"
class="search-icon button-icon"
icon="search"
/>
</div> </div>
<input <input
ref="search" ref="search"

View file

@ -63,7 +63,10 @@
@click.stop.prevent="togglePanel" @click.stop.prevent="togglePanel"
> >
<div class="title"> <div class="title">
<FAIcon class="icon" icon="bullhorn" /> <FAIcon
class="icon"
icon="bullhorn"
/>
{{ $t('shoutbox.title') }} {{ $t('shoutbox.title') }}
</div> </div>
</div> </div>

View file

@ -13,7 +13,10 @@
:title="group.text" :title="group.text"
@click.prevent="highlight(group.id)" @click.prevent="highlight(group.id)"
> >
<FAIcon :icon="group.icon" fixed-width/> <FAIcon
:icon="group.icon"
fixed-width
/>
</span> </span>
</span> </span>
<span <span
@ -26,7 +29,10 @@
:title="$t('emoji.stickers')" :title="$t('emoji.stickers')"
@click.prevent="toggleStickers" @click.prevent="toggleStickers"
> >
<FAIcon icon="sticky-note" fixed-width/> <FAIcon
icon="sticky-note"
fixed-width
/>
</span> </span>
</span> </span>
</div> </div>

View file

@ -1,7 +1,11 @@
<template> <template>
<div class="exporter"> <div class="exporter">
<div v-if="processing"> <div v-if="processing">
<FAIcon icon="circle-notch" size="lg" spin /> <FAIcon
icon="circle-notch"
size="lg"
spin
/>
<span>{{ processingMessage }}</span> <span>{{ processingMessage }}</span>
</div> </div>

View file

@ -8,7 +8,7 @@ import {
faShareAlt faShareAlt
} from '@fortawesome/free-solid-svg-icons' } from '@fortawesome/free-solid-svg-icons'
import { import {
faBookmark as faBookmarkReg, faBookmark as faBookmarkReg
} from '@fortawesome/free-regular-svg-icons' } from '@fortawesome/free-regular-svg-icons'
library.add( library.add(

View file

@ -15,14 +15,22 @@
class="dropdown-item dropdown-item-icon" class="dropdown-item dropdown-item-icon"
@click.prevent="muteConversation" @click.prevent="muteConversation"
> >
<FAIcon size="md" fixed-width icon="eye-slash" /><span>{{ $t("status.mute_conversation") }}</span> <FAIcon
size="md"
fixed-width
icon="eye-slash"
/><span>{{ $t("status.mute_conversation") }}</span>
</button> </button>
<button <button
v-if="canMute && status.thread_muted" v-if="canMute && status.thread_muted"
class="dropdown-item dropdown-item-icon" class="dropdown-item dropdown-item-icon"
@click.prevent="unmuteConversation" @click.prevent="unmuteConversation"
> >
<FAIcon size="md" fixed-width icon="eye-slash" /><span>{{ $t("status.unmute_conversation") }}</span> <FAIcon
size="md"
fixed-width
icon="eye-slash"
/><span>{{ $t("status.unmute_conversation") }}</span>
</button> </button>
<button <button
v-if="!status.pinned && canPin" v-if="!status.pinned && canPin"
@ -30,7 +38,11 @@
@click.prevent="pinStatus" @click.prevent="pinStatus"
@click="close" @click="close"
> >
<FAIcon size="md" fixed-width icon="thumbtack" /><span>{{ $t("status.pin") }}</span> <FAIcon
size="md"
fixed-width
icon="thumbtack"
/><span>{{ $t("status.pin") }}</span>
</button> </button>
<button <button
v-if="status.pinned && canPin" v-if="status.pinned && canPin"
@ -38,7 +50,11 @@
@click.prevent="unpinStatus" @click.prevent="unpinStatus"
@click="close" @click="close"
> >
<FAIcon size="md" fixed-width icon="thumbtack" /><span>{{ $t("status.unpin") }}</span> <FAIcon
size="md"
fixed-width
icon="thumbtack"
/><span>{{ $t("status.unpin") }}</span>
</button> </button>
<button <button
v-if="!status.bookmarked" v-if="!status.bookmarked"
@ -46,7 +62,11 @@
@click.prevent="bookmarkStatus" @click.prevent="bookmarkStatus"
@click="close" @click="close"
> >
<FAIcon size="md" fixed-width :icon="['far', 'bookmark']" /><span>{{ $t("status.bookmark") }}</span> <FAIcon
size="md"
fixed-width
:icon="['far', 'bookmark']"
/><span>{{ $t("status.bookmark") }}</span>
</button> </button>
<button <button
v-if="status.bookmarked" v-if="status.bookmarked"
@ -54,7 +74,11 @@
@click.prevent="unbookmarkStatus" @click.prevent="unbookmarkStatus"
@click="close" @click="close"
> >
<FAIcon size="md" fixed-width icon="bookmark" /><span>{{ $t("status.unbookmark") }}</span> <FAIcon
size="md"
fixed-width
icon="bookmark"
/><span>{{ $t("status.unbookmark") }}</span>
</button> </button>
<button <button
v-if="canDelete" v-if="canDelete"
@ -62,14 +86,22 @@
@click.prevent="deleteStatus" @click.prevent="deleteStatus"
@click="close" @click="close"
> >
<FAIcon size="md" fixed-width icon="times" /><span>{{ $t("status.delete") }}</span> <FAIcon
size="md"
fixed-width
icon="times"
/><span>{{ $t("status.delete") }}</span>
</button> </button>
<button <button
class="dropdown-item dropdown-item-icon" class="dropdown-item dropdown-item-icon"
@click.prevent="copyLink" @click.prevent="copyLink"
@click="close" @click="close"
> >
<FAIcon size="md" fixed-width icon="share-alt" /><span>{{ $t("status.copy_link") }}</span> <FAIcon
size="md"
fixed-width
icon="share-alt"
/><span>{{ $t("status.copy_link") }}</span>
</button> </button>
</div> </div>
</div> </div>

View file

@ -41,7 +41,10 @@
{{ option === 'custom' ? $t('settings.style.fonts.custom') : option }} {{ option === 'custom' ? $t('settings.style.fonts.custom') : option }}
</option> </option>
</select> </select>
<FAIcon class="select-down-icon" icon="chevron-down" /> <FAIcon
class="select-down-icon"
icon="chevron-down"
/>
</label> </label>
<input <input
v-if="isCustom" v-if="isCustom"

View file

@ -10,7 +10,8 @@
{{ $t(notice.messageKey, notice.messageArgs) }} {{ $t(notice.messageKey, notice.messageArgs) }}
</div> </div>
<FAIcon <FAIcon
class="button-icon" icon="times" class="button-icon"
icon="times"
@click="closeNotice(notice)" @click="closeNotice(notice)"
/> />
</div> </div>

View file

@ -43,7 +43,8 @@
> >
{{ submitErrorMsg }} {{ submitErrorMsg }}
<FAIcon <FAIcon
class="button-icon" icon="times" class="button-icon"
icon="times"
@click="clearError" @click="clearError"
/> />
</div> </div>

View file

@ -19,7 +19,10 @@
{{ languageNames[i] }} {{ languageNames[i] }}
</option> </option>
</select> </select>
<FAIcon class="select-down-icon" icon="chevron-down" /> <FAIcon
class="select-down-icon"
icon="chevron-down"
/>
</label> </label>
</div> </div>
</template> </template>

View file

@ -77,7 +77,8 @@
<div class="alert error"> <div class="alert error">
{{ error }} {{ error }}
<FAIcon <FAIcon
class="button-icon" icon="times" class="button-icon"
icon="times"
@click="clearError" @click="clearError"
/> />
</div> </div>

View file

@ -34,7 +34,10 @@
class="modal-view-button-arrow modal-view-button-arrow--prev" class="modal-view-button-arrow modal-view-button-arrow--prev"
@click.stop.prevent="goPrev" @click.stop.prevent="goPrev"
> >
<FAIcon class="arrow-icon" icon="chevron-left" /> <FAIcon
class="arrow-icon"
icon="chevron-left"
/>
</button> </button>
<button <button
v-if="canNavigate" v-if="canNavigate"
@ -42,7 +45,10 @@
class="modal-view-button-arrow modal-view-button-arrow--next" class="modal-view-button-arrow modal-view-button-arrow--next"
@click.stop.prevent="goNext" @click.stop.prevent="goNext"
> >
<FAIcon class="arrow-icon" icon="chevron-right" /> <FAIcon
class="arrow-icon"
icon="chevron-right"
/>
</button> </button>
</Modal> </Modal>
</template> </template>

View file

@ -55,7 +55,8 @@
<div class="alert error"> <div class="alert error">
{{ error }} {{ error }}
<FAIcon <FAIcon
class="button-icon" icon="times" class="button-icon"
icon="times"
@click="clearError" @click="clearError"
/> />
</div> </div>

View file

@ -15,7 +15,11 @@
class="mobile-nav-button" class="mobile-nav-button"
@click.stop.prevent="toggleMobileSidebar()" @click.stop.prevent="toggleMobileSidebar()"
> >
<FAIcon size="lg" class="button-icon" icon="bars" /> <FAIcon
size="lg"
class="button-icon"
icon="bars"
/>
<div <div
v-if="unreadChatCount" v-if="unreadChatCount"
class="alert-dot" class="alert-dot"
@ -37,7 +41,11 @@
href="#" href="#"
@click.stop.prevent="openMobileNotifications()" @click.stop.prevent="openMobileNotifications()"
> >
<FAIcon size="lg" class="button-icon" icon="bell" /> <FAIcon
size="lg"
class="button-icon"
icon="bell"
/>
<div <div
v-if="unseenNotificationsCount" v-if="unseenNotificationsCount"
class="alert-dot" class="alert-dot"
@ -59,7 +67,11 @@
class="mobile-nav-button" class="mobile-nav-button"
@click.stop.prevent="closeMobileNotifications()" @click.stop.prevent="closeMobileNotifications()"
> >
<FAIcon size="lg" class="button-icon" icon="times" /> <FAIcon
size="lg"
class="button-icon"
icon="times"
/>
</a> </a>
</div> </div>
<div <div

View file

@ -7,13 +7,23 @@
:to="{ name: timelinesRoute }" :to="{ name: timelinesRoute }"
:class="onTimelineRoute && 'router-link-active'" :class="onTimelineRoute && 'router-link-active'"
> >
<FAIcon fixed-width size="lg" class="button-icon" icon="home" /> <FAIcon
fixed-width
size="lg"
class="button-icon"
icon="home"
/>
{{ $t("nav.timelines") }} {{ $t("nav.timelines") }}
</router-link> </router-link>
</li> </li>
<li v-if="currentUser"> <li v-if="currentUser">
<router-link :to="{ name: 'interactions', params: { username: currentUser.screen_name } }"> <router-link :to="{ name: 'interactions', params: { username: currentUser.screen_name } }">
<FAIcon fixed-width size="lg" class="button-icon" icon="bell" /> <FAIcon
fixed-width
size="lg"
class="button-icon"
icon="bell"
/>
{{ $t("nav.interactions") }} {{ $t("nav.interactions") }}
</router-link> </router-link>
</li> </li>
@ -25,13 +35,23 @@
> >
{{ unreadChatCount }} {{ unreadChatCount }}
</div> </div>
<FAIcon fixed-width size="lg" class="button-icon" icon="comments" /> <FAIcon
fixed-width
size="lg"
class="button-icon"
icon="comments"
/>
{{ $t("nav.chats") }} {{ $t("nav.chats") }}
</router-link> </router-link>
</li> </li>
<li v-if="currentUser && currentUser.locked"> <li v-if="currentUser && currentUser.locked">
<router-link :to="{ name: 'friend-requests' }"> <router-link :to="{ name: 'friend-requests' }">
<FAIcon fixed-width size="lg" class="button-icon" icon="user-plus" /> <FAIcon
fixed-width
size="lg"
class="button-icon"
icon="user-plus"
/>
{{ $t("nav.friend_requests") }} {{ $t("nav.friend_requests") }}
<span <span
v-if="followRequestCount > 0" v-if="followRequestCount > 0"
@ -43,7 +63,12 @@
</li> </li>
<li> <li>
<router-link :to="{ name: 'about' }"> <router-link :to="{ name: 'about' }">
<FAIcon fixed-width size="lg" class="button-icon" icon="info-circle" />{{ $t("nav.about") }} <FAIcon
fixed-width
size="lg"
class="button-icon"
icon="info-circle"
/>{{ $t("nav.about") }}
</router-link> </router-link>
</li> </li>
</ul> </ul>

View file

@ -18,7 +18,10 @@
href="#" href="#"
class="unmute" class="unmute"
@click.prevent="toggleMute" @click.prevent="toggleMute"
><FAIcon class="button-icon" icon="eye-slash" /></a> ><FAIcon
class="button-icon"
icon="eye-slash"
/></a>
</div> </div>
<div <div
v-else v-else
@ -60,26 +63,39 @@
:title="'@'+notification.from_profile.screen_name" :title="'@'+notification.from_profile.screen_name"
>{{ notification.from_profile.name }}</span> >{{ notification.from_profile.name }}</span>
<span v-if="notification.type === 'like'"> <span v-if="notification.type === 'like'">
<FAIcon class="type-icon" icon="star" /> <FAIcon
class="type-icon"
icon="star"
/>
<small>{{ $t('notifications.favorited_you') }}</small> <small>{{ $t('notifications.favorited_you') }}</small>
</span> </span>
<span v-if="notification.type === 'repeat'"> <span v-if="notification.type === 'repeat'">
<FAIcon <FAIcon
class="type-icon" icon="retweet" class="type-icon"
icon="retweet"
:title="$t('tool_tip.repeat')" :title="$t('tool_tip.repeat')"
/> />
<small>{{ $t('notifications.repeated_you') }}</small> <small>{{ $t('notifications.repeated_you') }}</small>
</span> </span>
<span v-if="notification.type === 'follow'"> <span v-if="notification.type === 'follow'">
<FAIcon class="type-icon" icon="user-plus" /> <FAIcon
class="type-icon"
icon="user-plus"
/>
<small>{{ $t('notifications.followed_you') }}</small> <small>{{ $t('notifications.followed_you') }}</small>
</span> </span>
<span v-if="notification.type === 'follow_request'"> <span v-if="notification.type === 'follow_request'">
<FAIcon class="type-icon" icon="user" /> <FAIcon
class="type-icon"
icon="user"
/>
<small>{{ $t('notifications.follow_request') }}</small> <small>{{ $t('notifications.follow_request') }}</small>
</span> </span>
<span v-if="notification.type === 'move'"> <span v-if="notification.type === 'move'">
<FAIcon class="type-icon" icon="suitcase-rolling" /> <FAIcon
class="type-icon"
icon="suitcase-rolling"
/>
<small>{{ $t('notifications.migrated_to') }}</small> <small>{{ $t('notifications.migrated_to') }}</small>
</span> </span>
<span v-if="notification.type === 'pleroma:emoji_reaction'"> <span v-if="notification.type === 'pleroma:emoji_reaction'">
@ -120,7 +136,10 @@
v-if="needMute" v-if="needMute"
href="#" href="#"
@click.prevent="toggleMute" @click.prevent="toggleMute"
><FAIcon class="button-icon" icon="eye-slash" /></a> ><FAIcon
class="button-icon"
icon="eye-slash"
/></a>
</span> </span>
<div <div
v-if="notification.type === 'follow' || notification.type === 'follow_request'" v-if="notification.type === 'follow' || notification.type === 'follow_request'"

View file

@ -61,7 +61,11 @@
v-else v-else
class="new-status-notification text-center panel-footer" class="new-status-notification text-center panel-footer"
> >
<FAIcon icon="circle-notch" spin size="lg"/> <FAIcon
icon="circle-notch"
spin
size="lg"
/>
</div> </div>
</div> </div>
</div> </div>

View file

@ -1,7 +1,11 @@
<template> <template>
<div class="panel-loading"> <div class="panel-loading">
<span class="loading-text"> <span class="loading-text">
<FAIcon icon="circle-notch" spin size="3x"/> <FAIcon
icon="circle-notch"
spin
size="3x"
/>
{{ $t('general.loading') }} {{ $t('general.loading') }}
</span> </span>
</div> </div>

View file

@ -36,7 +36,10 @@
class="add-option faint" class="add-option faint"
@click="addOption" @click="addOption"
> >
<FAIcon icon="plus" size="sm"/> <FAIcon
icon="plus"
size="sm"
/>
{{ $t("polls.add_option") }} {{ $t("polls.add_option") }}
</a> </a>
@ -57,7 +60,10 @@
<option value="single">{{ $t('polls.single_choice') }}</option> <option value="single">{{ $t('polls.single_choice') }}</option>
<option value="multiple">{{ $t('polls.multiple_choices') }}</option> <option value="multiple">{{ $t('polls.multiple_choices') }}</option>
</select> </select>
<FAIcon class="select-down-icon" icon="chevron-down"/> <FAIcon
class="select-down-icon"
icon="chevron-down"
/>
</label> </label>
</div> </div>
<div <div
@ -85,7 +91,10 @@
{{ $t(`time.${unit}_short`, ['']) }} {{ $t(`time.${unit}_short`, ['']) }}
</option> </option>
</select> </select>
<FAIcon class="select-down-icon" icon="chevron-down"/> <FAIcon
class="select-down-icon"
icon="chevron-down"
/>
</label> </label>
</div> </div>
</div> </div>

View file

@ -15,7 +15,7 @@
@dragleave="fileDragStop" @dragleave="fileDragStop"
@drop.stop="fileDrop" @drop.stop="fileDrop"
> >
<FAIcon :icon="uploadFileLimitReached ? 'ban' : 'upload'"/> <FAIcon :icon="uploadFileLimitReached ? 'ban' : 'upload'" />
</div> </div>
<div class="form-group"> <div class="form-group">
<i18n <i18n
@ -200,7 +200,10 @@
{{ $t(`post_status.content_type["${postFormat}"]`) }} {{ $t(`post_status.content_type["${postFormat}"]`) }}
</option> </option>
</select> </select>
<FAIcon class="select-down-icon" icon="chevron-down"/> <FAIcon
class="select-down-icon"
icon="chevron-down"
/>
</label> </label>
</div> </div>
<div <div
@ -242,7 +245,7 @@
class="btn btn-default" class="btn btn-default"
@click="showEmojiPicker" @click="showEmojiPicker"
> >
<FAIcon icon="smile-beam"/> <FAIcon icon="smile-beam" />
</div> </div>
</div> </div>
<div <div
@ -299,7 +302,8 @@
class="media-upload-wrapper" class="media-upload-wrapper"
> >
<FAIcon <FAIcon
class="button-icon" icon="times" class="button-icon"
icon="times"
@click="removeMediaFile(file)" @click="removeMediaFile(file)"
/> />
<attachment <attachment

View file

@ -10,16 +10,24 @@
:title="$t('post_status.scope.direct')" :title="$t('post_status.scope.direct')"
@click="changeVis('direct')" @click="changeVis('direct')"
> >
<FAIcon icon="envelope" class="button-icon" size="lg" /> <FAIcon
icon="envelope"
class="button-icon"
size="lg"
/>
</span> </span>
<span <span
class="scope"
v-if="showPrivate" v-if="showPrivate"
class="scope"
:class="css.private" :class="css.private"
:title="$t('post_status.scope.private')" :title="$t('post_status.scope.private')"
@click="changeVis('private')" @click="changeVis('private')"
> >
<FAIcon icon="lock" class="button-icon" size="lg" /> <FAIcon
icon="lock"
class="button-icon"
size="lg"
/>
</span> </span>
<span <span
v-if="showUnlisted" v-if="showUnlisted"
@ -28,7 +36,11 @@
:title="$t('post_status.scope.unlisted')" :title="$t('post_status.scope.unlisted')"
@click="changeVis('unlisted')" @click="changeVis('unlisted')"
> >
<FAIcon icon="lock-open" class="button-icon" size="lg" /> <FAIcon
icon="lock-open"
class="button-icon"
size="lg"
/>
</span> </span>
<span <span
v-if="showPublic" v-if="showPublic"
@ -37,7 +49,11 @@
:title="$t('post_status.scope.public')" :title="$t('post_status.scope.public')"
@click="changeVis('public')" @click="changeVis('public')"
> >
<FAIcon icon="globe" class="button-icon" size="lg" /> <FAIcon
icon="globe"
class="button-icon"
size="lg"
/>
</span> </span>
</div> </div>
</template> </template>

View file

@ -24,7 +24,11 @@
v-if="loading" v-if="loading"
class="text-center loading-icon" class="text-center loading-icon"
> >
<FAIcon icon="circle-notch" spin size="lg"/> <FAIcon
icon="circle-notch"
spin
size="lg"
/>
</div> </div>
<div v-else-if="loaded"> <div v-else-if="loaded">
<div class="search-nav-heading"> <div class="search-nav-heading">

View file

@ -53,7 +53,10 @@
<option value="following">{{ $t('settings.reply_visibility_following') }}</option> <option value="following">{{ $t('settings.reply_visibility_following') }}</option>
<option value="self">{{ $t('settings.reply_visibility_self') }}</option> <option value="self">{{ $t('settings.reply_visibility_self') }}</option>
</select> </select>
<FAIcon class="select-down-icon" icon="chevron-down" /> <FAIcon
class="select-down-icon"
icon="chevron-down"
/>
</label> </label>
</div> </div>
<div> <div>

View file

@ -103,7 +103,10 @@
{{ subjectLineBehaviorDefaultValue == 'noop' ? $t('settings.instance_default_simple') : '' }} {{ subjectLineBehaviorDefaultValue == 'noop' ? $t('settings.instance_default_simple') : '' }}
</option> </option>
</select> </select>
<FAIcon class="select-down-icon" icon="chevron-down" /> <FAIcon
class="select-down-icon"
icon="chevron-down"
/>
</label> </label>
</div> </div>
</li> </li>
@ -127,7 +130,10 @@
{{ postContentTypeDefaultValue === postFormat ? $t('settings.instance_default_simple') : '' }} {{ postContentTypeDefaultValue === postFormat ? $t('settings.instance_default_simple') : '' }}
</option> </option>
</select> </select>
<FAIcon class="select-down-icon" icon="chevron-down" /> <FAIcon
class="select-down-icon"
icon="chevron-down"
/>
</label> </label>
</div> </div>
</li> </li>

View file

@ -169,7 +169,8 @@
<FAIcon <FAIcon
v-if="!isDefaultAvatar && pickAvatarBtnVisible" v-if="!isDefaultAvatar && pickAvatarBtnVisible"
:title="$t('settings.reset_avatar')" :title="$t('settings.reset_avatar')"
class="reset-button" icon="times" class="reset-button"
icon="times"
type="button" type="button"
@click="resetAvatar" @click="resetAvatar"
/> />
@ -197,7 +198,8 @@
<FAIcon <FAIcon
v-if="!isDefaultBanner" v-if="!isDefaultBanner"
:title="$t('settings.reset_profile_banner')" :title="$t('settings.reset_profile_banner')"
class="reset-button" icon="times" class="reset-button"
icon="times"
type="button" type="button"
@click="resetBanner" @click="resetBanner"
/> />
@ -233,7 +235,8 @@
> >
Error: {{ bannerUploadError }} Error: {{ bannerUploadError }}
<FAIcon <FAIcon
class="button-icon" icon="times" class="button-icon"
icon="times"
@click="clearUploadError('banner')" @click="clearUploadError('banner')"
/> />
</div> </div>
@ -245,7 +248,8 @@
<FAIcon <FAIcon
v-if="!isDefaultBackground" v-if="!isDefaultBackground"
:title="$t('settings.reset_profile_background')" :title="$t('settings.reset_profile_background')"
class="reset-button" icon="times" class="reset-button"
icon="times"
type="button" type="button"
@click="resetBackground" @click="resetBackground"
/> />

View file

@ -42,22 +42,26 @@
<FAIcon <FAIcon
fixed-width fixed-width
style="color: var(--cBlue)" style="color: var(--cBlue)"
class="button-icon" icon="reply" class="button-icon"
icon="reply"
/> />
<FAIcon <FAIcon
fixed-width fixed-width
style="color: var(--cGreen)" style="color: var(--cGreen)"
class="button-icon" icon="retweet" class="button-icon"
icon="retweet"
/> />
<FAIcon <FAIcon
fixed-width fixed-width
style="color: var(--cOrange)" style="color: var(--cOrange)"
class="button-icon" icon="star" class="button-icon"
icon="star"
/> />
<FAIcon <FAIcon
fixed-width fixed-width
style="color: var(--cRed)" style="color: var(--cRed)"
class="button-icon" icon="times" class="button-icon"
icon="times"
/> />
</div> </div>
</div> </div>

View file

@ -80,7 +80,10 @@
{{ style[0] || style.name }} {{ style[0] || style.name }}
</option> </option>
</select> </select>
<FAIcon class="select-down-icon" icon="chevron-down" /> <FAIcon
class="select-down-icon"
icon="chevron-down"
/>
</label> </label>
</div> </div>
</template> </template>
@ -907,7 +910,10 @@
{{ $t('settings.style.shadows.components.' + shadow) }} {{ $t('settings.style.shadows.components.' + shadow) }}
</option> </option>
</select> </select>
<FAIcon class="select-down-icon" icon="chevron-down" /> <FAIcon
class="select-down-icon"
icon="chevron-down"
/>
</label> </label>
</div> </div>
<div class="override"> <div class="override">

View file

@ -78,35 +78,50 @@
{{ $t('settings.style.shadows.shadow_id', { value: index }) }} {{ $t('settings.style.shadows.shadow_id', { value: index }) }}
</option> </option>
</select> </select>
<FAIcon icon="chevron-down" class="select-down-icon" /> <FAIcon
icon="chevron-down"
class="select-down-icon"
/>
</label> </label>
<button <button
class="btn btn-default" class="btn btn-default"
:disabled="!ready || !present" :disabled="!ready || !present"
@click="del" @click="del"
> >
<FAIcon fixed-width icon="times" /> <FAIcon
fixed-width
icon="times"
/>
</button> </button>
<button <button
class="btn btn-default" class="btn btn-default"
:disabled="!moveUpValid" :disabled="!moveUpValid"
@click="moveUp" @click="moveUp"
> >
<FAIcon fixed-width icon="chevron-up" /> <FAIcon
fixed-width
icon="chevron-up"
/>
</button> </button>
<button <button
class="btn btn-default" class="btn btn-default"
:disabled="!moveDnValid" :disabled="!moveDnValid"
@click="moveDn" @click="moveDn"
> >
<FAIcon fixed-width icon="chevron-down" /> <FAIcon
fixed-width
icon="chevron-down"
/>
</button> </button>
<button <button
class="btn btn-default" class="btn btn-default"
:disabled="usingFallback" :disabled="usingFallback"
@click="add" @click="add"
> >
<FAIcon fixed-width icon="plus" /> <FAIcon
fixed-width
icon="plus"
/>
</button> </button>
</div> </div>
<div <div

View file

@ -36,7 +36,12 @@
@click="toggleDrawer" @click="toggleDrawer"
> >
<router-link :to="{ name: 'login' }"> <router-link :to="{ name: 'login' }">
<FAIcon size="lg" fixed-width class="button-icon" icon="sign-in-alt" /> {{ $t("login.login") }} <FAIcon
size="lg"
fixed-width
class="button-icon"
icon="sign-in-alt"
/> {{ $t("login.login") }}
</router-link> </router-link>
</li> </li>
<li <li
@ -44,7 +49,12 @@
@click="toggleDrawer" @click="toggleDrawer"
> >
<router-link :to="{ name: timelinesRoute }"> <router-link :to="{ name: timelinesRoute }">
<FAIcon size="lg" fixed-width class="button-icon" icon="home" /> {{ $t("nav.timelines") }} <FAIcon
size="lg"
fixed-width
class="button-icon"
icon="home"
/> {{ $t("nav.timelines") }}
</router-link> </router-link>
</li> </li>
<li <li
@ -55,7 +65,12 @@
:to="{ name: 'chats', params: { username: currentUser.screen_name } }" :to="{ name: 'chats', params: { username: currentUser.screen_name } }"
style="position: relative" style="position: relative"
> >
<FAIcon size="lg" fixed-width class="button-icon" icon="comments" /> {{ $t("nav.chats") }} <FAIcon
size="lg"
fixed-width
class="button-icon"
icon="comments"
/> {{ $t("nav.chats") }}
<span <span
v-if="unreadChatCount" v-if="unreadChatCount"
class="badge badge-notification unread-chat-count" class="badge badge-notification unread-chat-count"
@ -68,7 +83,12 @@
<ul v-if="currentUser"> <ul v-if="currentUser">
<li @click="toggleDrawer"> <li @click="toggleDrawer">
<router-link :to="{ name: 'interactions', params: { username: currentUser.screen_name } }"> <router-link :to="{ name: 'interactions', params: { username: currentUser.screen_name } }">
<FAIcon size="lg" fixed-width class="button-icon" icon="bell" /> {{ $t("nav.interactions") }} <FAIcon
size="lg"
fixed-width
class="button-icon"
icon="bell"
/> {{ $t("nav.interactions") }}
</router-link> </router-link>
</li> </li>
<li <li
@ -76,7 +96,12 @@
@click="toggleDrawer" @click="toggleDrawer"
> >
<router-link to="/friend-requests"> <router-link to="/friend-requests">
<FAIcon size="lg" fixed-width class="button-icon" icon="user-plus" /> {{ $t("nav.friend_requests") }} <FAIcon
size="lg"
fixed-width
class="button-icon"
icon="user-plus"
/> {{ $t("nav.friend_requests") }}
<span <span
v-if="followRequestCount > 0" v-if="followRequestCount > 0"
class="badge follow-request-count" class="badge follow-request-count"
@ -90,7 +115,12 @@
@click="toggleDrawer" @click="toggleDrawer"
> >
<router-link :to="{ name: 'chat' }"> <router-link :to="{ name: 'chat' }">
<FAIcon size="lg" fixed-width class="button-icon" icon="bullhorn" /> {{ $t("shoutbox.title") }} <FAIcon
size="lg"
fixed-width
class="button-icon"
icon="bullhorn"
/> {{ $t("shoutbox.title") }}
</router-link> </router-link>
</li> </li>
</ul> </ul>
@ -100,7 +130,12 @@
@click="toggleDrawer" @click="toggleDrawer"
> >
<router-link :to="{ name: 'search' }"> <router-link :to="{ name: 'search' }">
<FAIcon size="lg" fixed-width class="button-icon" icon="search" /> {{ $t("nav.search") }} <FAIcon
size="lg"
fixed-width
class="button-icon"
icon="search"
/> {{ $t("nav.search") }}
</router-link> </router-link>
</li> </li>
<li <li
@ -108,7 +143,12 @@
@click="toggleDrawer" @click="toggleDrawer"
> >
<router-link :to="{ name: 'who-to-follow' }"> <router-link :to="{ name: 'who-to-follow' }">
<FAIcon size="lg" fixed-width class="button-icon" icon="user-plus" /> {{ $t("nav.who_to_follow") }} <FAIcon
size="lg"
fixed-width
class="button-icon"
icon="user-plus"
/> {{ $t("nav.who_to_follow") }}
</router-link> </router-link>
</li> </li>
<li @click="toggleDrawer"> <li @click="toggleDrawer">
@ -116,12 +156,22 @@
href="#" href="#"
@click="openSettingsModal" @click="openSettingsModal"
> >
<FAIcon size="lg" fixed-width class="button-icon" icon="cog" /> {{ $t("settings.settings") }} <FAIcon
size="lg"
fixed-width
class="button-icon"
icon="cog"
/> {{ $t("settings.settings") }}
</a> </a>
</li> </li>
<li @click="toggleDrawer"> <li @click="toggleDrawer">
<router-link :to="{ name: 'about'}"> <router-link :to="{ name: 'about'}">
<FAIcon size="lg" fixed-width class="button-icon" icon="info-circle" /> {{ $t("nav.about") }} <FAIcon
size="lg"
fixed-width
class="button-icon"
icon="info-circle"
/> {{ $t("nav.about") }}
</router-link> </router-link>
</li> </li>
<li <li
@ -132,7 +182,12 @@
href="/pleroma/admin/#/login-pleroma" href="/pleroma/admin/#/login-pleroma"
target="_blank" target="_blank"
> >
<FAIcon size="lg" fixed-width class="button-icon" icon="tachometer-alt" /> {{ $t("nav.administration") }} <FAIcon
size="lg"
fixed-width
class="button-icon"
icon="tachometer-alt"
/> {{ $t("nav.administration") }}
</a> </a>
</li> </li>
<li <li
@ -143,7 +198,12 @@
href="#" href="#"
@click="doLogout" @click="doLogout"
> >
<FAIcon size="lg" fixed-width class="button-icon" icon="sign-out-alt" /> {{ $t("login.logout") }} <FAIcon
size="lg"
fixed-width
class="button-icon"
icon="sign-out-alt"
/> {{ $t("login.logout") }}
</a> </a>
</li> </li>
</ul> </ul>

View file

@ -52,7 +52,11 @@
class="unmute button-icon" class="unmute button-icon"
@click.prevent="toggleMute" @click.prevent="toggleMute"
> >
<FAIcon icon="eye-slash" class="button-icon" size="lg" /> <FAIcon
icon="eye-slash"
class="button-icon"
size="lg"
/>
</a> </a>
</div> </div>
</template> </template>
@ -61,7 +65,10 @@
v-if="showPinned" v-if="showPinned"
class="pin" class="pin"
> >
<FAIcon icon="thumbtack" class="faint" /> <FAIcon
icon="thumbtack"
class="faint"
/>
<span class="faint">{{ $t('status.pinned') }}</span> <span class="faint">{{ $t('status.pinned') }}</span>
</div> </div>
<div <div
@ -178,7 +185,11 @@
class="visibility-icon" class="visibility-icon"
:title="status.visibility | capitalize" :title="status.visibility | capitalize"
> >
<FAIcon class="button-icon" :icon="visibilityIcon(status.visibility)" size="lg" /> <FAIcon
class="button-icon"
:icon="visibilityIcon(status.visibility)"
size="lg"
/>
</span> </span>
<a <a
v-if="!status.is_local && !isPreview" v-if="!status.is_local && !isPreview"
@ -187,7 +198,11 @@
class="source_url" class="source_url"
title="Source" title="Source"
> >
<FAIcon class="button-icon" icon="external-link-square-alt" size="lg" /> <FAIcon
class="button-icon"
icon="external-link-square-alt"
size="lg"
/>
</a> </a>
<a <a
v-if="expandable && !isPreview" v-if="expandable && !isPreview"
@ -195,14 +210,22 @@
title="Expand" title="Expand"
@click.prevent="toggleExpanded" @click.prevent="toggleExpanded"
> >
<FAIcon class="button-icon" icon="plus-square" size="lg" /> <FAIcon
class="button-icon"
icon="plus-square"
size="lg"
/>
</a> </a>
<a <a
v-if="unmuted" v-if="unmuted"
href="#" href="#"
@click.prevent="toggleMute" @click.prevent="toggleMute"
> >
<FAIcon icon="eye-slash" class="button-icon" size="lg" /> <FAIcon
icon="eye-slash"
class="button-icon"
size="lg"
/>
</a> </a>
</span> </span>
</div> </div>
@ -358,7 +381,6 @@
@onSuccess="clearError" @onSuccess="clearError"
/> />
</div> </div>
</div> </div>
</div> </div>
<div <div

View file

@ -27,7 +27,11 @@
v-else v-else
class="status-preview-no-content" class="status-preview-no-content"
> >
<FAIcon icon="circle-notch" spin size="2x"/> <FAIcon
icon="circle-notch"
spin
size="2x"
/>
</div> </div>
</div> </div>
</Popover> </Popover>

View file

@ -92,7 +92,11 @@
v-else v-else
class="new-status-notification text-center panel-footer" class="new-status-notification text-center panel-footer"
> >
<FAIcon icon="circle-notch" spin size="lg"/> <FAIcon
icon="circle-notch"
spin
size="lg"
/>
</div> </div>
</div> </div>
</div> </div>

View file

@ -16,27 +16,52 @@
<ul> <ul>
<li v-if="currentUser"> <li v-if="currentUser">
<router-link :to="{ name: 'friends' }"> <router-link :to="{ name: 'friends' }">
<FAIcon fixed-width size="lg" class="button-icon " icon="home" />{{ $t("nav.timeline") }} <FAIcon
fixed-width
size="lg"
class="button-icon "
icon="home"
/>{{ $t("nav.timeline") }}
</router-link> </router-link>
</li> </li>
<li v-if="currentUser"> <li v-if="currentUser">
<router-link :to="{ name: 'bookmarks'}"> <router-link :to="{ name: 'bookmarks'}">
<FAIcon fixed-width size="lg" class="button-icon " icon="bookmark" />{{ $t("nav.bookmarks") }} <FAIcon
fixed-width
size="lg"
class="button-icon "
icon="bookmark"
/>{{ $t("nav.bookmarks") }}
</router-link> </router-link>
</li> </li>
<li v-if="currentUser"> <li v-if="currentUser">
<router-link :to="{ name: 'dms', params: { username: currentUser.screen_name } }"> <router-link :to="{ name: 'dms', params: { username: currentUser.screen_name } }">
<FAIcon fixed-width size="lg" class="button-icon " icon="envelope" />{{ $t("nav.dms") }} <FAIcon
fixed-width
size="lg"
class="button-icon "
icon="envelope"
/>{{ $t("nav.dms") }}
</router-link> </router-link>
</li> </li>
<li v-if="currentUser || !privateMode"> <li v-if="currentUser || !privateMode">
<router-link :to="{ name: 'public-timeline' }"> <router-link :to="{ name: 'public-timeline' }">
<FAIcon fixed-width size="lg" class="button-icon " icon="users" />{{ $t("nav.public_tl") }} <FAIcon
fixed-width
size="lg"
class="button-icon "
icon="users"
/>{{ $t("nav.public_tl") }}
</router-link> </router-link>
</li> </li>
<li v-if="federating && (currentUser || !privateMode)"> <li v-if="federating && (currentUser || !privateMode)">
<router-link :to="{ name: 'public-external-timeline' }"> <router-link :to="{ name: 'public-external-timeline' }">
<FAIcon fixed-width size="lg" class="button-icon " icon="globe" />{{ $t("nav.twkn") }} <FAIcon
fixed-width
size="lg"
class="button-icon "
icon="globe"
/>{{ $t("nav.twkn") }}
</router-link> </router-link>
</li> </li>
</ul> </ul>
@ -46,7 +71,10 @@
class="title timeline-menu-title" class="title timeline-menu-title"
> >
<span>{{ timelineName() }}</span> <span>{{ timelineName() }}</span>
<FAIcon size="sm" icon="chevron-down" /> <FAIcon
size="sm"
icon="chevron-down"
/>
</div> </div>
</Popover> </Popover>
</template> </template>

View file

@ -21,7 +21,11 @@
:user="user" :user="user"
/> />
<div class="user-info-avatar-link-overlay"> <div class="user-info-avatar-link-overlay">
<FAIcon class="button-icon" icon="search-plus" size="lg" /> <FAIcon
class="button-icon"
icon="search-plus"
size="lg"
/>
</div> </div>
</a> </a>
<router-link <router-link
@ -56,7 +60,10 @@
target="_blank" target="_blank"
class="external-link-button" class="external-link-button"
> >
<FAIcon class="icon" icon="external-link-alt" /> <FAIcon
class="icon"
icon="external-link-alt"
/>
</a> </a>
<AccountActions <AccountActions
v-if="isOtherUser && loggedIn" v-if="isOtherUser && loggedIn"
@ -87,7 +94,11 @@
</span> </span>
</template> </template>
<span v-if="user.locked"> <span v-if="user.locked">
<FAIcon class="lock-icon" icon="lock" size="sm"/> <FAIcon
class="lock-icon"
icon="lock"
size="sm"
/>
</span> </span>
<span <span
v-if="!mergedConfig.hideUserStats && !hideBio" v-if="!mergedConfig.hideUserStats && !hideBio"
@ -136,7 +147,10 @@
<option value="striped">Striped bg</option> <option value="striped">Striped bg</option>
<option value="side">Side stripe</option> <option value="side">Side stripe</option>
</select> </select>
<FAIcon class="select-down-icon" icon="chevron-down" /> <FAIcon
class="select-down-icon"
icon="chevron-down"
/>
</label> </label>
</div> </div>
</div> </div>
@ -162,8 +176,15 @@
:title="$t('user_card.unsubscribe')" :title="$t('user_card.unsubscribe')"
> >
<FALayers> <FALayers>
<FAIcon icon="rss" transform="left-5 shrink-6 up-3 rotate-20" flip="horizontal"/> <FAIcon
<FAIcon icon="rss" transform="right-5 shrink-6 up-3 rotate-20"/> icon="rss"
transform="left-5 shrink-6 up-3 rotate-20"
flip="horizontal"
/>
<FAIcon
icon="rss"
transform="right-5 shrink-6 up-3 rotate-20"
/>
<FAIcon icon="bell" /> <FAIcon icon="bell" />
</FALayers> </FALayers>
</ProgressButton> </ProgressButton>

View file

@ -31,7 +31,11 @@
</div> </div>
</div> </div>
<div v-else> <div v-else>
<FAIcon icon="circle-notch" spin size="3x"/> <FAIcon
icon="circle-notch"
spin
size="3x"
/>
</div> </div>
</div> </div>
</Popover> </Popover>