krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 07:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(modals): button styling

Browse Source
This commit is contained in:
Sabe Jones
2018-11-02 16:48:35 -05:00
parent b6b03751c4
commit 7eaf3e04ab
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
website/client/assets/scss/button.scss
View File

@@ -20,7 +20,7 @@
@include btn-focus-hover-shadow(); @include btn-focus-hover-shadow();
} }
&:hover:not(.btn-flat) { &:hover:not(.btn-flat):not(.disabled) {
@include btn-focus-hover-shadow(); @include btn-focus-hover-shadow();
border-color: transparent; border-color: transparent;
} }
@@ -37,6 +37,7 @@
.btn:disabled, .btn.disabled { .btn:disabled, .btn.disabled {
box-shadow: none; box-shadow: none;
cursor: default;
opacity: 0.64; opacity: 0.64;
border-color: transparent; border-color: transparent;
} }

6
website/client/components/settings/usernameForm.vue
View File

@@ -27,16 +27,12 @@
.input-error.text-center(v-for="issue in usernameIssues") {{ issue }} .input-error.text-center(v-for="issue in usernameIssues") {{ issue }}
.small.text-center.mb-3(v-if='!avatarIntro') {{ $t('usernameLimitations') }} .small.text-center.mb-3(v-if='!avatarIntro') {{ $t('usernameLimitations') }}
.row.justify-content-center .row.justify-content-center
button.btn.btn-primary.btn-flat(type='submit', @click='submitNames()', :disabled='usernameCannotSubmit') {{ $t(avatarIntro ? 'getStarted' : 'saveAndConfirm') }} button.btn.btn-primary(type='submit', @click='submitNames()', :class='{disabled: usernameCannotSubmit}', :disabled='usernameCannotSubmit') {{ $t(avatarIntro ? 'getStarted' : 'saveAndConfirm') }}
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '~client/assets/scss/colors.scss'; @import '~client/assets/scss/colors.scss';
.btn:disabled {
cursor: default;
}
button { button {
margin: 0.25rem auto 1rem; margin: 0.25rem auto 1rem;
} }