diff options
author | Chocobozzz <me@florianbigard.com> | 2020-08-10 09:42:50 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2020-08-10 09:43:44 +0200 |
commit | ae2dd04617d3983af1d42e5fddaddf9dc64eebcb (patch) | |
tree | e2f4b20986c8fe16c67fb82789784c58e3be5348 /client/src | |
parent | 82f443de1aba70ce75c72a4a7f669385600ab3c6 (diff) | |
download | PeerTube-ae2dd04617d3983af1d42e5fddaddf9dc64eebcb.tar.gz PeerTube-ae2dd04617d3983af1d42e5fddaddf9dc64eebcb.tar.zst PeerTube-ae2dd04617d3983af1d42e5fddaddf9dc64eebcb.zip |
Correctly fix sub menu
Diffstat (limited to 'client/src')
9 files changed, 16 insertions, 21 deletions
diff --git a/client/src/app/+about/about.component.html b/client/src/app/+about/about.component.html index da16b933d..04a62240c 100644 --- a/client/src/app/+about/about.component.html +++ b/client/src/app/+about/about.component.html | |||
@@ -1,5 +1,5 @@ | |||
1 | <div class="row"> | 1 | <div class="row"> |
2 | <div class="sub-menu"> | 2 | <div class="sub-menu sub-menu-fixed"> |
3 | 3 | ||
4 | <div class="links"> | 4 | <div class="links"> |
5 | <a i18n routerLink="instance" routerLinkActive="active" class="title-page title-page-about">Instance</a> | 5 | <a i18n routerLink="instance" routerLinkActive="active" class="title-page title-page-about">Instance</a> |
diff --git a/client/src/app/+accounts/account-videos/account-videos.component.scss b/client/src/app/+accounts/account-videos/account-videos.component.scss deleted file mode 100644 index 2ba85c031..000000000 --- a/client/src/app/+accounts/account-videos/account-videos.component.scss +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | .title-page-single { | ||
2 | margin-top: 0; | ||
3 | } \ No newline at end of file | ||
diff --git a/client/src/app/+accounts/account-videos/account-videos.component.ts b/client/src/app/+accounts/account-videos/account-videos.component.ts index dd47589c1..5a9241f8e 100644 --- a/client/src/app/+accounts/account-videos/account-videos.component.ts +++ b/client/src/app/+accounts/account-videos/account-videos.component.ts | |||
@@ -12,8 +12,7 @@ import { I18n } from '@ngx-translate/i18n-polyfill' | |||
12 | selector: 'my-account-videos', | 12 | selector: 'my-account-videos', |
13 | templateUrl: '../../shared/shared-video-miniature/abstract-video-list.html', | 13 | templateUrl: '../../shared/shared-video-miniature/abstract-video-list.html', |
14 | styleUrls: [ | 14 | styleUrls: [ |
15 | '../../shared/shared-video-miniature/abstract-video-list.scss', | 15 | '../../shared/shared-video-miniature/abstract-video-list.scss' |
16 | './account-videos.component.scss' | ||
17 | ] | 16 | ] |
18 | }) | 17 | }) |
19 | export class AccountVideosComponent extends AbstractVideoList implements OnInit, OnDestroy { | 18 | export class AccountVideosComponent extends AbstractVideoList implements OnInit, OnDestroy { |
diff --git a/client/src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.scss b/client/src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.scss index cbd999fbd..f2f42459f 100644 --- a/client/src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.scss +++ b/client/src/app/+my-account/+my-account-video-channels/my-account-video-channels.component.scss | |||
@@ -46,10 +46,6 @@ input[type=text] { | |||
46 | color: $grey-actor-name; | 46 | color: $grey-actor-name; |
47 | margin-left: 5px; | 47 | margin-left: 5px; |
48 | } | 48 | } |
49 | |||
50 | .video-channel-followers { | ||
51 | |||
52 | } | ||
53 | } | 49 | } |
54 | } | 50 | } |
55 | 51 | ||
diff --git a/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.scss b/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.scss deleted file mode 100644 index 2ba85c031..000000000 --- a/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.scss +++ /dev/null | |||
@@ -1,3 +0,0 @@ | |||
1 | .title-page-single { | ||
2 | margin-top: 0; | ||
3 | } \ No newline at end of file | ||
diff --git a/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts b/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts index 267c328f2..599d38da9 100644 --- a/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts +++ b/client/src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts | |||
@@ -12,8 +12,7 @@ import { I18n } from '@ngx-translate/i18n-polyfill' | |||
12 | selector: 'my-video-channel-videos', | 12 | selector: 'my-video-channel-videos', |
13 | templateUrl: '../../shared/shared-video-miniature/abstract-video-list.html', | 13 | templateUrl: '../../shared/shared-video-miniature/abstract-video-list.html', |
14 | styleUrls: [ | 14 | styleUrls: [ |
15 | '../../shared/shared-video-miniature/abstract-video-list.scss', | 15 | '../../shared/shared-video-miniature/abstract-video-list.scss' |
16 | './video-channel-videos.component.scss' | ||
17 | ] | 16 | ] |
18 | }) | 17 | }) |
19 | export class VideoChannelVideosComponent extends AbstractVideoList implements OnInit, OnDestroy { | 18 | export class VideoChannelVideosComponent extends AbstractVideoList implements OnInit, OnDestroy { |
diff --git a/client/src/app/shared/shared-main/misc/top-menu-dropdown.component.html b/client/src/app/shared/shared-main/misc/top-menu-dropdown.component.html index 02faa9bd5..e4bc39a58 100644 --- a/client/src/app/shared/shared-main/misc/top-menu-dropdown.component.html +++ b/client/src/app/shared/shared-main/misc/top-menu-dropdown.component.html | |||
@@ -1,4 +1,4 @@ | |||
1 | <div class="sub-menu" [ngClass]="{ 'no-scroll': isModalOpened }"> | 1 | <div class="sub-menu sub-menu-fixed" [ngClass]="{ 'no-scroll': isModalOpened }"> |
2 | <ng-container *ngFor="let menuEntry of menuEntries; index as id"> | 2 | <ng-container *ngFor="let menuEntry of menuEntries; index as id"> |
3 | 3 | ||
4 | <a *ngIf="menuEntry.routerLink && isDisplayed(menuEntry)" [routerLink]="menuEntry.routerLink" routerLinkActive="active" class="title-page title-page-settings">{{ menuEntry.label }}</a> | 4 | <a *ngIf="menuEntry.routerLink && isDisplayed(menuEntry)" [routerLink]="menuEntry.routerLink" routerLinkActive="active" class="title-page title-page-settings">{{ menuEntry.label }}</a> |
diff --git a/client/src/app/shared/shared-main/misc/top-menu-dropdown.component.ts b/client/src/app/shared/shared-main/misc/top-menu-dropdown.component.ts index c3cd22307..43a9aa352 100644 --- a/client/src/app/shared/shared-main/misc/top-menu-dropdown.component.ts +++ b/client/src/app/shared/shared-main/misc/top-menu-dropdown.component.ts | |||
@@ -1,5 +1,5 @@ | |||
1 | import { Subscription } from 'rxjs' | 1 | import { Subscription } from 'rxjs' |
2 | import { filter, take } from 'rxjs/operators' | 2 | import { filter } from 'rxjs/operators' |
3 | import { Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core' | 3 | import { Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core' |
4 | import { NavigationEnd, Router } from '@angular/router' | 4 | import { NavigationEnd, Router } from '@angular/router' |
5 | import { MenuService, ScreenService } from '@app/core' | 5 | import { MenuService, ScreenService } from '@app/core' |
diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index f4e4d8977..1dbdd4064 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss | |||
@@ -145,16 +145,23 @@ label { | |||
145 | .sub-menu { | 145 | .sub-menu { |
146 | background-color: pvar(--submenuColor); | 146 | background-color: pvar(--submenuColor); |
147 | width: 100%; | 147 | width: 100%; |
148 | height: $sub-menu-height; | ||
149 | display: flex; | 148 | display: flex; |
150 | align-items: center; | 149 | align-items: center; |
151 | padding-left: $not-expanded-horizontal-margins; | 150 | padding-left: $not-expanded-horizontal-margins; |
152 | padding-right: $not-expanded-horizontal-margins; | 151 | padding-right: $not-expanded-horizontal-margins; |
153 | position: fixed; | ||
154 | z-index: #{z('header') - 1}; | ||
155 | 152 | ||
156 | & + .margin-content { | 153 | & + .margin-content { |
157 | padding-top: $sub-menu-height + $sub-menu-margin-bottom; | 154 | padding-top: $sub-menu-margin-bottom; |
155 | } | ||
156 | |||
157 | &.sub-menu-fixed { | ||
158 | height: $sub-menu-height; | ||
159 | position: fixed; | ||
160 | z-index: #{z('header') - 1}; | ||
161 | |||
162 | & + .margin-content { | ||
163 | padding-top: $sub-menu-height + $sub-menu-margin-bottom; | ||
164 | } | ||
158 | } | 165 | } |
159 | } | 166 | } |
160 | 167 | ||