From a46c02ecf5298a60b2f39d4bc2bf0a2630e04fbc Mon Sep 17 00:00:00 2001
From: Sam Therapy <sam@samtherapy.net>
Date: Fri, 19 Nov 2021 16:31:08 -0600
Subject: [PATCH] add neko's changes

---
 src/App.js                                         | 5 +++++
 src/App.vue                                        | 2 +-
 src/components/attachment/attachment.vue           | 2 +-
 src/components/desktop_nav/desktop_nav.js          | 7 ++++++-
 src/components/desktop_nav/desktop_nav.vue         | 5 ++++-
 src/components/nav_panel/nav_panel.vue             | 4 +---
 src/components/settings_modal/tabs/general_tab.vue | 5 +++++
 src/components/status_content/status_content.vue   | 2 +-
 src/i18n/en.json                                   | 1 +
 src/modules/config.js                              | 1 +
 10 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/App.js b/src/App.js
index 3e09ed4c..7efb1f91 100644
--- a/src/App.js
+++ b/src/App.js
@@ -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
diff --git a/src/App.vue b/src/App.vue
index 6955a4bc..9c6ae909 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -12,7 +12,7 @@
     <div class="app-bg-wrapper app-container-wrapper" />
     <div
       id="content"
-      :style="thirdColumnLayout"
+      :style="[thirdColumnLayout, fullscreenView]"
       class="container underlay"
     >
       <div
diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index f80badfd..6a272316 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -189,7 +189,7 @@
       flex-grow: 0;
     }
     .video {
-      height: 260px;
+      //height: 260px;
       display: flex;
     }
     video {
diff --git a/src/components/desktop_nav/desktop_nav.js b/src/components/desktop_nav/desktop_nav.js
index e048f53d..2f05248c 100644
--- a/src/components/desktop_nav/desktop_nav.js
+++ b/src/components/desktop_nav/desktop_nav.js
@@ -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 () {
diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue
index 762aa610..98e91af2 100644
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@@ -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"
diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index e59036a3..bf3ed012 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -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);
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 18f2629d..ca78a07a 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -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') }}
diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index 2dbda64a..464ce365 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -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;
 
diff --git a/src/i18n/en.json b/src/i18n/en.json
index b1fede70..bea665bb 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -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",
diff --git a/src/modules/config.js b/src/modules/config.js
index 6bfd6fc6..c5bfc2bf 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -38,6 +38,7 @@ export const defaultState = {
   preloadImage: true,
   loopVideo: true,
   loopVideoSilentOnly: true,
+  fullscreenView: false,
   streaming: false,
   emojiReactionsOnTimeline: true,
   alwaysShowNewPostButton: false,