diff options
author | Chocobozzz <me@florianbigard.com> | 2022-07-18 15:01:47 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2022-07-18 15:01:47 +0200 |
commit | ace01da3480e0de943cb028f9541790e0a015eb4 (patch) | |
tree | bcbbcf41c890a20fa6bb8115df09cf1f370b5a67 | |
parent | 58c44687f748a3ea5feafe6335fe962aea8186bd (diff) | |
download | PeerTube-ace01da3480e0de943cb028f9541790e0a015eb4.tar.gz PeerTube-ace01da3480e0de943cb028f9541790e0a015eb4.tar.zst PeerTube-ace01da3480e0de943cb028f9541790e0a015eb4.zip |
Fix z-index with custom homepage
-rw-r--r-- | client/e2e/src/po/video-upload.po.ts | 2 | ||||
-rw-r--r-- | client/src/app/app.component.html | 4 | ||||
-rw-r--r-- | client/src/app/app.component.scss | 4 | ||||
-rw-r--r-- | client/src/app/shared/shared-forms/markdown-textarea.component.scss | 2 | ||||
-rw-r--r-- | client/src/sass/include/_variables.scss | 2 | ||||
-rw-r--r-- | client/src/sass/z-index.scss | 6 |
6 files changed, 10 insertions, 10 deletions
diff --git a/client/e2e/src/po/video-upload.po.ts b/client/e2e/src/po/video-upload.po.ts index 38395ea2f..8605139c9 100644 --- a/client/e2e/src/po/video-upload.po.ts +++ b/client/e2e/src/po/video-upload.po.ts | |||
@@ -3,7 +3,7 @@ import { getCheckbox, selectCustomSelect } from '../utils' | |||
3 | 3 | ||
4 | export class VideoUploadPage { | 4 | export class VideoUploadPage { |
5 | async navigateTo () { | 5 | async navigateTo () { |
6 | const publishButton = await $('.header .publish-button') | 6 | const publishButton = await $('.root-header .publish-button') |
7 | 7 | ||
8 | await publishButton.waitForClickable() | 8 | await publishButton.waitForClickable() |
9 | await publishButton.click() | 9 | await publishButton.click() |
diff --git a/client/src/app/app.component.html b/client/src/app/app.component.html index 629c04e6b..6a833b039 100644 --- a/client/src/app/app.component.html +++ b/client/src/app/app.component.html | |||
@@ -3,7 +3,7 @@ | |||
3 | <my-hotkeys-cheatsheet></my-hotkeys-cheatsheet> | 3 | <my-hotkeys-cheatsheet></my-hotkeys-cheatsheet> |
4 | 4 | ||
5 | <div class="peertube-container" [ngClass]="{ 'user-logged-in': isUserLoggedIn(), 'user-not-logged-in': !isUserLoggedIn() }"> | 5 | <div class="peertube-container" [ngClass]="{ 'user-logged-in': isUserLoggedIn(), 'user-not-logged-in': !isUserLoggedIn() }"> |
6 | <div class="header"> | 6 | <div class="root-header"> |
7 | 7 | ||
8 | <div class="top-left-block"> | 8 | <div class="top-left-block"> |
9 | <span class="icon icon-menu" role="button" [title]="getToggleTitle()" (click)="menu.toggleMenu()"></span> | 9 | <span class="icon icon-menu" role="button" [title]="getToggleTitle()" (click)="menu.toggleMenu()"></span> |
@@ -14,7 +14,7 @@ | |||
14 | </a> | 14 | </a> |
15 | </div> | 15 | </div> |
16 | 16 | ||
17 | <div class="header-right"> | 17 | <div class="root-header-right"> |
18 | <my-header class="w-100 d-flex justify-content-end"></my-header> | 18 | <my-header class="w-100 d-flex justify-content-end"></my-header> |
19 | </div> | 19 | </div> |
20 | </div> | 20 | </div> |
diff --git a/client/src/app/app.component.scss b/client/src/app/app.component.scss index 31e9987c6..229a99a2d 100644 --- a/client/src/app/app.component.scss +++ b/client/src/app/app.component.scss | |||
@@ -15,7 +15,7 @@ | |||
15 | width: 100%; | 15 | width: 100%; |
16 | } | 16 | } |
17 | 17 | ||
18 | .header { | 18 | .root-header { |
19 | height: $header-height; | 19 | height: $header-height; |
20 | position: fixed; | 20 | position: fixed; |
21 | top: 0; | 21 | top: 0; |
@@ -49,7 +49,7 @@ | |||
49 | } | 49 | } |
50 | } | 50 | } |
51 | 51 | ||
52 | .header-right { | 52 | .root-header-right { |
53 | height: $header-height; | 53 | height: $header-height; |
54 | display: flex; | 54 | display: flex; |
55 | align-items: center; | 55 | align-items: center; |
diff --git a/client/src/app/shared/shared-forms/markdown-textarea.component.scss b/client/src/app/shared/shared-forms/markdown-textarea.component.scss index bbb266448..f4b74a2d4 100644 --- a/client/src/app/shared/shared-forms/markdown-textarea.component.scss +++ b/client/src/app/shared/shared-forms/markdown-textarea.component.scss | |||
@@ -80,7 +80,7 @@ $input-border-radius: 3px; | |||
80 | } | 80 | } |
81 | 81 | ||
82 | &.maximized { | 82 | &.maximized { |
83 | z-index: #{z(header) - 1}; | 83 | z-index: #{z(root-header) - 1}; |
84 | position: fixed; | 84 | position: fixed; |
85 | top: $header-height; | 85 | top: $header-height; |
86 | left: $menu-width; | 86 | left: $menu-width; |
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss index 225cad9c2..c02359f28 100644 --- a/client/src/sass/include/_variables.scss +++ b/client/src/sass/include/_variables.scss | |||
@@ -176,7 +176,7 @@ $zindex: ( | |||
176 | tooltip : 14000, | 176 | tooltip : 14000, |
177 | loadbar : 15000, | 177 | loadbar : 15000, |
178 | privacymsg : 17500, | 178 | privacymsg : 17500, |
179 | header : 17500, | 179 | root-header : 17500, |
180 | help-popover : 17600, | 180 | help-popover : 17600, |
181 | dropdown : 17600, | 181 | dropdown : 17600, |
182 | modal : 19000, | 182 | modal : 19000, |
diff --git a/client/src/sass/z-index.scss b/client/src/sass/z-index.scss index d362af0dd..f8b0e1cc0 100644 --- a/client/src/sass/z-index.scss +++ b/client/src/sass/z-index.scss | |||
@@ -1,8 +1,8 @@ | |||
1 | @use '_variables' as *; | 1 | @use '_variables' as *; |
2 | @use '_mixins' as *; | 2 | @use '_mixins' as *; |
3 | 3 | ||
4 | .header { | 4 | .root-header { |
5 | z-index: z(header); | 5 | z-index: z(root-header); |
6 | } | 6 | } |
7 | 7 | ||
8 | .help-popover { | 8 | .help-popover { |
@@ -10,7 +10,7 @@ | |||
10 | } | 10 | } |
11 | 11 | ||
12 | ngx-loading-bar { | 12 | ngx-loading-bar { |
13 | z-index: z(header) + 1 !important; | 13 | z-index: z(root-header) + 1 !important; |
14 | } | 14 | } |
15 | 15 | ||
16 | // Dropdown added to body, override default z-index | 16 | // Dropdown added to body, override default z-index |