Skip to content

Commit

Permalink
Merge pull request #721 from rufener/z-index
Browse files Browse the repository at this point in the history
Bugfix about z-index
  • Loading branch information
rufener authored Mar 6, 2023
2 parents 0b7fa80 + e7836bb commit 40e0353
Show file tree
Hide file tree
Showing 25 changed files with 16 additions and 29 deletions.
1 change: 1 addition & 0 deletions front/src/components/Affaires/AffairesDashboard.vue
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<style src="./affairesDashboard.css" scoped></style>
<style lang="css">.md-menu-content { z-index: 9000 !important; }</style>
<template src="./affairesDashboard.html"></template>


Expand Down
3 changes: 1 addition & 2 deletions front/src/components/Affaires/Balance/balance.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@

<!-- Dialog confirm creation of old numbers -->
<!-- <md-dialog :md-active="showConfirmationCreateNumber"
@md-clicked-outside="showConfirmationCreateNumber = false"
style="z-index: 6;">
@md-clicked-outside="showConfirmationCreateNumber = false">
<md-dialog-title>Confirmer la création des numéros</md-dialog-title>
<md-dialog-content>
<p>Ces numéros n'existent pas encore dans la base de données d'Infolica.</p>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<style src="./balanceFromFile.css" scoped></style>
<style lang="css">.md-menu-content { z-index: 9000 !important; }</style>
<template src="./balanceFromFile.html"></template>

<script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,3 @@
.cardMenu {
max-width: 500px !important;
}

.md-dialog {
z-index: 6 !important;
}
1 change: 1 addition & 0 deletions front/src/components/Affaires/Etape/Etape.vue
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<style src="./etape.css" scoped></style>
<style lang="css">.md-menu-content { z-index: 9000 !important; }</style>
<template src="./etape.html"></template>


Expand Down
4 changes: 2 additions & 2 deletions front/src/components/Affaires/Etape/etape.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@


<!-- Dialog pour la création de nouvelle étape dans l'affaire -->
<md-dialog :md-active.sync="etapeAffaire.showDialog" style="z-index: 6; margin: auto; width: 900px;">
<md-dialog :md-active.sync="etapeAffaire.showDialog" style="margin: auto; width: 900px">
<md-dialog-title>Nouvelle étape</md-dialog-title>

<md-dialog-content>
Expand All @@ -35,7 +35,7 @@ <h3 style="margin-top: 24px">=></h3>

<div class="md-layout-item md-size-45">
<!-- Nom de la prochaine étape -->
<md-autocomplete v-model="etapeAffaire.prochaine" :md-options="affaireEtapes" md-dense required @md-selected="onSelectNextStep">
<md-autocomplete v-model="etapeAffaire.prochaine" :md-options="affaireEtapes" md-dense required @md-selected="onSelectNextStep" style="z-index: 9000 !important">
<label>Prochaine étape</label>
</md-autocomplete>
</div>
Expand Down
1 change: 1 addition & 0 deletions front/src/components/Affaires/Facturation/Facturation.vue
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<style src="./facturation.css" scoped></style>
<style lang="css">.md-menu-content { z-index: 9000 !important; }</style>
<template src="./facturation.html"></template>


Expand Down
1 change: 0 additions & 1 deletion front/src/components/Affaires/Facturation/facturation.css
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

.md-dialog {
margin: auto;
z-index: 6; /* Le dialogue apparaît sous le div de suggestions du md-autocomplete pour la recherche de clients*/
}

.md-dialog .currency {
Expand Down
1 change: 1 addition & 0 deletions front/src/components/Affaires/NewAffaire/NewAffaire.vue
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<style src="./newAffaire.css" scoped></style>
<style lang="css">.md-menu-content { z-index: 9000 !important; }</style>
<template src="./newAffaire.html"></template>


Expand Down
1 change: 0 additions & 1 deletion front/src/components/Affaires/NewAffaire/newAffaire.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

.newAffaire .autocomplete {
margin-top: 30px;
z-index: auto;
}

.newAffaire .immeublesSelectDiv {
Expand Down
1 change: 1 addition & 0 deletions front/src/components/Affaires/NumerosAffaire/DDP/DDP.vue
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<style src="./ddp.css" scoped></style>
<style lang="css">.md-menu-content { z-index: 9000 !important; }</style>
<template src="./ddp.html"></template>


Expand Down
1 change: 0 additions & 1 deletion front/src/components/Affaires/NumerosAffaire/DDP/ddp.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
}

.md-dialog {
z-index: 6;
width: 50%;
min-width: 950px;
margin: auto;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<style src="./quittancePCOP.css" scoped></style>
<style lang="css">.md-menu-content { z-index: 9000 !important; }</style>
<template src="./quittancePCOP.html"></template>


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
}

.md-dialog {
z-index: 6;
width: 60%;
margin: auto;
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<style src="./referenceNumeros.css" scoped></style>
<style lang="css">.md-menu-content { z-index: 9000 !important; }</style>
<template src="./referenceNumeros.html"></template>


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,3 @@
vertical-align: top;
margin: 0px;
}

.md-dialog {
z-index: 6;
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<style src="./reservationNumeros.css" scoped></style>
<style lang="css">.md-menu-content { z-index: 9000 !important; }</style>
<template src="./reservationNumeros.html"></template>


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
}

.md-dialog {
z-index: 6;
width: 50%;
min-width: 950px;
margin: auto;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<style src="./reservationNumerosMO.css" scoped></style>
<style lang="css">.md-menu-content { z-index: 9000 !important; }</style>
<template src="./reservationNumerosMO.html"></template>


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
}

.md-dialog {
z-index: 6;
width: 1200px;
margin: auto;
}
Expand Down
1 change: 1 addition & 0 deletions front/src/components/Affaires/Preavis/Preavis.vue
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<style src="./preavis.css" scoped></style>
<style lang="css">.md-menu-content { z-index: 9000 !important; }</style>
<template src="./preavis.html"></template>


Expand Down
6 changes: 0 additions & 6 deletions front/src/components/Affaires/Preavis/preavis.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,3 @@
.preavis .md-table {
width: 70%;
}

.md-dialog {
z-index: 6;
/* Le dialogue apparaît sous le div de suggestions du md-autocomplete pour la recherche de clients*/
}

1 change: 1 addition & 0 deletions front/src/components/Affaires/Suivi/Suivi.vue
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<style src="./suivi.css" scoped></style>
<style lang="css">.md-menu-content { z-index: 9000 !important; }</style>
<template src="./suivi.html"></template>


Expand Down
4 changes: 0 additions & 4 deletions front/src/components/Affaires/Suivi/suivi.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@
position: absolute;
}

.md-dialog {
z-index: 6; /* Le dialogue apparaît sous le div de suggestions du md-autocomplete pour la recherche de clients*/
}

.affaire_suivi_prio2 {
font-style: italic;
background-color: rgba(215, 241, 219, 0.5);
Expand Down
2 changes: 1 addition & 1 deletion front/src/components/Affaires/affairesDashboard.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ <h1 style="margin-bottom: 0px;">

<div class="md-layout-item md-size-30" style="text-align: right;">
<div style="position: absolute; right: 25px; top: 0;">
<md-speed-dial style="align-items: flex-end; z-index: 1;" v-if="permission.affaireCloture && affaire.date_cloture === null" md-direction="bottom" md-event="click">
<md-speed-dial style="align-items: flex-end;" v-if="permission.affaireCloture && affaire.date_cloture === null" md-direction="bottom" md-event="click">
<md-speed-dial-target id="closeAffaireBtn" class="md-raised md-accent" style="margin: 6px !important;">
<md-icon>block</md-icon>
</md-speed-dial-target>
Expand Down

0 comments on commit 40e0353

Please sign in to comment.