Merge remote-tracking branch 'upstream/develop' into bnakkoma

Merge pull request 'fix panel z-index conflicting with heading popover' (#422 ) from tea/akkoma-fe:fix/panel-z-index into develop
Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma-fe/pulls/422
2024-10-29 05:07:32 +09:00 · 2024-10-26 03:42:48 +00:00 · 2024-10-26 03:42:23 +00:00 · 2024-10-26 03:41:15 +00:00 · 2024-10-25 10:02:56 +09:00 · 2024-10-25 09:47:21 +09:00
7 changed files with 10 additions and 10 deletions
--- a/src/components/mfa_form/totp_form.vue
+++ b/src/components/mfa_form/totp_form.vue
@ -18,6 +18,7 @@
          <input
            id="code"
            v-model="code"
+            autocomplete="one-time-code"
            class="form-control"
          >
        </div>
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@ -69,7 +69,7 @@ const SettingsModal = {
      this.$store.dispatch('closeSettingsModal')
    },
    logout () {
-      this.$router.replace('/main/public')
+      this.$router.replace(this.$store.state.instance.redirectRootNoLogin || '/main/all')
      this.$store.dispatch('closeSettingsModal')
      this.$store.dispatch('logout')
    },
--- a/src/components/settings_modal/tabs/theme_tab/preview.vue
+++ b/src/components/settings_modal/tabs/theme_tab/preview.vue
@ -21,9 +21,11 @@
      </div>
      <div class="panel-body theme-preview-content">
        <div class="post">
-          <div class="avatar still-image">
+          <div class="Avatar post-avatar">
+            <div class="still-image avatar -better-shadow">
              ( ͡° ͜ʖ ͡°)
            </div>
+          </div>
          <div class="content">
            <h4>
              {{ $t('settings.style.preview.content') }}
--- a/src/panel.scss
+++ b/src/panel.scss
@ -18,7 +18,6 @@
    bottom: 0;
    left: 0;
    right: 0;
-    z-index: 5;
    box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.6);
    box-shadow: var(--panelShadow);
    pointer-events: none;
@ -60,7 +59,6 @@
  padding: 0.6em;
  height: var(--__panel-heading-height);
  line-height: var(--__panel-heading-height-inner);
-  z-index: 4;

  &.-flexible-height {
    --__panel-heading-height: auto;
@ -131,8 +129,7 @@
  color: var(--panelText);
  background-color: $fallback--bg;
  background-color: var(--bg, $fallback--bg);
-  // hotfix for misplaced timeline menu/filter popover layer
-  z-index: 5;
+  z-index: 4;

  &::after {
    background-color: $fallback--fg;
--- a/static/config.json
+++ b/static/config.json
@ -21,6 +21,6 @@
  "showInstanceSpecificPanel": false,
  "sidebarRight": false,
  "subjectLineBehavior": "email",
-  "theme": "itepechi",
+  "theme": "bnakkoma",
  "webPushNotifications": false
 }
--- a/static/styles.json
+++ b/static/styles.json
@ -7,5 +7,5 @@
  "ir-black": [ "Ir Black", "#000000", "#242422", "#b5b3aa", "#ff6c60", "#FF6C60", "#A8FF60", "#96CBFE", "#FFFFB6" ],
  "monokai": [ "Monokai", "#272822", "#383830", "#f8f8f2", "#f92672", "#F92672", "#a6e22e", "#66d9ef", "#f4bf75" ],

-  "itepechi": "/static/themes/itepechi.json"
+  "bnakkoma": "/static/themes/bnakkoma.json"
 }
--- a/static/themes/bnakkoma.json
+++ b/static/themes/bnakkoma.json
@ -1,6 +1,6 @@
 {
  "_pleroma_theme_version": 2,
-  "name": "Itepechi",
+  "name": "BNAkkoma",
  "source": {
    "themeEngineVersion": 3,
    "fonts": {},
Author	SHA1	Message	Date
itepechi	aa5f347ce1	Merge remote-tracking branch 'upstream/develop' into bnakkoma	2024-10-29 05:07:32 +09:00
floatingghost	4a50b1273d	Merge pull request 'fix panel z-index conflicting with heading popover' (#422 ) from tea/akkoma-fe:fix/panel-z-index into develop Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma-fe/pulls/422	2024-10-26 03:42:48 +00:00
floatingghost	c76dc6d79e	Merge pull request 'Fix redirect on logout' (#420 ) from Oneric/akkoma-fe:logout-redirect into develop Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma-fe/pulls/420	2024-10-26 03:42:23 +00:00
floatingghost	cb4c581cde	Merge pull request 'Add proper autocomplete prop for TOTP login field' (#424 ) from tudbut/akkoma-fe:develop into develop Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma-fe/pulls/424	2024-10-26 03:41:15 +00:00
itepechi	00ab4aae3b	Fix avatar rendering in theme preview	2024-10-25 10:02:56 +09:00
itepechi	f198cbcc39	Rename the default theme to BNAkkoma	2024-10-25 09:47:21 +09:00
TudbuT	8231c8f0b6	add proper autocomplete prop for TOTP login field	2024-10-19 19:19:15 +02:00
tea	35cf3327c8	fix panel z-index conflicting with heading popover resolves #342	2024-10-05 10:59:46 +02:00
Oneric	1ae09458c6	Fix redirect on logout An instance may restrict access to the public timeline (among others) to authenticated users and there already is a setting to decide which page to show authenticated and unauthenticated viewers by default each. However, the logout redirect didn't honour this setting leading to potentially broken pages and errors on logout	2024-09-28 17:47:28 +02:00