add neko's changes
This commit is contained in:
parent
d02fb77e07
commit
a46c02ecf5
10 changed files with 26 additions and 8 deletions
|
@ -89,6 +89,11 @@ export default {
|
|||
'order': this.$store.getters.mergedConfig.sidebarRight ? 99 : 0
|
||||
}
|
||||
},
|
||||
fullscreenView () {
|
||||
return {
|
||||
'max-width': this.$store.getters.mergedConfig.fullscreenView ? 'initial' : null
|
||||
}
|
||||
},
|
||||
thirdColumnAlign () {
|
||||
return {
|
||||
'order': this.$store.getters.mergedConfig.sidebarRight ? 0 : 99
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
<div class="app-bg-wrapper app-container-wrapper" />
|
||||
<div
|
||||
id="content"
|
||||
:style="thirdColumnLayout"
|
||||
:style="[thirdColumnLayout, fullscreenView]"
|
||||
class="container underlay"
|
||||
>
|
||||
<div
|
||||
|
|
|
@ -189,7 +189,7 @@
|
|||
flex-grow: 0;
|
||||
}
|
||||
.video {
|
||||
height: 260px;
|
||||
//height: 260px;
|
||||
display: flex;
|
||||
}
|
||||
video {
|
||||
|
|
|
@ -69,7 +69,12 @@ 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 },
|
||||
fullscreenView () {
|
||||
return {
|
||||
'max-width': this.$store.getters.mergedConfig.fullscreenView ? 'initial' : null
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
scrollToTop () {
|
||||
|
|
|
@ -5,7 +5,10 @@
|
|||
:class="{ '-logoLeft': logoLeft }"
|
||||
@click="scrollToTop()"
|
||||
>
|
||||
<div class="inner-nav">
|
||||
<div
|
||||
class="inner-nav"
|
||||
:style="fullscreenView"
|
||||
>
|
||||
<div class="item sitename">
|
||||
<router-link
|
||||
v-if="!hideSitename"
|
||||
|
|
|
@ -139,9 +139,7 @@
|
|||
.menu-item {
|
||||
display: block;
|
||||
box-sizing: border-box;
|
||||
height: 3.5em;
|
||||
line-height: 3.5em;
|
||||
padding: 0 1em;
|
||||
padding: .5em 1em;
|
||||
width: 100%;
|
||||
color: $fallback--link;
|
||||
color: var(--link, $fallback--link);
|
||||
|
|
|
@ -21,6 +21,11 @@
|
|||
{{ $t('settings.show_third_column') }}
|
||||
</BooleanSetting>
|
||||
</li>
|
||||
<li>
|
||||
<BooleanSetting path="fullscreenView">
|
||||
{{ $t('settings.fullscreenView') }}
|
||||
</BooleanSetting>
|
||||
</li>
|
||||
<li v-if="instanceWallpaperUsed">
|
||||
<BooleanSetting path="hideInstanceWallpaper">
|
||||
{{ $t('settings.hide_wallpaper') }}
|
||||
|
|
|
@ -119,7 +119,7 @@ $status-margin: 0.75em;
|
|||
|
||||
img, video {
|
||||
max-width: 100%;
|
||||
max-height: 400px;
|
||||
// max-height: 400px;
|
||||
vertical-align: middle;
|
||||
object-fit: contain;
|
||||
|
||||
|
|
|
@ -374,6 +374,7 @@
|
|||
"instance_default": "(default: {value})",
|
||||
"instance_default_simple": "(default)",
|
||||
"interface": "Interface",
|
||||
"fullscreenView": "Fullscreen view",
|
||||
"interfaceLanguage": "Interface language",
|
||||
"invalid_theme_imported": "The selected file is not a supported Pleroma theme. No changes to your theme were made.",
|
||||
"limited_availability": "Unavailable in your browser",
|
||||
|
|
|
@ -38,6 +38,7 @@ export const defaultState = {
|
|||
preloadImage: true,
|
||||
loopVideo: true,
|
||||
loopVideoSilentOnly: true,
|
||||
fullscreenView: false,
|
||||
streaming: false,
|
||||
emojiReactionsOnTimeline: true,
|
||||
alwaysShowNewPostButton: false,
|
||||
|
|
Loading…
Reference in a new issue