fixed the remaining issues
This commit is contained in:
		
							parent
							
								
									5ffcddd3b9
								
							
						
					
					
						commit
						9a20a90932
					
				
					 4 changed files with 16 additions and 15 deletions
				
			
		| 
						 | 
				
			
			@ -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;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue