fix(modals): apply base styles everywhere, fixes #12524

This commit is contained in:
Matteo Pagliazzi
2020-09-07 21:24:58 +02:00
parent b0786647ed
commit 78016c0aeb
14 changed files with 22 additions and 23 deletions

View File

@@ -37,3 +37,4 @@
@import './tiers'; @import './tiers';
@import './payments'; @import './payments';
@import './spacing'; @import './spacing';
@import './modal';

View File

@@ -0,0 +1,9 @@
@mixin centeredModal() {
display: flex;
justify-content: center;
flex-direction: column;
header, footer {
border: 0;
}
}

View File

@@ -1,16 +1,5 @@
@import '~@/assets/scss/colors.scss'; @import '~@/assets/scss/colors.scss';
@mixin centeredModal() {
display: flex;
justify-content: center;
flex-direction: column;
header, footer {
border: 0;
}
}
.modal { .modal {
z-index: 1350; z-index: 1350;
padding-left: 0px !important; padding-left: 0px !important;

View File

@@ -45,7 +45,7 @@
</template> </template>
<style lang="scss"> <style lang="scss">
@import '~@/assets/scss/modal.scss'; @import '~@/assets/scss/mixins.scss';
#generic-achievement { #generic-achievement {
@include centeredModal(); @include centeredModal();

View File

@@ -71,7 +71,7 @@
<style lang="scss"> <style lang="scss">
@import '~@/assets/scss/colors.scss'; @import '~@/assets/scss/colors.scss';
@import '~@/assets/scss/modal.scss'; @import '~@/assets/scss/mixins.scss';
#equipgear-modal { #equipgear-modal {
@include centeredModal(); @include centeredModal();

View File

@@ -46,7 +46,8 @@
</template> </template>
<style lang="scss"> <style lang="scss">
@import '~@/assets/scss/modal.scss'; @import '~@/assets/scss/mixins.scss';
@import '~@/assets/scss/colors.scss';
#hatchedPet-modal { #hatchedPet-modal {
@include centeredModal(); @include centeredModal();

View File

@@ -46,7 +46,7 @@
</template> </template>
<style lang="scss"> <style lang="scss">
@import '~@/assets/scss/modal.scss'; @import '~@/assets/scss/mixins.scss';
#hatching-modal { #hatching-modal {
@include centeredModal(); @include centeredModal();

View File

@@ -330,7 +330,7 @@
<style lang="scss"> <style lang="scss">
@import '~@/assets/scss/colors.scss'; @import '~@/assets/scss/colors.scss';
@import '~@/assets/scss/modal.scss'; @import '~@/assets/scss/mixins.scss';
.standard-page .clearfix .float-right { .standard-page .clearfix .float-right {
margin-right: 24px; margin-right: 24px;

View File

@@ -38,7 +38,7 @@
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~@/assets/scss/colors.scss'; @import '~@/assets/scss/colors.scss';
@import '~@/assets/scss/modal.scss'; @import '~@/assets/scss/mixins.scss';
#mount-raised-modal { #mount-raised-modal {
@include centeredModal(); @include centeredModal();

View File

@@ -24,7 +24,7 @@
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~@/assets/scss/modal.scss'; @import '~@/assets/scss/mixins.scss';
#welcome-modal { #welcome-modal {
@include centeredModal(); @include centeredModal();

View File

@@ -67,7 +67,7 @@
</template> </template>
<style lang="scss"> <style lang="scss">
@import '~@/assets/scss/modal.scss'; @import '~@/assets/scss/mixins.scss';
#select-user-modal { #select-user-modal {
@include centeredModal(); @include centeredModal();

View File

@@ -192,7 +192,7 @@
<style lang="scss"> <style lang="scss">
@import '~@/assets/scss/colors.scss'; @import '~@/assets/scss/colors.scss';
@import '~@/assets/scss/modal.scss'; @import '~@/assets/scss/mixins.scss';
#buy-modal { #buy-modal {
@include centeredModal(); @include centeredModal();

View File

@@ -83,9 +83,8 @@
</b-modal> </b-modal>
</template> </template>
<style lang="scss"> <style lang="scss">
@import '~@/assets/scss/modal.scss';
@import '~@/assets/scss/colors.scss'; @import '~@/assets/scss/colors.scss';
@import '~@/assets/scss/mixins.scss';
#sell-modal { #sell-modal {
@include centeredModal(); @include centeredModal();

View File

@@ -111,7 +111,7 @@
<style lang="scss"> <style lang="scss">
@import '~@/assets/scss/colors.scss'; @import '~@/assets/scss/colors.scss';
@import '~@/assets/scss/modal.scss'; @import '~@/assets/scss/mixins.scss';
#buy-quest-modal { #buy-quest-modal {
@include centeredModal(); @include centeredModal();