Merge branch 'froth' of git.froth.zone:Sam/pleroma-fe into froth

nu-8777
Not Sam 8 months ago
commit cb738d9e11
Signed by untrusted user: NotSam
GPG Key ID: 4D8B07C18F31ACBD

@ -15,8 +15,12 @@
class="app-layout container"
:class="classes"
>
<div class="underlay"/>
<div id="sidebar" class="column -scrollable" :class="{ '-show-scrollbar': showScrollbars }">
<div class="underlay" />
<div
id="sidebar"
class="column -scrollable"
:class="{ '-show-scrollbar': showScrollbars }"
>
<user-panel />
<template v-if="layoutType !== 'mobile'">
<nav-panel />
@ -26,7 +30,11 @@
<div id="notifs-sidebar" />
</template>
</div>
<div id="main-scroller" class="column main" :class="{ '-full-height': isChats }">
<div
id="main-scroller"
class="column main"
:class="{ '-full-height': isChats }"
>
<div
v-if="!currentUser"
class="login-hint panel panel-default"
@ -40,7 +48,11 @@
</div>
<router-view />
</div>
<div id="notifs-column" class="column -scrollable" :class="{ '-show-scrollbar': showScrollbars }"/>
<div
id="notifs-column"
class="column -scrollable"
:class="{ '-show-scrollbar': showScrollbars }"
/>
</div>
<media-modal />
<shout-panel

@ -4,8 +4,8 @@
:title="title"
>
<router-link
class="avatar-container"
v-if="withAvatar && user"
class="avatar-container"
:to="getUserProfileLink(user)"
>
<UserAvatar

@ -67,11 +67,10 @@
</a>
</div>
<div
class="mobile-notifications"
id="mobile-notifications"
class="mobile-notifications"
@scroll="onScroll"
>
</div>
/>
</div>
<SideDrawer
ref="sideDrawer"

@ -1,5 +1,8 @@
<template>
<teleport :disabled="minimalMode || disableTeleport" :to="teleportTarget">
<teleport
:disabled="minimalMode || disableTeleport"
:to="teleportTarget"
>
<div
:class="{ minimal: minimalMode }"
class="Notifications"

@ -1,7 +1,7 @@
import { extractCommit } from 'src/services/version/version.service'
const pleromaFeCommitUrl = 'https://git.froth.zone/Sam/pleroma-fe/commit/'
const pleromaBeCommitUrl = 'https://git.froth.zone/Sam/pleroma/commit/'
const pleromaFeCommitUrl = 'https://git.froth.zone/sam/pleroma-fe/commit/'
const pleromaBeCommitUrl = 'https://git.froth.zone/sam/pleroma/commit/'
const VersionTab = {
data () {

@ -46,7 +46,10 @@
</div>
</div>
<div :class="classes.footer">
<teleport :to="footerSlipgate" :disabled="!embedded || !footerSlipgate">
<teleport
:to="footerSlipgate"
:disabled="!embedded || !footerSlipgate"
>
<div
v-if="count===0"
class="new-status-notification text-center faint"

@ -56,7 +56,7 @@
:user-id="userId"
:pinned-status-ids="user.pinnedStatusIds"
:in-profile="true"
:footerSlipgate="footerRef"
:footer-slipgate="footerRef"
/>
<div
v-if="followsTabVisible"
@ -95,7 +95,7 @@
:timeline="media"
:user-id="userId"
:in-profile="true"
:footerSlipgate="footerRef"
:footer-slipgate="footerRef"
/>
<Timeline
v-if="isUs"
@ -107,10 +107,13 @@
timeline-name="favorites"
:timeline="favorites"
:in-profile="true"
:footerSlipgate="footerRef"
:footer-slipgate="footerRef"
/>
</tab-switcher>
<div class="panel-footer" :ref="setFooterRef"></div>
<div
:ref="setFooterRef"
class="panel-footer"
/>
</div>
<div
v-else

Loading…
Cancel
Save