From 555fdc8c79d6577b1fb048ac928b8376a81ffd67 Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Fri, 21 Feb 2020 21:25:27 +0100 Subject: [PATCH] Provide z-index centralisation for lower components --- client/src/app/app.component.scss | 2 +- client/src/app/header/search-typeahead.component.scss | 2 +- client/src/app/shared/video/video-thumbnail.component.scss | 2 +- .../src/app/videos/+video-watch/video-watch.component.scss | 1 + client/src/sass/include/_variables.scss | 5 +++-- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/client/src/app/app.component.scss b/client/src/app/app.component.scss index a7be8e1afa6..d9dace16bd3 100644 --- a/client/src/app/app.component.scss +++ b/client/src/app/app.component.scss @@ -21,7 +21,7 @@ display: flex; .top-left-block { - z-index: z(headerLeft); + z-index: 1; height: $header-height; display: flex; align-items: center; diff --git a/client/src/app/header/search-typeahead.component.scss b/client/src/app/header/search-typeahead.component.scss index a55e7832669..33b88825f3b 100644 --- a/client/src/app/header/search-typeahead.component.scss +++ b/client/src/app/header/search-typeahead.component.scss @@ -30,7 +30,7 @@ .jump-to-suggestions { top: 100%; left: 0; - z-index: 35; + z-index: z(typeahead); width: 100%; } diff --git a/client/src/app/shared/video/video-thumbnail.component.scss b/client/src/app/shared/video/video-thumbnail.component.scss index 573a6498700..c13105e94e5 100644 --- a/client/src/app/shared/video/video-thumbnail.component.scss +++ b/client/src/app/shared/video/video-thumbnail.component.scss @@ -25,7 +25,7 @@ border-radius: 3px; font-size: 12px; font-weight: $font-bold; - z-index: 1; + z-index: z(miniature); } .video-thumbnail-duration-overlay { diff --git a/client/src/app/videos/+video-watch/video-watch.component.scss b/client/src/app/videos/+video-watch/video-watch.component.scss index c92f773e44e..ae79c2ff6c1 100644 --- a/client/src/app/videos/+video-watch/video-watch.component.scss +++ b/client/src/app/videos/+video-watch/video-watch.component.scss @@ -462,6 +462,7 @@ my-video-comments { .privacy-concerns { position: fixed; bottom: 0; + z-index: z(privacymsg); padding: 5px 15px; diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss index 0c37cd68ac2..4ef8e17b92c 100644 --- a/client/src/sass/include/_variables.scss +++ b/client/src/sass/include/_variables.scss @@ -102,9 +102,10 @@ $variables: ( /*** z-index groups ***/ $zindex: ( + miniature : 10, + privacymsg : 20, + typeahead : 30, header : 1000, - /* header context */ - headerLeft : 10, menu : 11000, dropdown : 12000, popover : 13000,