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

replaces btn-default with btn-secondary (#9704)

Browse Source
This commit is contained in:
Cassidy Pignatello
2018-01-12 17:25:02 -05:00
committed by Sabe Jones
parent 67b396bf16
commit a44f29dad8
11 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/client/components/achievements/newStuff.vue
View File

@@ -9,7 +9,7 @@
new-stuff new-stuff
.modal-footer .modal-footer
a.btn.btn-info(href='http://habitica.wikia.com/wiki/Whats_New', target='_blank') {{ this.$t('newsArchive') }} a.btn.btn-info(href='http://habitica.wikia.com/wiki/Whats_New', target='_blank') {{ this.$t('newsArchive') }}
button.btn.btn-default(@click='close()') {{ this.$t('cool') }} button.btn.btn-secondary(@click='close()') {{ this.$t('cool') }}
button.btn.btn-warning(@click='dismissAlert();') {{ this.$t('dismissAlert') }} button.btn.btn-warning(@click='dismissAlert();') {{ this.$t('dismissAlert') }}
</template> </template>

4
website/client/components/achievements/questInvitation.vue
View File

@@ -39,8 +39,8 @@
tr(ng-repeat='drop in getQuestOwnerRewards(quest)') tr(ng-repeat='drop in getQuestOwnerRewards(quest)')
td {{drop.text()}} td {{drop.text()}}
.modal-footer .modal-footer
button.btn.btn-default(ng-click='questHold = true; $close()') {{ $t('askLater') }} button.btn.btn-secondary(ng-click='questHold = true; $close()') {{ $t('askLater') }}
button.btn.btn-default(ng-click='questReject(); $close()') {{ $t('reject') }} button.btn.btn-secondary(ng-click='questReject(); $close()') {{ $t('reject') }}
button.btn.btn-primary(ng-click='questAccept(); $close()') {{ $t('accept') }} button.btn.btn-primary(ng-click='questAccept(); $close()') {{ $t('accept') }}
</template> </template>

2
website/client/components/chat/copyAsTodoModal.vue
View File

@@ -20,7 +20,7 @@
div(v-markdown='text', target='_blank') div(v-markdown='text', target='_blank')
.modal-footer .modal-footer
button.btn.btn-default(@click='close()') {{ $t('close') }} button.btn.btn-secondary(@click='close()') {{ $t('close') }}
button.btn.btn-primary(@click='saveTodo()') {{ $t('submit') }} button.btn.btn-primary(@click='saveTodo()') {{ $t('submit') }}
</template> </template>

2
website/client/components/groups/groupPlan.vue
View File

@@ -97,7 +97,7 @@ div
input(type='checkbox', v-model='newGroup.leaderOnly.challenges') input(type='checkbox', v-model='newGroup.leaderOnly.challenges')
| {{ $t('leaderOnlyChallenges') }} | {{ $t('leaderOnlyChallenges') }}
.form-group(v-if='type === "party"') .form-group(v-if='type === "party"')
button.btn.btn-default.form-control(@click='createGroup()', :value="$t('createGroupPlan')") button.btn.btn-secondary.form-control(@click='createGroup()', :value="$t('createGroupPlan')")
.form-group .form-group
button.btn.btn-primary.btn-lg.btn-block(@click="createGroup()", :disabled="!newGroupIsReady") {{ $t('createGroupPlan') }} button.btn.btn-primary.btn-lg.btn-block(@click="createGroup()", :disabled="!newGroupIsReady") {{ $t('createGroupPlan') }}
.col-12(v-if='activePage === PAGES.PAY') .col-12(v-if='activePage === PAGES.PAY')

2
website/client/components/hall/heroes.vue
View File

@@ -10,7 +10,7 @@
.form-group .form-group
input.form-control(type='text', v-model='heroID', :placeholder="$t('UUID')") input.form-control(type='text', v-model='heroID', :placeholder="$t('UUID')")
.form-group .form-group
button.btn.btn-default(@click='loadHero(heroID)') button.btn.btn-secondary(@click='loadHero(heroID)')
| {{ $t('loadUser') }} | {{ $t('loadUser') }}
.row .row

2
website/client/components/inventory/items/cards-modal.vue
View File

@@ -10,7 +10,7 @@
div(v-markdown='cardMessage') div(v-markdown='cardMessage')
.modal-footer .modal-footer
small.pull-left {{ $t(cardType + 'CardExplanation')}} small.pull-left {{ $t(cardType + 'CardExplanation')}}
button.btn.btn-default(@click='readCard()') {{ $t('ok') }} button.btn.btn-secondary(@click='readCard()') {{ $t('ok') }}
</template> </template>
<style scoped> <style scoped>

2
website/client/components/members/removeMemberModal.vue
View File

@@ -10,7 +10,7 @@
v-model='removeMessage') v-model='removeMessage')
.modal-footer .modal-footer
button.pull-left.btn.btn-danger(@click='confirmRemoveMember()') {{ $t('yesRemove') }} button.pull-left.btn.btn-danger(@click='confirmRemoveMember()') {{ $t('yesRemove') }}
button.btn.btn-default(@click='close()') {{ $t('cancel') }} button.btn.btn-secondary(@click='close()') {{ $t('cancel') }}
</template> </template>
<style scoped> <style scoped>

82
website/client/components/modifyInventory.vue
View File

@@ -6,13 +6,13 @@
.container-fluid .container-fluid
.row .row
.col-xs-12 .col-xs-12
button.btn.btn-default.pull-right(ng-if="!showInv.gear", @click="showInv.gear = true") Show Gear button.btn.btn-secondary.pull-right(ng-if="!showInv.gear", @click="showInv.gear = true") Show Gear
button.btn.btn-default.pull-right(ng-if="showInv.gear", @click="showInv.gear = false") Hide Gear button.btn.btn-secondary.pull-right(ng-if="showInv.gear", @click="showInv.gear = false") Hide Gear
h4 Gear h4 Gear
div(ng-if="showInv.gear") div(ng-if="showInv.gear")
button.btn.btn-default(@click="setAllItems('gear', true)") Own All button.btn.btn-secondary(@click="setAllItems('gear', true)") Own All
button.btn.btn-default(@click="setAllItems('gear', false)") Previously Own All button.btn.btn-secondary(@click="setAllItems('gear', false)") Previously Own All
button.btn.btn-default(@click="setAllItems('gear', undefined)") Never Own All button.btn.btn-secondary(@click="setAllItems('gear', undefined)") Never Own All
hr hr
@@ -36,13 +36,13 @@
.row .row
.col-xs-12 .col-xs-12
button.btn.btn-default.pull-right(ng-if="!showInv.special", @click="showInv.special = true") Show Special Items button.btn.btn-secondary.pull-right(ng-if="!showInv.special", @click="showInv.special = true") Show Special Items
button.btn.btn-default.pull-right(ng-if="showInv.special", @click="showInv.special = false") Hide Special Items button.btn.btn-secondary.pull-right(ng-if="showInv.special", @click="showInv.special = false") Hide Special Items
h4 Special Items h4 Special Items
div(ng-if="showInv.special") div(ng-if="showInv.special")
button.btn.btn-default(@click="setAllItems('special', 999)") Set All to 999 button.btn.btn-secondary(@click="setAllItems('special', 999)") Set All to 999
button.btn.btn-default(@click="setAllItems('special', 0)") Set All to 0 button.btn.btn-secondary(@click="setAllItems('special', 0)") Set All to 0
button.btn.btn-default(@click="setAllItems('special', undefined)") Set All to undefined button.btn.btn-secondary(@click="setAllItems('special', undefined)") Set All to undefined
hr hr
@@ -57,14 +57,14 @@
.row .row
.col-xs-12 .col-xs-12
button.btn.btn-default.pull-right(ng-if="!showInv.pets", @click="showInv.pets = true") Show Pets button.btn.btn-secondary.pull-right(ng-if="!showInv.pets", @click="showInv.pets = true") Show Pets
button.btn.btn-default.pull-right(ng-if="showInv.pets", @click="showInv.pets = false") Hide Pets button.btn.btn-secondary.pull-right(ng-if="showInv.pets", @click="showInv.pets = false") Hide Pets
h4 Pets h4 Pets
div(ng-if="showInv.pets") div(ng-if="showInv.pets")
button.btn.btn-default(@click="setAllItems('pets', 45)") Set All to 45 button.btn.btn-secondary(@click="setAllItems('pets', 45)") Set All to 45
button.btn.btn-default(@click="setAllItems('pets', 0)") Set All to 0 button.btn.btn-secondary(@click="setAllItems('pets', 0)") Set All to 0
button.btn.btn-default(@click="setAllItems('pets', -1)") Set All to -1 button.btn.btn-secondary(@click="setAllItems('pets', -1)") Set All to -1
button.btn.btn-default(@click="setAllItems('pets', undefined)") Set All to undefined button.btn.btn-secondary(@click="setAllItems('pets', undefined)") Set All to undefined
hr hr
@@ -104,12 +104,12 @@
.row .row
.col-xs-12 .col-xs-12
button.btn.btn-default.pull-right(ng-if="!showInv.mounts", @click="showInv.mounts = true") Show Mounts button.btn.btn-secondary.pull-right(ng-if="!showInv.mounts", @click="showInv.mounts = true") Show Mounts
button.btn.btn-default.pull-right(ng-if="showInv.mounts", @click="showInv.mounts = false") Hide Mounts button.btn.btn-secondary.pull-right(ng-if="showInv.mounts", @click="showInv.mounts = false") Hide Mounts
h4 Mounts h4 Mounts
div(ng-if="showInv.mounts") div(ng-if="showInv.mounts")
button.btn.btn-default(@click="setAllItems('mounts', true)") Set all to Owned button.btn.btn-secondary(@click="setAllItems('mounts', true)") Set all to Owned
button.btn.btn-default(@click="setAllItems('mounts', undefined)") Set all to Not Owned button.btn.btn-secondary(@click="setAllItems('mounts', undefined)") Set all to Not Owned
hr hr
@@ -169,13 +169,13 @@
.row .row
.col-xs-12 .col-xs-12
button.btn.btn-default.pull-right(ng-if="!showInv.hatchingPotions", @click="showInv.hatchingPotions = true") Show Hatching Potions button.btn.btn-secondary.pull-right(ng-if="!showInv.hatchingPotions", @click="showInv.hatchingPotions = true") Show Hatching Potions
button.btn.btn-default.pull-right(ng-if="showInv.hatchingPotions", @click="showInv.hatchingPotions = false") Hide Hatching Potions button.btn.btn-secondary.pull-right(ng-if="showInv.hatchingPotions", @click="showInv.hatchingPotions = false") Hide Hatching Potions
h4 Hatching Potions h4 Hatching Potions
div(ng-if="showInv.hatchingPotions") div(ng-if="showInv.hatchingPotions")
button.btn.btn-default(@click="setAllItems('hatchingPotions', 999)") Set All to 999 button.btn.btn-secondary(@click="setAllItems('hatchingPotions', 999)") Set All to 999
button.btn.btn-default(@click="setAllItems('hatchingPotions', 0)") Set All to 0 button.btn.btn-secondary(@click="setAllItems('hatchingPotions', 0)") Set All to 0
button.btn.btn-default(@click="setAllItems('hatchingPotions', undefined)") Set All to undefined button.btn.btn-secondary(@click="setAllItems('hatchingPotions', undefined)") Set All to undefined
hr hr
@@ -190,13 +190,13 @@
.row .row
.col-xs-12 .col-xs-12
button.btn.btn-default.pull-right(ng-if="!showInv.eggs", @click="showInv.eggs = true") Show Eggs button.btn.btn-secondary.pull-right(ng-if="!showInv.eggs", @click="showInv.eggs = true") Show Eggs
button.btn.btn-default.pull-right(ng-if="showInv.eggs", @click="showInv.eggs = false") Hide Eggs button.btn.btn-secondary.pull-right(ng-if="showInv.eggs", @click="showInv.eggs = false") Hide Eggs
h4 Eggs h4 Eggs
div(ng-if="showInv.eggs") div(ng-if="showInv.eggs")
button.btn.btn-default(@click="setAllItems('eggs', 999)") Set All to 999 button.btn.btn-secondary(@click="setAllItems('eggs', 999)") Set All to 999
button.btn.btn-default(@click="setAllItems('eggs', 0)") Set All to 0 button.btn.btn-secondary(@click="setAllItems('eggs', 0)") Set All to 0
button.btn.btn-default(@click="setAllItems('eggs', undefined)") Set All to undefined button.btn.btn-secondary(@click="setAllItems('eggs', undefined)") Set All to undefined
hr hr
@@ -211,13 +211,13 @@
.row .row
.col-xs-12 .col-xs-12
button.btn.btn-default.pull-right(ng-if="!showInv.food", @click="showInv.food = true") Show Food button.btn.btn-secondary.pull-right(ng-if="!showInv.food", @click="showInv.food = true") Show Food
button.btn.btn-default.pull-right(ng-if="showInv.food", @click="showInv.food = false") Hide Food button.btn.btn-secondary.pull-right(ng-if="showInv.food", @click="showInv.food = false") Hide Food
h4 Food h4 Food
div(ng-if="showInv.food") div(ng-if="showInv.food")
button.btn.btn-default(@click="setAllItems('food', 999)") Set All to 999 button.btn.btn-secondary(@click="setAllItems('food', 999)") Set All to 999
button.btn.btn-default(@click="setAllItems('food', 0)") Set All to 0 button.btn.btn-secondary(@click="setAllItems('food', 0)") Set All to 0
button.btn.btn-default(@click="setAllItems('food', undefined)") Set All to undefined button.btn.btn-secondary(@click="setAllItems('food', undefined)") Set All to undefined
hr hr
@@ -232,13 +232,13 @@
.row .row
.col-xs-12 .col-xs-12
button.btn.btn-default.pull-right(ng-if="!showInv.quests", @click="showInv.quests = true") Show Quests button.btn.btn-secondary.pull-right(ng-if="!showInv.quests", @click="showInv.quests = true") Show Quests
button.btn.btn-default.pull-right(ng-if="showInv.quests", @click="showInv.quests = false") Hide Quests button.btn.btn-secondary.pull-right(ng-if="showInv.quests", @click="showInv.quests = false") Hide Quests
h4 Quests h4 Quests
div(ng-if="showInv.quests") div(ng-if="showInv.quests")
button.btn.btn-default(@click="setAllItems('quests', 999)") Set All to 999 button.btn.btn-secondary(@click="setAllItems('quests', 999)") Set All to 999
button.btn.btn-default(@click="setAllItems('quests', 0)") Set All to 0 button.btn.btn-secondary(@click="setAllItems('quests', 0)") Set All to 0
button.btn.btn-default(@click="setAllItems('quests', undefined)") Set All to undefined button.btn.btn-secondary(@click="setAllItems('quests', undefined)") Set All to undefined
hr hr
@@ -249,7 +249,7 @@
p {{item.text()}} p {{item.text()}}
input.form-control(type="number" ng-model="inv.quests[item.key]") input.form-control(type="number" ng-model="inv.quests[item.key]")
.modal-footer .modal-footer
button.btn.btn-default(@click="close()") {{ $t('close') }} button.btn.btn-secondary(@click="close()") {{ $t('close') }}
button.btn.btn-primary(@click="close();modifyInventory()") Apply Changes button.btn.btn-primary(@click="close();modifyInventory()") Apply Changes
</template> </template>

2
website/client/components/payments/sendGemsModal.vue
View File

@@ -46,7 +46,7 @@ b-modal#send-gems(:title="title", :hide-footer="true", size='lg')
button.btn.btn-primary(@click='showStripe({gift, uuid: userReceivingGems._id})') {{ $t('card') }} button.btn.btn-primary(@click='showStripe({gift, uuid: userReceivingGems._id})') {{ $t('card') }}
button.btn.btn-warning(@click='openPaypalGift({gift: gift, giftedTo: userReceivingGems._id})') PayPal button.btn.btn-warning(@click='openPaypalGift({gift: gift, giftedTo: userReceivingGems._id})') PayPal
button.btn.btn-success(@click="amazonPaymentsInit({type: 'single', gift, giftedTo: userReceivingGems._id})") Amazon Payments button.btn.btn-success(@click="amazonPaymentsInit({type: 'single', gift, giftedTo: userReceivingGems._id})") Amazon Payments
button.btn.btn-default(@click='close()') {{$t('cancel')}} button.btn.btn-secondary(@click='close()') {{$t('cancel')}}
</template> </template>
<style lang="scss"> <style lang="scss">

2
website/client/components/settings/deleteModal.vue
View File

@@ -24,7 +24,7 @@
.col-md-6 .col-md-6
input.form-control(type='text', v-model='password') input.form-control(type='text', v-model='password')
.modal-footer .modal-footer
button.btn.btn-default(@click='close()') {{ $t('neverMind') }} button.btn.btn-secondary(@click='close()') {{ $t('neverMind') }}
button.btn.btn-danger(:disabled='!password', @click='deleteAccount()') {{ $t('deleteDo') }} button.btn.btn-danger(:disabled='!password', @click='deleteAccount()') {{ $t('deleteDo') }}
</template> </template>

2
website/client/components/settings/promoCode.vue
View File

@@ -17,7 +17,7 @@
input.form-control(type='number', v-model='codes.count', placeholder="Number of codes to generate (eg, 250)") input.form-control(type='number', v-model='codes.count', placeholder="Number of codes to generate (eg, 250)")
.form-group .form-group
button.btn.btn-primary(type='submit', @click='generateCodes(codes)') {{ $t('generate') }} button.btn.btn-primary(type='submit', @click='generateCodes(codes)') {{ $t('generate') }}
a.btn.btn-default(:href='getCodesUrl') {{ $t('getCodes') }} a.btn.btn-secondary(:href='getCodesUrl') {{ $t('getCodes') }}
</template> </template>
<script> <script>