From 7f00e22f979ca9fd57c31a8a88e4491ace24575f Mon Sep 17 00:00:00 2001
From: Jeremie BRISON <ext.sopra.jbrison@grandlyon.com>
Date: Tue, 19 Jan 2021 15:05:51 +0100
Subject: [PATCH] fix(app) : clean z-index
---
src/app/menu-phone/menu-phone.component.scss | 2 +-
.../shared/components/modal/modal.component.scss | 2 +-
.../signin-modal/signin-modal.component.scss | 2 +-
.../signup-modal/signup-modal.component.scss | 2 +-
.../modal-filter/modal-filter.component.scss | 2 +-
src/assets/scss/_z-index.scss | 15 +++++++++------
6 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/app/menu-phone/menu-phone.component.scss b/src/app/menu-phone/menu-phone.component.scss
index 75987578e..ea2eb05ce 100644
--- a/src/app/menu-phone/menu-phone.component.scss
+++ b/src/app/menu-phone/menu-phone.component.scss
@@ -25,7 +25,7 @@
right: 0;
width: 100%;
height: 100%;
- z-index: $modal-menu-phone-z-index;
+ z-index: $menu-phone-z-index;
animation: slideMenu 0.5s;
.contentMenu {
background-color: $white;
diff --git a/src/app/shared/components/modal/modal.component.scss b/src/app/shared/components/modal/modal.component.scss
index ec0dd8d35..5d12fa764 100644
--- a/src/app/shared/components/modal/modal.component.scss
+++ b/src/app/shared/components/modal/modal.component.scss
@@ -5,7 +5,7 @@
@import '../../../../assets/scss/hyperlink';
.cModal {
position: fixed;
- z-index: $modal-add-structure-z-index;
+ z-index: $modal-z-index;
top: 0;
right: 0;
bottom: 0;
diff --git a/src/app/shared/components/signin-modal/signin-modal.component.scss b/src/app/shared/components/signin-modal/signin-modal.component.scss
index 921ab238f..a73c0f1c2 100644
--- a/src/app/shared/components/signin-modal/signin-modal.component.scss
+++ b/src/app/shared/components/signin-modal/signin-modal.component.scss
@@ -5,7 +5,7 @@
@import '../../../../assets/scss/hyperlink';
.cModal {
position: fixed;
- z-index: $modal-authent-z-index;
+ z-index: $modal-z-index;
top: 0;
right: 0;
bottom: 0;
diff --git a/src/app/shared/components/signup-modal/signup-modal.component.scss b/src/app/shared/components/signup-modal/signup-modal.component.scss
index 921ab238f..a73c0f1c2 100644
--- a/src/app/shared/components/signup-modal/signup-modal.component.scss
+++ b/src/app/shared/components/signup-modal/signup-modal.component.scss
@@ -5,7 +5,7 @@
@import '../../../../assets/scss/hyperlink';
.cModal {
position: fixed;
- z-index: $modal-authent-z-index;
+ z-index: $modal-z-index;
top: 0;
right: 0;
bottom: 0;
diff --git a/src/app/structure-list/components/modal-filter/modal-filter.component.scss b/src/app/structure-list/components/modal-filter/modal-filter.component.scss
index dcd0cd490..247ab7361 100644
--- a/src/app/structure-list/components/modal-filter/modal-filter.component.scss
+++ b/src/app/structure-list/components/modal-filter/modal-filter.component.scss
@@ -22,7 +22,7 @@
.modal {
max-width: 754px;
width: 94%;
- z-index: $modal-filter-structure-z-index !important;
+ z-index: $modal-z-index !important;
position: fixed;
border-radius: 6px;
margin-top: 3.5px;
diff --git a/src/assets/scss/_z-index.scss b/src/assets/scss/_z-index.scss
index e5ce1fa87..a9230fbd4 100644
--- a/src/assets/scss/_z-index.scss
+++ b/src/assets/scss/_z-index.scss
@@ -1,6 +1,9 @@
-$structure-details-z-index: 1002;
-$modal-add-structure-z-index: 1002;
-$modal-filter-structure-z-index: 1002;
-$modal-menu-phone-z-index: 1002;
-$btn-phone-switch-map-list-z-index: 1001;
-$modal-authent-z-index: 1003;
+// Phone view
+$btn-phone-switch-map-list-z-index: 1002;
+$menu-phone-z-index: 1003;
+
+// Structure details
+$structure-details-z-index: 1001;
+
+// Modals (filters/confirmationPopup/authen/...)
+$modal-z-index: 1002;
--
GitLab