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

This commit is contained in:
itepechi 2024-10-29 05:07:32 +09:00
commit aa5f347ce1
Signed by: itepechi
GPG key ID: D948CE1B5ACD0B25
3 changed files with 3 additions and 5 deletions

View file

@ -18,6 +18,7 @@
<input
id="code"
v-model="code"
autocomplete="one-time-code"
class="form-control"
>
</div>

View file

@ -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')
},

View file

@ -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;