interesting
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix z-index with custom homepage

This commit is contained in:
Chocobozzz 2022-07-18 15:01:47 +02:00
parent 58c44687f7
commit ace01da348
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/e2e/src/po/video-upload.po.ts
View File

@ -3,7 +3,7 @@ import { getCheckbox, selectCustomSelect } from '../utils'
export class VideoUploadPage { export class VideoUploadPage {
async navigateTo () { async navigateTo () {
const publishButton = await $('.header .publish-button') const publishButton = await $('.root-header .publish-button')
await publishButton.waitForClickable() await publishButton.waitForClickable()
await publishButton.click() await publishButton.click()

4
client/src/app/app.component.html
View File

@ -3,7 +3,7 @@
<my-hotkeys-cheatsheet></my-hotkeys-cheatsheet> <my-hotkeys-cheatsheet></my-hotkeys-cheatsheet>
<div class="peertube-container" [ngClass]="{ 'user-logged-in': isUserLoggedIn(), 'user-not-logged-in': !isUserLoggedIn() }"> <div class="peertube-container" [ngClass]="{ 'user-logged-in': isUserLoggedIn(), 'user-not-logged-in': !isUserLoggedIn() }">
<div class="header"> <div class="root-header">
<div class="top-left-block"> <div class="top-left-block">
<span class="icon icon-menu" role="button" [title]="getToggleTitle()" (click)="menu.toggleMenu()"></span> <span class="icon icon-menu" role="button" [title]="getToggleTitle()" (click)="menu.toggleMenu()"></span>
@ -14,7 +14,7 @@
</a> </a>
</div> </div>
<div class="header-right"> <div class="root-header-right">
<my-header class="w-100 d-flex justify-content-end"></my-header> <my-header class="w-100 d-flex justify-content-end"></my-header>
</div> </div>
</div> </div>

4
client/src/app/app.component.scss
View File

@ -15,7 +15,7 @@
width: 100%; width: 100%;
} }
.header { .root-header {
height: $header-height; height: $header-height;
position: fixed; position: fixed;
top: 0; top: 0;
@ -49,7 +49,7 @@
} }
} }
.header-right { .root-header-right {
height: $header-height; height: $header-height;
display: flex; display: flex;
align-items: center; align-items: center;

2
client/src/app/shared/shared-forms/markdown-textarea.component.scss
View File

@ -80,7 +80,7 @@ $input-border-radius: 3px;
} }
&.maximized { &.maximized {
z-index: #{z(header) - 1}; z-index: #{z(root-header) - 1};
position: fixed; position: fixed;
top: $header-height; top: $header-height;
left: $menu-width; left: $menu-width;

2
client/src/sass/include/_variables.scss
View File

@ -176,7 +176,7 @@ $zindex: (
tooltip : 14000, tooltip : 14000,
loadbar : 15000, loadbar : 15000,
privacymsg : 17500, privacymsg : 17500,
header : 17500, root-header : 17500,
help-popover : 17600, help-popover : 17600,
dropdown : 17600, dropdown : 17600,
modal : 19000, modal : 19000,

6
client/src/sass/z-index.scss
View File

@ -1,8 +1,8 @@
@use '_variables' as *; @use '_variables' as *;
@use '_mixins' as *; @use '_mixins' as *;
.header { .root-header {
z-index: z(header); z-index: z(root-header);
} }
.help-popover { .help-popover {
@ -10,7 +10,7 @@
} }
ngx-loading-bar { ngx-loading-bar {
z-index: z(header) + 1 !important; z-index: z(root-header) + 1 !important;
} }
// Dropdown added to body, override default z-index // Dropdown added to body, override default z-index