From 4e44af04b7d82ac4c1e27877f98a3490a5f3ea8a Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Fri, 13 Mar 2026 11:16:45 +0200
Subject: [PATCH] fix pleroma-tan being stabbed by panel-footer

---
 .../update_notification.scss                  | 33 +++++++++++--
 .../update_notification.vue                   | 48 +++++++++----------
 src/i18n/en.json                              |  6 ++-
 3 files changed, 58 insertions(+), 29 deletions(-)

diff --git a/src/components/update_notification/update_notification.scss b/src/components/update_notification/update_notification.scss
index 23ca3ba2e..3c154eb33 100644
--- a/src/components/update_notification/update_notification.scss
+++ b/src/components/update_notification/update_notification.scss
@@ -6,6 +6,7 @@
   --__top-fringe: 15em; // how much pleroma-tan should stick her head above
   --__bottom-fringe: 80em; // just reserving as much as we can, number is mostly irrelevant
   --__right-fringe: 8em;
+  --__panel-background: rgb(0,255,255 / 80%);
 
   font-size: 15px;
   position: relative;
@@ -18,6 +19,29 @@
     padding-left: 1em;
   }
 
+  .footer-buttons {
+    --panel-heading-height-padding: calc(var(--panel-header-height) * 0.2);
+    --__panel-heading-gap: calc(var(--panel-header-height) * 0.1565);
+    --__panel-heading-height: var(--panel-header-height);
+    --__panel-heading-height-inner: calc(var(--__panel-heading-height) - 2 * var(--panel-heading-height-padding, 0));
+
+    box-sizing: border-box;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    display: grid;
+    z-index: 20;
+    grid-auto-flow: column;
+    grid-template-columns: auto;
+    grid-auto-columns: auto;
+    grid-column-gap: var(--__panel-heading-gap);
+    padding: var(--panel-heading-height-padding);
+    height: var(--__panel-heading-height);
+    line-height: var(--__panel-heading-height-inner);
+    font-size: calc(var(--panelHeaderSize) / 3.2);
+  }
+
   @media all and (width <= 800px) {
     /* For mobile, the modal takes 100% of the available screen.
        This ensures the minimized modal is always 50px above the browser
@@ -50,10 +74,13 @@
   }
 
   .panel-footer {
-    z-index: 22;
+    z-index: 10;
     position: relative;
     border-width: 0;
-    grid-template-columns: auto;
+
+    .button-default {
+      z-index: 2;
+    }
   }
 
   .pleroma-tan {
@@ -76,7 +103,7 @@
   }
 
   .spacer-bottom {
-    min-height: var(--__bottom-fringe);
+    min-height: calc(var(--__bottom-fringe) + var(--panel-header-height));
   }
 
   .extra-info-group {
diff --git a/src/components/update_notification/update_notification.vue b/src/components/update_notification/update_notification.vue
index 8b2691c35..56976f016 100644
--- a/src/components/update_notification/update_notification.vue
+++ b/src/components/update_notification/update_notification.vue
@@ -35,14 +35,14 @@
             >
               <i18n-t
                 scope="global"
-                keypath="update.update_bugs"
+                keypath="update.update_bugs2"
                 tag="p"
               >
-                <template #pleromaGitlab>
+                <template #pleromaForgejo>
                   <a
                     target="_blank"
                     href="https://git.pleroma.social/"
-                  >{{ $t('update.update_bugs_gitlab') }}</a>
+                  >{{ $t('update.update_bugs_forgejo') }}</a>
                 </template>
               </i18n-t>
               <i18n-t
@@ -73,30 +73,30 @@
               </p>
             </div>
           </div>
+          <div class="footer-buttons">
+            <button
+              class="button-default"
+              @click.prevent="neverShowAgain"
+            >
+              {{ $t("general.never_show_again") }}
+            </button>
+            <button
+              v-if="!showingMore"
+              class="button-default"
+              @click.prevent="toggleShow"
+            >
+              {{ $t("general.show_more") }}
+            </button>
+            <button
+              class="button-default"
+              @click.prevent="dismiss"
+            >
+              {{ $t("general.dismiss") }}
+            </button>
+          </div>
           <div class="spacer-bottom" />
         </div>
       </div>
-      <div class="panel-footer">
-        <button
-          class="button-default"
-          @click.prevent="neverShowAgain"
-        >
-          {{ $t("general.never_show_again") }}
-        </button>
-        <button
-          v-if="!showingMore"
-          class="button-default"
-          @click.prevent="toggleShow"
-        >
-          {{ $t("general.show_more") }}
-        </button>
-        <button
-          class="button-default"
-          @click.prevent="dismiss"
-        >
-          {{ $t("general.dismiss") }}
-        </button>
-      </div>
     </div>
   </Modal>
 </template>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 6e15c5f65..70c099932 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -1857,9 +1857,11 @@
   "update": {
     "big_update_title": "Please bear with us",
     "big_update_content": "We haven't had a release in a while, so things might look and feel different than what you're used to.",
-    "big_update_content2": "We implemented synchronized settings! This means (nearly) all your settings are now properly synchronized between devices and sessions. We try to migrate settings from old config but migration is performed only once, so some settings might be incorrect. Let us know if you don't want certain setting synchronized.",
-    "update_bugs": "Please report any issues and bugs on {pleromaGitlab}, as we have changed a lot, and although we test thoroughly and use development versions ourselves, we may have missed some things. We welcome your feedback and suggestions on issues you might encounter, or how to improve Pleroma and Pleroma-FE.",
+    "big_update_content2": "We implemented synchronized settings! This means (nearly) all your settings are now properly synchronized between devices and sessions. We try to migrate settings from old config but migration is performed only once, so some settings might be incorrect.",
+    "update_bugs": "Please report any issues and bugs on {pleromaForgejo}, as we have changed a lot, and although we test thoroughly and use development versions ourselves, we may have missed some things. We welcome your feedback and suggestions on issues you might encounter, or how to improve Pleroma and Pleroma-FE.",
+    "update_bugs2": "Let us know if you don't want certain setting synchronized on {pleromaForgejo}.",
     "update_bugs_gitlab": "Pleroma GitLab",
+    "update_bugs_forgejo": "Pleroma Forgejo",
     "update_changelog": "For more details on what's changed, see {theFullChangelog}.",
     "update_changelog_here": "the full changelog",
     "art_by": "Art by {linkToArtist}"