forks
/
peertube
1
0
Fork 0
Code Releases Activity

Correctly fix sub menu

This commit is contained in:
Chocobozzz 2020-08-10 09:42:50 +02:00
parent 82f443de1a
commit ae2dd04617
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
9 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/+about/about.component.html
View File

@ -1,5 +1,5 @@
<div class="row">
<div class="sub-menu">
<div class="sub-menu sub-menu-fixed">
<div class="links">
<a i18n routerLink="instance" routerLinkActive="active" class="title-page title-page-about">Instance</a>

3
client/src/app/+accounts/account-videos/account-videos.component.scss
View File

@ -1,3 +0,0 @@
.title-page-single {
margin-top: 0;
}

3
client/src/app/+accounts/account-videos/account-videos.component.ts
View File

@ -12,8 +12,7 @@ import { I18n } from '@ngx-translate/i18n-polyfill'
selector: 'my-account-videos',
templateUrl: '../../shared/shared-video-miniature/abstract-video-list.html',
styleUrls: [
'../../shared/shared-video-miniature/abstract-video-list.scss',
'./account-videos.component.scss'
'../../shared/shared-video-miniature/abstract-video-list.scss'
]
})
export class AccountVideosComponent extends AbstractVideoList implements OnInit, OnDestroy {

4
client/src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.scss
View File

@ -46,10 +46,6 @@ input[type=text] {
color: $grey-actor-name;
margin-left: 5px;
}
.video-channel-followers {
}
}
}

3
client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.scss
View File

@ -1,3 +0,0 @@
.title-page-single {
margin-top: 0;
}

3
client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts
View File

@ -12,8 +12,7 @@ import { I18n } from '@ngx-translate/i18n-polyfill'
selector: 'my-video-channel-videos',
templateUrl: '../../shared/shared-video-miniature/abstract-video-list.html',
styleUrls: [
'../../shared/shared-video-miniature/abstract-video-list.scss',
'./video-channel-videos.component.scss'
'../../shared/shared-video-miniature/abstract-video-list.scss'
]
})
export class VideoChannelVideosComponent extends AbstractVideoList implements OnInit, OnDestroy {

2
client/src/app/shared/shared-main/misc/top-menu-dropdown.component.html
View File

@ -1,4 +1,4 @@
<div class="sub-menu" [ngClass]="{ 'no-scroll': isModalOpened }">
<div class="sub-menu sub-menu-fixed" [ngClass]="{ 'no-scroll': isModalOpened }">
<ng-container *ngFor="let menuEntry of menuEntries; index as id">
<a *ngIf="menuEntry.routerLink && isDisplayed(menuEntry)" [routerLink]="menuEntry.routerLink" routerLinkActive="active" class="title-page title-page-settings">{{ menuEntry.label }}</a>

2
client/src/app/shared/shared-main/misc/top-menu-dropdown.component.ts
View File

@ -1,5 +1,5 @@
import { Subscription } from 'rxjs'
import { filter, take } from 'rxjs/operators'
import { filter } from 'rxjs/operators'
import { Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'
import { NavigationEnd, Router } from '@angular/router'
import { MenuService, ScreenService } from '@app/core'

15
client/src/sass/application.scss
View File

@ -145,16 +145,23 @@ label {
.sub-menu {
background-color: pvar(--submenuColor);
width: 100%;
height: $sub-menu-height;
display: flex;
align-items: center;
padding-left: $not-expanded-horizontal-margins;
padding-right: $not-expanded-horizontal-margins;
position: fixed;
z-index: #{z('header') - 1};
& + .margin-content {
padding-top: $sub-menu-height + $sub-menu-margin-bottom;
padding-top: $sub-menu-margin-bottom;
}
&.sub-menu-fixed {
height: $sub-menu-height;
position: fixed;
z-index: #{z('header') - 1};
& + .margin-content {
padding-top: $sub-menu-height + $sub-menu-margin-bottom;
}
}
}