Skip to content

Commit

Permalink
add position and remove unused code
Browse files Browse the repository at this point in the history
  • Loading branch information
leiyre committed Nov 11, 2022
1 parent e32daf6 commit cfe4e04
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 21 deletions.
36 changes: 19 additions & 17 deletions frontend/components/base/BaseModal.vue
Expand Up @@ -30,7 +30,6 @@
></svgicon>
{{ modalTitle }}
</p>
<div v-if="!modalCustom" />
<slot />
</div>
</div>
Expand All @@ -54,10 +53,6 @@ export default {
type: Boolean,
default: true,
},
modalCustom: {
type: Boolean,
default: false,
},
modalClass: {
type: String,
default: "modal-info",
Expand All @@ -80,7 +75,7 @@ export default {
},
modalPosition: {
type: String,
default: "modal-bottom",
default: "modal-center",
},
},
data: () => ({}),
Expand Down Expand Up @@ -124,30 +119,39 @@ export default {
}
.modal-wrapper {
display: table-cell;
vertical-align: middle;
&.modal-bottom {
vertical-align: bottom;
padding-bottom: 3em;
padding-left: 30%;
display: flex;
height: 100vh;
&.modal-bottom-right {
align-items: flex-end;

This comment has been minimized.

Copy link
@keithCuniah

keithCuniah Nov 11, 2022

Contributor

the property align-items should not appears in a container is defined as a flexbox ?

padding-bottom: 6em;
.modal-container {
margin-right: 6em;
}
}
&.modal-top-right {
align-items: flex-start;
padding-bottom: 6em;
.modal-container {
margin-right: 6em;
}
}
&.modal-center {
vertical-align: middle;
align-items: center;
}
}
.modal-container {
position: relative;
max-width: 460px;
margin: 0px auto;
padding: $base-space * 4;
background-color: palette(white);
color: $black-87;
border-radius: $border-radius;
box-shadow: $shadow;
transition: $swift-ease-in-out;
position: relative;
text-align: left;
pointer-events: all;
color: $black-54;
}
.modal-primary {
box-shadow: $shadow;
Expand Down Expand Up @@ -183,8 +187,6 @@ export default {
@include font-size(16px);
font-weight: 600;
margin-top: 0;
margin-right: 2em;
color: $black-87;
}
.modal-enter {
Expand Down
1 change: 0 additions & 1 deletion frontend/components/base/table/BaseTableInfo.vue
Expand Up @@ -161,7 +161,6 @@
:modal-custom="true"
:prevent-body-scroll="true"
modal-class="modal-secondary"
modal-position="modal-center"
:modal-title="deleteModalContent.title"
:modal-visible="visibleModalId === item.id"
@close-modal="$emit('close-modal')"
Expand Down
1 change: 0 additions & 1 deletion frontend/components/commons/results/ResultsList.vue
Expand Up @@ -72,7 +72,6 @@
</div>
<lazy-base-modal
modal-class="modal-secondary"
modal-position="modal-center"
:modal-custom="true"
:prevent-body-scroll="true"
:modal-visible="selectedRecord !== undefined"
Expand Down
Expand Up @@ -19,11 +19,10 @@
<div class="view-info">
<lazy-base-modal
modal-class="modal-secondary"
modal-position="modal-center"
modal-position="modal-bottom-right"
modal-title="Info"
modal-icon="info"
:modal-custom="true"
:prevent-body-scroll="true"
:modal-visible="visibleViewInfo"
@close-modal="closeModal"
>
Expand Down

0 comments on commit cfe4e04

Please sign in to comment.