src/components/about/about.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="column-inner">
-    <!--<instance-specific-panel v-if="showInstanceSpecificPanel" />-->
+    <instance-specific-panel v-if="showInstanceSpecificPanel" />
     <staff-panel />
     <terms-of-service-panel />
     <LocalBubblePanel v-if="showLocalBubblePanel" />

src/components/emoji_input/emoji_input.vue

@@ -88,10 +88,9 @@
     }
   }
   .emoji-picker-panel {
-    position: relative;
+    position: absolute;
     z-index: 20;
     margin-top: 2px;
-    top: 0px !important;
 
     &.hide {
       display: none

src/components/emoji_picker/emoji_picker.scss

@@ -56,11 +56,7 @@
 
   .heading {
     margin-top: 10px;
-    height: 5.8em;
-  }
-
-  .emoji-header {
-    margin-left: 5px;
+    height: 4.8em;
   }
 
   .content {

src/components/emoji_picker/emoji_picker.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="emoji-picker panel panel-default panel-body">
     <div class="heading">
-      <span class="emoji-header">Emoji Packs</span>
       <span
         class="emoji-tabs"
         @wheel="onWheel"

src/components/media_modal/media_modal.vue

@@ -188,21 +188,9 @@ $modal-view-button-icon-margin: 0.5em;
     overflow-y: auto;
     min-height: 1em;
     max-width: 500px;
+    max-height: 9.5em;
     word-break: break-word;
     white-space: pre-line;
-    background: rgba(0,0,0,0.6);
-    padding: 10px;
-    border-radius: 10px;
-    transition: 0.5s;
-
-    &:not(:hover) {
-      max-height: 1em;
-    }
-
-    &:hover {
-      max-height: 9.5em;
-      transition: 1s;
-    }
   }
 
   .modal-image {

src/components/mention_link/mention_link.scss

@@ -15,15 +15,11 @@
 
   .mention-avatar {
     border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
-    width: 2em;
-    height: 2em;
+    width: 1.5em;
+    height: 1.5em;
     vertical-align: middle;
     user-select: none;
     margin-right: 0.2em;
-
-    .still-image.avatar {
-      border-radius: 14px;
-    }
   }
 
   .full {
@@ -117,11 +113,3 @@
     color: var(--faint, $fallback--faint);
   }
 }
-
-.reply-glued-label {
-
-  .mention-avatar {
-    width: 1.4em;
-    height: 1.4em;
-  }
-}

src/components/mrf_transparency_panel/mrf_transparency_panel.vue

@@ -76,7 +76,7 @@
             </table>
           </div>
 
-          <!--<div v-if="quarantineInstances.length">
+          <div v-if="quarantineInstances.length">
             <h4>{{ $t("about.mrf.simple.quarantine") }}</h4>
 
             <p>{{ $t("about.mrf.simple.quarantine_desc") }}</p>
@@ -99,7 +99,7 @@
                 </td>
               </tr>
             </table>
-          </div>-->
+          </div>
 
           <div v-if="ftlRemovalInstances.length">
             <h4>{{ $t("about.mrf.simple.ftl_removal") }}</h4>
@@ -176,7 +176,7 @@
             </table>
           </div>
 
-          <!--<h2 v-if="hasKeywordPolicies">
+          <h2 v-if="hasKeywordPolicies">
             {{ $t("about.mrf.keyword.keyword_policies") }}
           </h2>
 
@@ -217,7 +217,7 @@
                 {{ keyword.replacement }}
               </li>
             </ul>
-          </div>-->
+          </div>
         </div>
       </div>
     </div>

src/components/quote_card/quote_card.vue

@@ -64,11 +64,11 @@
 
   color: $fallback--text;
   color: var(--text, $fallback--text);
-  border-style: dashed;
+  border-style: solid;
   border-width: 1px;
   border-radius: $fallback--attachmentRadius;
   border-radius: var(--attachmentRadius, $fallback--attachmentRadius);
-  border-color: $fallback--cBlue;
-  border-color: var(--cBlue, $fallback--cBlue);
+  border-color: $fallback--border;
+  border-color: var(--border, $fallback--border);
 }
 </style>

src/components/rich_content/rich_content.scss

@@ -49,7 +49,7 @@
   }
 
   .emoji {
-    display: inline-flex;
+    display: inline-block;
     width: var(--emoji-size, 32px);
     height: var(--emoji-size, 32px);
   }

src/components/settings_modal/tabs/version_tab.js

@@ -1,6 +1,6 @@
 import { extractCommit } from 'src/services/version/version.service'
 
-const pleromaFeCommitUrl = 'https://akkoma.dev/eris/pleroma-fe/commit/'
+const pleromaFeCommitUrl = 'https://akkoma.dev/AkkomaGang/pleroma-fe/commit/'
 const pleromaBeCommitUrl = 'https://akkoma.dev/AkkomaGang/akkoma/commit/'
 
 const VersionTab = {

src/components/staff_panel/staff_panel.vue

@@ -12,7 +12,7 @@
           :key="group.role"
           class="staff-group"
         >
-          <h4>The Admin Team</h4>
+          <h4>{{ $t('general.role.' + group.role) }}</h4>
           <basic-user-card
             v-for="user in group.users"
             :key="user.screen_name"
@@ -30,21 +30,10 @@
 
 .staff-group {
   padding-left: 1em;
-  padding-top: 0.2em;
-  padding-bottom: 2px;
+  padding-top: 1em;
 
   .basic-user-card {
-    padding: 0.6em 0.4em;
     padding-left: 0;
-    display: inline-block;
-  }
-
-  .basic-user-card-collapsed-content {
-    display: none;
-  }
-
-  .still-image {
-    border-radius: 15px;
   }
 }
 

src/components/still-image/still-image.vue

@@ -93,9 +93,4 @@
     }
   }
 }
-.still-image.emoji {
-  img {
-    height: unset;
-  }
-}
 </style>

src/components/user_profile/user_profile.vue

@@ -90,7 +90,6 @@
           :user-id="userId"
           :in-profile="true"
           :footer-slipgate="footerRef"
-          :disabled="!currentUser"
         />
         <div
           v-if="followsTabVisible"
@@ -129,7 +128,6 @@
           :user-id="userId"
           :in-profile="true"
           :footer-slipgate="footerRef"
-          :disabled="!currentUser"
         />
         <Timeline
           v-if="isUs"

src/modules/config.js

@@ -98,7 +98,7 @@ export const defaultState = {
   useAtIcon: undefined, // instance default
   mentionLinkDisplay: undefined, // instance default
   mentionLinkShowTooltip: undefined, // instance default
-  mentionLinkShowAvatar: true, // instance default
+  mentionLinkShowAvatar: undefined, // instance default
   mentionLinkFadeDomain: undefined, // instance default
   mentionLinkShowYous: undefined, // instance default
   mentionLinkBoldenYou: undefined, // instance default