mirror of
https://github.com/sudoxnym/habitica-self-host.git
synced 2026-07-14 02:02:19 +00:00
fix(modals): apply base styles everywhere, fixes #12524
This commit is contained in:
parent
b0786647ed
commit
78016c0aeb
14 changed files with 22 additions and 23 deletions
|
|
@ -37,3 +37,4 @@
|
|||
@import './tiers';
|
||||
@import './payments';
|
||||
@import './spacing';
|
||||
@import './modal';
|
||||
|
|
|
|||
9
website/client/src/assets/scss/mixins.scss
Normal file
9
website/client/src/assets/scss/mixins.scss
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
@mixin centeredModal() {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
flex-direction: column;
|
||||
|
||||
header, footer {
|
||||
border: 0;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,16 +1,5 @@
|
|||
|
||||
@import '~@/assets/scss/colors.scss';
|
||||
|
||||
@mixin centeredModal() {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
flex-direction: column;
|
||||
|
||||
header, footer {
|
||||
border: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.modal {
|
||||
z-index: 1350;
|
||||
padding-left: 0px !important;
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
</template>
|
||||
|
||||
<style lang="scss">
|
||||
@import '~@/assets/scss/modal.scss';
|
||||
@import '~@/assets/scss/mixins.scss';
|
||||
|
||||
#generic-achievement {
|
||||
@include centeredModal();
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@
|
|||
<style lang="scss">
|
||||
|
||||
@import '~@/assets/scss/colors.scss';
|
||||
@import '~@/assets/scss/modal.scss';
|
||||
@import '~@/assets/scss/mixins.scss';
|
||||
|
||||
#equipgear-modal {
|
||||
@include centeredModal();
|
||||
|
|
|
|||
|
|
@ -46,7 +46,8 @@
|
|||
</template>
|
||||
|
||||
<style lang="scss">
|
||||
@import '~@/assets/scss/modal.scss';
|
||||
@import '~@/assets/scss/mixins.scss';
|
||||
@import '~@/assets/scss/colors.scss';
|
||||
|
||||
#hatchedPet-modal {
|
||||
@include centeredModal();
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
</template>
|
||||
|
||||
<style lang="scss">
|
||||
@import '~@/assets/scss/modal.scss';
|
||||
@import '~@/assets/scss/mixins.scss';
|
||||
|
||||
#hatching-modal {
|
||||
@include centeredModal();
|
||||
|
|
|
|||
|
|
@ -330,7 +330,7 @@
|
|||
|
||||
<style lang="scss">
|
||||
@import '~@/assets/scss/colors.scss';
|
||||
@import '~@/assets/scss/modal.scss';
|
||||
@import '~@/assets/scss/mixins.scss';
|
||||
|
||||
.standard-page .clearfix .float-right {
|
||||
margin-right: 24px;
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
|
||||
<style lang="scss" scoped>
|
||||
@import '~@/assets/scss/colors.scss';
|
||||
@import '~@/assets/scss/modal.scss';
|
||||
@import '~@/assets/scss/mixins.scss';
|
||||
|
||||
#mount-raised-modal {
|
||||
@include centeredModal();
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
</template>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
@import '~@/assets/scss/modal.scss';
|
||||
@import '~@/assets/scss/mixins.scss';
|
||||
|
||||
#welcome-modal {
|
||||
@include centeredModal();
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@
|
|||
</template>
|
||||
|
||||
<style lang="scss">
|
||||
@import '~@/assets/scss/modal.scss';
|
||||
@import '~@/assets/scss/mixins.scss';
|
||||
|
||||
#select-user-modal {
|
||||
@include centeredModal();
|
||||
|
|
|
|||
|
|
@ -192,7 +192,7 @@
|
|||
|
||||
<style lang="scss">
|
||||
@import '~@/assets/scss/colors.scss';
|
||||
@import '~@/assets/scss/modal.scss';
|
||||
@import '~@/assets/scss/mixins.scss';
|
||||
|
||||
#buy-modal {
|
||||
@include centeredModal();
|
||||
|
|
|
|||
|
|
@ -83,9 +83,8 @@
|
|||
</b-modal>
|
||||
</template>
|
||||
<style lang="scss">
|
||||
|
||||
@import '~@/assets/scss/modal.scss';
|
||||
@import '~@/assets/scss/colors.scss';
|
||||
@import '~@/assets/scss/mixins.scss';
|
||||
|
||||
#sell-modal {
|
||||
@include centeredModal();
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@
|
|||
|
||||
<style lang="scss">
|
||||
@import '~@/assets/scss/colors.scss';
|
||||
@import '~@/assets/scss/modal.scss';
|
||||
@import '~@/assets/scss/mixins.scss';
|
||||
|
||||
#buy-quest-modal {
|
||||
@include centeredModal();
|
||||
|
|
|
|||
Loading…
Reference in a new issue