Commit 9a20a909 authored by HJ's avatar HJ 🐼

fixed the remaining issues

parent 5ffcddd3
......@@ -2,10 +2,6 @@
.settings_tab-switcher {
height: 100%;
.full-height {
height: 100%;
}
.setting-item {
border-bottom: 2px solid var(--fg, $fallback--fg);
margin: 1em 1em 1.4em;
......
......@@ -55,7 +55,6 @@
v-if="isLoggedIn"
:label="$t('settings.mutes_and_blocks')"
:fullHeight="true"
class="full-height"
icon="eye-off"
>
<MutesAndBlocksTab />
......
......@@ -113,23 +113,20 @@ export default Vue.component('tab-switcher', {
if (slot.data.attrs.fullHeight) {
classes.push('full-height')
}
const newSlot = (
const renderSlot = (!this.renderOnlyFocused || active)
? slot
: ''
return (
<div class={classes}>
{
this.sideTabBar
? <h1 class="mobile-label">{slot.data.attrs.label}</h1>
: ''
}
{slot}
{renderSlot}
</div>
)
if (this.renderOnlyFocused) {
return active
? <div class={classes.join(' ')}>{newSlot}</div>
: <div class={classes.join(' ')}></div>
}
return <div class={classes.join(' ')}>{newSlot}</div>
})
return (
......
......@@ -125,8 +125,9 @@
border-bottom-right-radius: 0;
padding-left: 1em;
padding-right: calc(1em + 200px);
margin-right: calc(1em - 200px);
margin-right: -200px;
margin-left: 1em;
@media all and (max-width: 800px) {
padding-left: .25em;
padding-right: calc(.25em + 200px);
......@@ -147,6 +148,14 @@
.hidden {
display: none;
}
.full-height {
height: 100%;
display: flex;
flex-direction: column;
> *:not(.mobile-label) {
flex: 1;
}
}
&.scrollable-tabs {
overflow-y: auto;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment