Compare commits

..

No commits in common. "aa5f347ce1396dc7c7e5affc2f8b4be879ed1ca9" and "5d22d8da4983c75bb8e11b6aaa1b2fac58d77e11" have entirely different histories.

7 changed files with 10 additions and 10 deletions

View file

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

View file

@ -69,7 +69,7 @@ const SettingsModal = {
this.$store.dispatch('closeSettingsModal') this.$store.dispatch('closeSettingsModal')
}, },
logout () { logout () {
this.$router.replace(this.$store.state.instance.redirectRootNoLogin || '/main/all') this.$router.replace('/main/public')
this.$store.dispatch('closeSettingsModal') this.$store.dispatch('closeSettingsModal')
this.$store.dispatch('logout') this.$store.dispatch('logout')
}, },

View file

@ -21,11 +21,9 @@
</div> </div>
<div class="panel-body theme-preview-content"> <div class="panel-body theme-preview-content">
<div class="post"> <div class="post">
<div class="Avatar post-avatar"> <div class="avatar still-image">
<div class="still-image avatar -better-shadow">
( ͡° ͜ʖ ͡°) ( ͡° ͜ʖ ͡°)
</div> </div>
</div>
<div class="content"> <div class="content">
<h4> <h4>
{{ $t('settings.style.preview.content') }} {{ $t('settings.style.preview.content') }}

View file

@ -18,6 +18,7 @@
bottom: 0; bottom: 0;
left: 0; left: 0;
right: 0; right: 0;
z-index: 5;
box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.6); box-shadow: 1px 1px 4px rgba(0, 0, 0, 0.6);
box-shadow: var(--panelShadow); box-shadow: var(--panelShadow);
pointer-events: none; pointer-events: none;
@ -59,6 +60,7 @@
padding: 0.6em; padding: 0.6em;
height: var(--__panel-heading-height); height: var(--__panel-heading-height);
line-height: var(--__panel-heading-height-inner); line-height: var(--__panel-heading-height-inner);
z-index: 4;
&.-flexible-height { &.-flexible-height {
--__panel-heading-height: auto; --__panel-heading-height: auto;
@ -129,7 +131,8 @@
color: var(--panelText); color: var(--panelText);
background-color: $fallback--bg; background-color: $fallback--bg;
background-color: var(--bg, $fallback--bg); background-color: var(--bg, $fallback--bg);
z-index: 4; // hotfix for misplaced timeline menu/filter popover layer
z-index: 5;
&::after { &::after {
background-color: $fallback--fg; background-color: $fallback--fg;

View file

@ -21,6 +21,6 @@
"showInstanceSpecificPanel": false, "showInstanceSpecificPanel": false,
"sidebarRight": false, "sidebarRight": false,
"subjectLineBehavior": "email", "subjectLineBehavior": "email",
"theme": "bnakkoma", "theme": "itepechi",
"webPushNotifications": false "webPushNotifications": false
} }

View file

@ -7,5 +7,5 @@
"ir-black": [ "Ir Black", "#000000", "#242422", "#b5b3aa", "#ff6c60", "#FF6C60", "#A8FF60", "#96CBFE", "#FFFFB6" ], "ir-black": [ "Ir Black", "#000000", "#242422", "#b5b3aa", "#ff6c60", "#FF6C60", "#A8FF60", "#96CBFE", "#FFFFB6" ],
"monokai": [ "Monokai", "#272822", "#383830", "#f8f8f2", "#f92672", "#F92672", "#a6e22e", "#66d9ef", "#f4bf75" ], "monokai": [ "Monokai", "#272822", "#383830", "#f8f8f2", "#f92672", "#F92672", "#a6e22e", "#66d9ef", "#f4bf75" ],
"bnakkoma": "/static/themes/bnakkoma.json" "itepechi": "/static/themes/itepechi.json"
} }

View file

@ -1,6 +1,6 @@
{ {
"_pleroma_theme_version": 2, "_pleroma_theme_version": 2,
"name": "BNAkkoma", "name": "Itepechi",
"source": { "source": {
"themeEngineVersion": 3, "themeEngineVersion": 3,
"fonts": {}, "fonts": {},