From 0fe0cb4f2d97be42dc0dd6c3a1b670f5765973be Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Sat, 8 Feb 2014 16:27:34 +0100 Subject: [PATCH] refactor(bs3): labels style and text, buttons classes --- public/css/index.styl | 3 +++ views/options/profile.jade | 18 +++++++++--------- views/options/settings.jade | 2 +- views/options/social/challenges.jade | 22 +++++++++++----------- views/options/social/chat-box.jade | 2 +- views/options/social/chat-message.jade | 2 +- views/options/social/group.jade | 4 ++-- views/options/social/hall.jade | 6 +++--- views/options/social/index.jade | 4 ++-- views/options/social/tavern.jade | 2 +- views/shared/footer.jade | 2 +- views/shared/header/avatar.jade | 2 +- views/shared/header/header.jade | 2 +- views/shared/modals/achievements.jade | 10 +++++----- views/shared/modals/buy-gems.jade | 2 +- views/shared/modals/classes.jade | 4 ++-- views/shared/modals/death.jade | 2 +- views/shared/modals/drops.jade | 2 +- views/shared/modals/new-stuff.jade | 6 +++--- views/shared/modals/quests.jade | 16 ++++++++-------- views/shared/modals/rebirth.jade | 8 ++++---- views/shared/modals/reroll.jade | 6 +++--- views/shared/modals/settings.jade | 8 ++++---- views/shared/profiles/achievements.jade | 4 ++-- views/shared/tasks/task.jade | 2 +- views/static/front.jade | 2 +- views/static/login-modal.jade | 2 +- views/static/plans.jade | 4 ++-- 28 files changed, 76 insertions(+), 73 deletions(-) diff --git a/public/css/index.styl b/public/css/index.styl index d15a95ff32..ebf37c54d6 100644 --- a/public/css/index.styl +++ b/public/css/index.styl @@ -130,6 +130,9 @@ a span.glyphicon a.label color: #fff +.label .glyphicon + color: #fff + .muted color: #999 diff --git a/views/options/profile.jade b/views/options/profile.jade index c78226b5b8..bcc3d2101a 100644 --- a/views/options/profile.jade +++ b/views/options/profile.jade @@ -8,8 +8,8 @@ script(id='partials/options.profile.avatar.html', type='text/ng-template') h5=env.t('bodySize') .btn-group - button.btn.btn-small(ng-class='{active: user.preferences.size=="slim"}', ng-click='set({"preferences.size":"slim"})')=env.t('bodySlim') - button.btn.btn-small(ng-class='{active: user.preferences.size=="broad"}', ng-click='set({"preferences.size":"broad"})')=env.t('bodyBroad') + button.btn.btn-sm.btn-default(ng-class='{active: user.preferences.size=="slim"}', ng-click='set({"preferences.size":"slim"})')=env.t('bodySlim') + button.btn.btn-sm.btn-default(ng-class='{active: user.preferences.size=="broad"}', ng-click='set({"preferences.size":"broad"})')=env.t('bodyBroad') menu(type='list') li.customize-menu @@ -21,7 +21,7 @@ script(id='partials/options.profile.avatar.html', type='text/ng-template') each shirt in ['convict', 'cross', 'fire', 'horizon', 'ocean', 'purple', 'rainbow', 'redblue', 'thunder', 'tropical', 'zombie'] button.customize-option(type='button', class='{{user.preferences.size}}_shirt_'+shirt, ng-class='{locked: !user.purchased.shirt.'+shirt+'}', ng-click='unlock("shirt.'+shirt+'")') menu - button.btn.btn-small.btn-primary(ng-hide="user.purchased.shirt.convict && user.purchased.shirt.cross && user.purchased.shirt.fire && user.purchased.shirt.horizon && user.purchased.shirt.ocean && user.purchased.shirt.purple && user.purchased.shirt.rainbow && user.purchased.shirt.redblue && user.purchased.shirt.thunder && user.purchased.shirt.tropical && user.purchased.shirt.zombie", ng-click='unlock("shirt.convict,shirt.cross,shirt.fire,shirt.horizon,shirt.ocean,shirt.purple,shirt.rainbow,shirt.redblue,shirt.thunder,shirt.tropical,shirt.zombie")')!= env.t('unlockSet5') + ' ' + button.btn.btn-sm.btn-primary(ng-hide="user.purchased.shirt.convict && user.purchased.shirt.cross && user.purchased.shirt.fire && user.purchased.shirt.horizon && user.purchased.shirt.ocean && user.purchased.shirt.purple && user.purchased.shirt.rainbow && user.purchased.shirt.redblue && user.purchased.shirt.thunder && user.purchased.shirt.tropical && user.purchased.shirt.zombie", ng-click='unlock("shirt.convict,shirt.cross,shirt.fire,shirt.horizon,shirt.ocean,shirt.purple,shirt.rainbow,shirt.redblue,shirt.thunder,shirt.tropical,shirt.zombie")')!= env.t('unlockSet5') + ' ' .col-md-4 @@ -44,7 +44,7 @@ script(id='partials/options.profile.avatar.html', type='text/ng-template') menu(label=env.t('rainbowColors')) each color in ['rainbow','yellow','green','purple','blue','TRUred'] button(type='button', ng-class='{locked: !user.purchased.hair.color.#{color}}', class='customize-option hair_bangs_1_#{color}', style='width: 40px; height: 40px;', ng-click='unlock("hair.color.#{color}")') - button.btn.btn-small.btn-primary(ng-hide='user.purchased.hair.color.rainbow && user.purchased.hair.color.yellow && user.purchased.hair.color.green && user.purchased.hair.color.purple && user.purchased.hair.color.blue && user.purchased.hair.color.TRUred', ng-click='unlock("hair.color.rainbow,hair.color.yellow,hair.color.green,hair.color.purple,hair.color.blue,hair.color.TRUred")')!= env.t('unlockSet5') + ' ' + button.btn.btn-sm.btn-primary(ng-hide='user.purchased.hair.color.rainbow && user.purchased.hair.color.yellow && user.purchased.hair.color.green && user.purchased.hair.color.purple && user.purchased.hair.color.blue && user.purchased.hair.color.TRUred', ng-click='unlock("hair.color.rainbow,hair.color.yellow,hair.color.green,hair.color.purple,hair.color.blue,hair.color.TRUred")')!= env.t('unlockSet5') + ' ' h5=env.t('bodyHair') // Bangs @@ -63,7 +63,7 @@ script(id='partials/options.profile.avatar.html', type='text/ng-template') when true: button(class='hair_base_#{k}_{{user.preferences.hair.color}} customize-option', type='button', ng-click='set({"preferences.hair.base":#{k}})') when false: button(class='hair_base_#{k}_{{user.preferences.hair.color}} customize-option', type='button', ng-class='{locked: !user.purchased.hair.base.#{k}}', ng-click='unlock("hair.base.#{k}")') - button.btn.btn-small.btn-primary(ng-hide='user.purchased.hair.base.2 && user.purchased.hair.base.4 && user.purchased.hair.base.5 && user.purchased.hair.base.6 && user.purchased.hair.base.7 && user.purchased.hair.base.8', ng-click='unlock("hair.base.2,hair.base.4,hair.base.5,hair.base.6,hair.base.7,hair.base.8")')!= env.t('unlockSet5') + ' ' + button.btn.btn-sm.btn-primary(ng-hide='user.purchased.hair.base.2 && user.purchased.hair.base.4 && user.purchased.hair.base.5 && user.purchased.hair.base.6 && user.purchased.hair.base.7 && user.purchased.hair.base.8', ng-click='unlock("hair.base.2,hair.base.4,hair.base.5,hair.base.6,hair.base.7,hair.base.8")')!= env.t('unlockSet5') + ' ' h5=env.t('bodyFacialHair') @@ -81,7 +81,7 @@ script(id='partials/options.profile.avatar.html', type='text/ng-template') each num in [1,2] button(class='hair_mustache_#{num}_{{user.preferences.hair.color}} customize-option', type='button', ng-class='{locked: !user.purchased.hair.mustache.#{num}}', ng-click='unlock("hair.mustache.#{num}")') - button.btn.btn-small.btn-primary(ng-hide='user.purchased.hair.mustache.1 && user.purchased.hair.mustache.2 && user.purchased.hair.beard.1 && user.purchased.hair.beard.2 && user.purchased.hair.beard.3', ng-click='unlock("hair.mustache.1,hair.mustache.2,hair.beard.1,hair.beard.2,hair.beard.3")')!= env.t('unlockSet5') + ' ' + button.btn.btn-sm.btn-primary(ng-hide='user.purchased.hair.mustache.1 && user.purchased.hair.mustache.2 && user.purchased.hair.beard.1 && user.purchased.hair.beard.2 && user.purchased.hair.beard.3', ng-click='unlock("hair.mustache.1,hair.mustache.2,hair.beard.1,hair.beard.2,hair.beard.3")')!= env.t('unlockSet5') + ' ' .col-md-4 h3=env.t('bodySkin') @@ -100,7 +100,7 @@ script(id='partials/options.profile.avatar.html', type='text/ng-template') menu each color in ['eb052b','f69922','f5d70f','0ff591','2b43f6','d7a9f7','800ed0','rainbow'] button.customize-option(type='button', class='skin_#{color}', ng-class='{locked: !user.purchased.skin.#{color}}', ng-click='unlock("skin.#{color}")') - button.btn.btn-small.btn-primary(ng-hide='user.purchased.skin.eb052b && user.purchased.skin.f69922 && user.purchased.skin.f5d70f && user.purchased.skin.0ff591 && user.purchased.skin.2b43f6 && user.purchased.skin.d7a9f7 && user.purchased.skin.800ed0 && user.purchased.skin.rainbow', ng-click='unlock("skin.eb052b,skin.f69922,skin.f5d70f,skin.0ff591,skin.2b43f6,skin.d7a9f7,skin.800ed0,skin.rainbow")')!= env.t('unlockSet5') + ' ' + button.btn.btn-sm.btn-primary(ng-hide='user.purchased.skin.eb052b && user.purchased.skin.f69922 && user.purchased.skin.f5d70f && user.purchased.skin.0ff591 && user.purchased.skin.2b43f6 && user.purchased.skin.d7a9f7 && user.purchased.skin.800ed0 && user.purchased.skin.rainbow', ng-click='unlock("skin.eb052b,skin.f69922,skin.f5d70f,skin.0ff591,skin.2b43f6,skin.d7a9f7,skin.800ed0,skin.rainbow")')!= env.t('unlockSet5') + ' ' // Special Events // restore to d4df481 to see purchasing + "limited edition" code @@ -120,7 +120,7 @@ script(id='partials/options.profile.stats.html', type='text/ng-template') h4 =env.t('class') + ': ' span {{ {warrior:'Warrior',wizard:'Mage',healer:'Healer',rogue:'Rogue'}[user.stats.class] }}  - a.btn.btn-danger.btn-mini(ng-click='changeClass(null)')=env.t('changeClass') + a.btn.btn-danger.btn-xs(ng-click='changeClass(null)')=env.t('changeClass') small 3 table.table.table-striped tr @@ -156,7 +156,7 @@ script(id='partials/options.profile.stats.html', type='text/ng-template')   span.glyphicon.glyphicon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover=env.t('taskAllocationPop')) div(ng-show='user.preferences.automaticAllocation && !(user.preferences.allocationMode === "taskbased") && (user.stats.points > 0)') - a.btn.btn-primary.btn-mini(ng-click='user.ops.allocateNow({})', popover-trigger='mouseenter', popover-placement='right', popover=env.t('distributePointsPop')) + a.btn.btn-primary.btn-xs(ng-click='user.ops.allocateNow({})', popover-trigger='mouseenter', popover-placement='right', popover=env.t('distributePointsPop')) span.glyphicon.glyphicon-download   =env.t('distributePoints') diff --git a/views/options/settings.jade b/views/options/settings.jade index 8499188cb4..5a4d9ed51e 100644 --- a/views/options/settings.jade +++ b/views/options/settings.jade @@ -160,4 +160,4 @@ script(id='partials/options.settings.subscription.html',type='text/ng-template') div(style='font-size:22px') span.glyphicon.glyphicon-ok=env.t('subscribed') div(ng-include="'partials/options.settings.subscription.perks.html'") - .btn.btn-small.btn-danger(ng-click='cancelSubscription()')=env.t('cancelSub') + .btn.btn-sm.btn-danger(ng-click='cancelSubscription()')=env.t('cancelSub') diff --git a/views/options/social/challenges.jade b/views/options/social/challenges.jade index e361f11493..857888c3dd 100644 --- a/views/options/social/challenges.jade +++ b/views/options/social/challenges.jade @@ -1,5 +1,5 @@ script(type='text/ng-template', id='partials/options.social.challenges.detail.close.html') - a.btn.btn-small.btn-danger(ng-click="delete(closingChal)")=env.t('delete') + a.btn.btn-sm.btn-danger(ng-click="delete(closingChal)")=env.t('delete') h5= '- ' + env.t('or') + ' -' select(ui-select2, ng-required=true, ng-model='closingChal.winner', data-placeholder=env.t('selectWinner'), ng-change='selectWinner(closingChal)', ) option(value='') @@ -18,19 +18,19 @@ script(type='text/ng-template', id='partials/options.social.challenges.detail.me .modal-body habitrpg-tasks(main=false) .modal-footer - a.btn(ng-click='$state.go("^")')=env.t('close') + a.btn.btn-default(ng-click='$state.go("^")')=env.t('close') script(type='text/ng-template', id='partials/options.social.challenges.detail.html') // Edit button div(bindonce='challenge', ng-if='challenge.leader==user._id') div(ng-hide='challenge._locked==false') - button.btn.btn-small.btn-default(ng-click='challenge._locked = false')=env.t('edit') - button.btn.btn-small.btn-warning(ng-click='close(challenge, $event)', tooltip=env.t('deleteOrSelect'))=env.t('endChallenge') + button.btn.btn-sm.btn-default(ng-click='challenge._locked = false')=env.t('edit') + button.btn.btn-sm.btn-warning(ng-click='close(challenge, $event)', tooltip=env.t('deleteOrSelect'))=env.t('endChallenge') form(ng-show='challenge._locked==false') .form-group(ng-show='challenge._locked==false') - button.btn.btn-small.btn-primary(ng-click='save(challenge)')=env.t('save') - button.btn.btn-small.btn-default(ng-click='challenge._locked=true')=env.t('cancel') + button.btn.btn-sm.btn-primary(ng-click='save(challenge)')=env.t('save') + button.btn.btn-sm.btn-default(ng-click='challenge._locked=true')=env.t('cancel') .form-group input.form-control(type='text', ng-model='challenge.name') .form-group @@ -46,7 +46,7 @@ script(type='text/ng-template', id='partials/options.social.challenges.detail.ht // Member List div(bindonce='challenge', ng-if='challenge.members.length > 0') - a.btn.btn-primary.btn-small.pull-right(href='/api/v2/challenges/{{challenge._id}}/csv') + a.btn.btn-primary.btn-sm.pull-right(href='/api/v2/challenges/{{challenge._id}}/csv') =env.t('exportChallengeCSV') h3=env.t('hows') menu @@ -70,8 +70,8 @@ script(type='text/ng-template', id='partials/options.social.challenges.html') h3=env.t('filter') + ':' h4=env.t('groups') ul.list-unstyled - a.btn.btn-mini.pull-left(ng-click='selectAll()')=env.t('all') - a.btn.btn-mini(ng-click='selectNone()')=env.t('none') + a.btn.btn-xs.btn-default.pull-left(ng-click='selectAll()')=env.t('all') + a.btn.btn-xs.btn-default(ng-click='selectNone()')=env.t('none') br .checkbox(ng-repeat='group in groupsFilter') label @@ -154,10 +154,10 @@ script(type='text/ng-template', id='partials/options.social.challenges.html') td=env.t('prize') li // leave / join - a.btn.btn-small.btn-danger(ng-show='challenge._isMember', ng-click='clickLeave(challenge, $event)') + a.btn.btn-sm.btn-danger(ng-show='challenge._isMember', ng-click='clickLeave(challenge, $event)') span.glyphicon.glyphicon-ban-circle =env.t('leave') - a.btn.btn-small.btn-success(ng-hide='challenge._isMember', ng-click='join(challenge)') + a.btn.btn-sm.btn-success(ng-hide='challenge._isMember', ng-click='join(challenge)') span.glyphicon.glyphicon-ok =env.t('join') a.accordion-toggle(ng-click='toggle(challenge._id)') {{challenge.name}} diff --git a/views/options/social/chat-box.jade b/views/options/social/chat-box.jade index 77e8f5470d..e1831531de 100644 --- a/views/options/social/chat-box.jade +++ b/views/options/social/chat-box.jade @@ -4,7 +4,7 @@ form.chat-form(ng-submit='postChat(group,message.content)') span.user-list(ng-show='!isAtListHidden') ul.list-at-user li(bindonce='response', ng-repeat='user in response | filter:query.text | limitTo: 5', ng-click='autoComplete(user)') - span.username.label(class='label-contributor-{{user.contributor.level}}', ng-class='{"label-npc": user.backer.npc}') {{user.user}} + span.username.label.label-default(ng-class='userLevelStyle(user)') {{user.user}} .row .col-md-9 include ../../shared/formatting-help diff --git a/views/options/social/chat-message.jade b/views/options/social/chat-message.jade index 5d48818b8c..d88faa1c7f 100644 --- a/views/options/social/chat-message.jade +++ b/views/options/social/chat-message.jade @@ -6,7 +6,7 @@ li.chat-message(bindonce='group.chat', ng-repeat='message in group.chat', bo-cla | - span.muted.time(from-now='message.timestamp',style='padding:0px 3px') span(style='padding:0px 3px') - a.label(ng-show='countExists(message.likes)',ng-class='{"label-success":message.likes[user._id]}',ng-click='likeChatMessage(group,message)') +{{countExists(message.likes)}} + a.label.label-default(ng-show='countExists(message.likes)',ng-class='{"label-success":message.likes[user._id]}',ng-click='likeChatMessage(group,message)') +{{countExists(message.likes)}} a.chat-plus-one.muted(ng-show='!countExists(message.likes)',ng-click='likeChatMessage(group,message)') +1 a(bo-show='user.contributor.admin || message.uuid == user.id', ng-click='deleteChatMessage(group, message)',style='padding: 0px 3px') span.glyphicon.glyphicon-trash(tooltip=env.t('delete')) diff --git a/views/options/social/group.jade b/views/options/social/group.jade index 44c33c4da9..7fcef0f7b9 100644 --- a/views/options/social/group.jade +++ b/views/options/social/group.jade @@ -23,7 +23,7 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title=env.t('guild hr .npc_ian.pull-left p=env.t('questStart') - button.btn.btn-small.btn-warning(ng-if='!group.quest.leader || group.quest.leader==user._id', ng-click='party.$questAccept({"force":true})')=env.t('begin') + button.btn.btn-sm.btn-warning(ng-if='!group.quest.leader || group.quest.leader==user._id', ng-click='party.$questAccept({"force":true})')=env.t('begin') //-TODO Cancel button //-TODO Both force-start & cancel should only be available to quest-initiator @@ -74,7 +74,7 @@ a.pull-right.gem-wallet(popover-trigger='mouseenter', popover-title=env.t('guild p=env.t('bossColl2') - button.btn.btn-mini.btn-danger(ng-if='!group.quest.leader || group.quest.leader==user._id', ng-click='questAbort()')=env.t('abort') + button.btn.btn-xs.btn-danger(ng-if='!group.quest.leader || group.quest.leader==user._id', ng-click='questAbort()')=env.t('abort') // ------ Information ------- .panel.panel-default diff --git a/views/options/social/hall.jade b/views/options/social/hall.jade index 2a648ee94c..2027521bfd 100644 --- a/views/options/social/hall.jade +++ b/views/options/social/hall.jade @@ -68,11 +68,11 @@ script(type='text/ng-template', id='partials/options.social.hall.heroes.html') tr(ng-repeat='hero in heroes') td span(ng-if='hero.contributor.admin',popover=env.t('gamemaster'),popover-trigger='mouseenter',popover-placement='right') - a.label(class='label-contributor-{{hero.contributor.level}}', ng-class='{"label-npc": hero.backer.npc}', ng-click='clickMember(hero._id, true)') + a.label.label-default(ng-class='userLevelStyle(hero)', ng-click='clickMember(hero._id, true)') | {{hero.profile.name}}  span.glyphicon.glyphicon-star span(ng-if='!hero.contributor.admin') - a.label(class='label-contributor-{{hero.contributor.level}}', ng-class='{"label-npc": hero.backer.npc}', ng-click='clickMember(hero._id, true)') {{hero.profile.name}} + a.label.label-default(ng-class='userLevelStyle(hero)', ng-click='clickMember(hero._id, true)') {{hero.profile.name}} td(ng-if='user.contributor.admin') {{hero._id}} td {{hero.contributor.level}} td {{hero.contributor.text}} @@ -89,6 +89,6 @@ script(type='text/ng-template', id='partials/options.social.hall.patrons.html') tbody tr(ng-repeat='patron in patrons') td - a.label(class='label-contributor-{{patron.contributor.level}}', ng-class='{"label-npc": patron.backer.npc}', ng-click='clickMember(patron._id, true)') {{patron.profile.name}} + a.label.label-default(ng-class='userLevelStyle(patron)', ng-click='clickMember(patron._id, true)') {{patron.profile.name}} td(ng-if='user.contributor.admin') {{patron._id}} td {{patron.backer.tier}} diff --git a/views/options/social/index.jade b/views/options/social/index.jade index 3f3303b0d3..0c17467641 100644 --- a/views/options/social/index.jade +++ b/views/options/social/index.jade @@ -38,10 +38,10 @@ script(type='text/ng-template', id='partials/options.social.guilds.public.html') li='{{group.memberCount}} ' + env.t('members') li // join / leave - a.btn.btn-small.btn-danger(ng-show='group._isMember', ng-click='clickLeave(group, $event)') + a.btn.btn-sm.btn-danger(ng-show='group._isMember', ng-click='clickLeave(group, $event)') span.glyphicon.glyphicon-ban-circle =env.t('leave') - a.btn.btn-small.btn-success(ng-hide='group._isMember', ng-click='join(group)') + a.btn.btn-sm.btn-success(ng-hide='group._isMember', ng-click='join(group)') span.glyphicon.glyphicon-ok =env.t('join') h4 {{group.name}} diff --git a/views/options/social/tavern.jade b/views/options/social/tavern.jade index 175c4abab6..503dc52e8a 100644 --- a/views/options/social/tavern.jade +++ b/views/options/social/tavern.jade @@ -14,7 +14,7 @@ .popover-content =env.t('danielText') div - button.btn.btn-large.btn-success(ng-class='{active: user.preferences.sleep}', ng-click='User.user.ops.sleep({})') + button.btn.btn-lg.btn-success(ng-class='{active: user.preferences.sleep}', ng-click='User.user.ops.sleep({})') span(ng-show='user.preferences.sleep')=env.t('innCheckOut') span(ng-hide='user.preferences.sleep')=env.t('innCheckIn') .alert.alert-info(ng-show='user.preferences.sleep') diff --git a/views/shared/footer.jade b/views/shared/footer.jade index c7a9644470..768ebe2628 100644 --- a/views/shared/footer.jade +++ b/views/shared/footer.jade @@ -13,7 +13,7 @@ footer.footer(ng-controller='FooterCtrl') ul.list-unstyled if (!env.isStaticPage) li - .btn.btn-small.btn-success(ng-click='openModal("buyGems")') + .btn.btn-sm.btn-success(ng-click='openModal("buyGems")') span.glyphicon.glyphicon-heart =env.t('companyDonate') li diff --git a/views/shared/header/avatar.jade b/views/shared/header/avatar.jade index cb4923357a..cc9a3d986b 100644 --- a/views/shared/header/avatar.jade +++ b/views/shared/header/avatar.jade @@ -43,7 +43,7 @@ figure.herobox(ng-click='spell ? castEnd(profile, "user", $event) : clickMember( span(ng-class='{zzz:profile.preferences.sleep}') // FIXME handle @minimal, this might have to be a directive span.current-pet(class='Pet-{{profile.items.currentPet}}', ng-show='profile.items.currentPet && !minimal') - .avatar-level(ng-class='userLevelStyle(profile,"label label-default")') + .avatar-level.label.label-default(ng-class='userLevelStyle(profile)') span.glyphicon.glyphicon-circle-arrow-up(ng-show='profile.stats.buffs.str || profile.stats.buffs.per || profile.stats.buffs.con || profile.stats.buffs.int || profile.stats.buffs.stealth', tooltip=env.t('buffed'), style='margin-right:5px;') =env.t('lvl') | {{profile.stats.lvl}} diff --git a/views/shared/header/header.jade b/views/shared/header/header.jade index 8c85538495..d62920ab4c 100644 --- a/views/shared/header/header.jade +++ b/views/shared/header/header.jade @@ -1,5 +1,5 @@ .header-wrap(ng-controller='HeaderCtrl') - a.label.undo-button(x-bind='click:undo', ng-show='_undo')=env.t('undo') + a.label.label-default.undo-button(x-bind='click:undo', ng-show='_undo')=env.t('undo') div(ng-if='!user.preferences.hideHeader') include menu diff --git a/views/shared/modals/achievements.jade b/views/shared/modals/achievements.jade index 3693a22d43..ca884290f7 100644 --- a/views/shared/modals/achievements.jade +++ b/views/shared/modals/achievements.jade @@ -6,7 +6,7 @@ script(id='modals/achievements/streak.html', type='text/ng-template') .achievement.achievement-thermometer =env.t('streakerAchievement') .modal-footer - button.btn.btn-default.cancel(ng-click='$close()')=env.t('ok') + button.btn.btn-default(ng-click='$close()')=env.t('ok') // Max Gear script(id='modals/achievements/ultimateGear.html', type='text/ng-template') @@ -16,7 +16,7 @@ script(id='modals/achievements/ultimateGear.html', type='text/ng-template') .achievement.achievement-armor =env.t('gearAchievement') .modal-footer - button.btn.btn-default.cancel(ng-click='$close()')=env.t('ok') + button.btn.btn-default(ng-click='$close()')=env.t('ok') // Beast Master script(id='modals/achievements/beastMaster.html', type='text/ng-template') @@ -27,7 +27,7 @@ script(id='modals/achievements/beastMaster.html', type='text/ng-template') .achievement.achievement-rat =env.t('beastAchievement') .modal-footer - button.btn.btn-default.cancel(ng-click='$close()')=env.t('ok') + button.btn.btn-default(ng-click='$close()')=env.t('ok') // Contributor // activated by user.flags.contributor @@ -40,7 +40,7 @@ script(id='modals/achievements/contributor.html', type='text/ng-template') !=env.t('contribModal', {name: "{{user.profile.name}}", level: "{{user.contributor.level}}"}) a(href='http://habitrpg.wikia.com/wiki/Contributor_Rewards' target='_blank')=env.t('contribLink') .modal-footer - button.btn.btn-default.cancel(ng-click='set({"flags.contributor":false}); $close()')=env.t('ok') + button.btn.btn-default(ng-click='set({"flags.contributor":false}); $close()')=env.t('ok') //Rebirth script(id='modals/achievements/rebirth.html', type='text/ng-template') @@ -50,4 +50,4 @@ script(id='modals/achievements/rebirth.html', type='text/ng-template') .achievement.achievement-sun =env.t('rebirthAchievement', {number: "{{user.achievements.rebirths}}", level: "{{user.achievements.rebirthLevel}}"}) .modal-footer - button.btn.btn-default.cancel(ng-click='$close()')=env.t('ok') + button.btn.btn-default(ng-click='$close()')=env.t('ok') diff --git a/views/shared/modals/buy-gems.jade b/views/shared/modals/buy-gems.jade index fface7fe89..8c3f0faa52 100644 --- a/views/shared/modals/buy-gems.jade +++ b/views/shared/modals/buy-gems.jade @@ -29,4 +29,4 @@ script(id='modals/buyGems.html', type='text/ng-template') div(ng-include="'partials/options.settings.subscription.html'") .modal-footer - button.btn.btn-default.cancel(ng-click='$close()')=env.t('cancel') + button.btn.btn-default(ng-click='$close()')=env.t('cancel') diff --git a/views/shared/modals/classes.jade b/views/shared/modals/classes.jade index 089eaf7e34..097b8ee927 100644 --- a/views/shared/modals/classes.jade +++ b/views/shared/modals/classes.jade @@ -72,5 +72,5 @@ script(type='text/ng-template', id='modals/chooseClass.html') .well(ng-show='selectedClass=="healer"')=env.t('healerText') .modal-footer - button.btn.btn-small.btn-danger.cancel(ng-click='user.ops.disableClasses({}); $close()', popover-placement='top', popover-trigger='mouseenter', popover=env.t('optOutText'))=env.t('optOut') - button.btn.btn-primary.cancel(ng-disabled='!selectedClass' ng-click='changeClass(selectedClass); $close()')=env.t('select') \ No newline at end of file + button.btn.btn-sm.btn-danger(ng-click='user.ops.disableClasses({}); $close()', popover-placement='top', popover-trigger='mouseenter', popover=env.t('optOutText'))=env.t('optOut') + button.btn.btn-primary(ng-disabled='!selectedClass' ng-click='changeClass(selectedClass); $close()')=env.t('select') \ No newline at end of file diff --git a/views/shared/modals/death.jade b/views/shared/modals/death.jade index 4c756524d7..842564835a 100644 --- a/views/shared/modals/death.jade +++ b/views/shared/modals/death.jade @@ -11,6 +11,6 @@ script(type='text/ng-template', id='modals/death.html') .row .col-md-3 p - a.btn.btn-danger.btn-large(ng-click='user.ops.revive({}); $close()')=env.t('continue') + a.btn.btn-danger.btn-lg(ng-click='user.ops.revive({}); $close()')=env.t('continue') .col-md-9 p=env.t('dieText') diff --git a/views/shared/modals/drops.jade b/views/shared/modals/drops.jade index a7904187a0..c2dbac24af 100644 --- a/views/shared/modals/drops.jade +++ b/views/shared/modals/drops.jade @@ -10,4 +10,4 @@ script(type='text/ng-template', id='modals/dropsEnabled.html') span.item-drop-icon(class='Pet_Currency_Gem') span!=env.t('useGems') .modal-footer - button.btn.btn-default.cancel(ng-click='$close()')=env.t('close') \ No newline at end of file + button.btn.btn-default(ng-click='$close()')=env.t('close') \ No newline at end of file diff --git a/views/shared/modals/new-stuff.jade b/views/shared/modals/new-stuff.jade index a838aa32ea..b198fdb3ca 100644 --- a/views/shared/modals/new-stuff.jade +++ b/views/shared/modals/new-stuff.jade @@ -10,7 +10,7 @@ script(type='text/ng-template', id='modals/mathUpdates.html') br p iOS users, iTunes is on vacation until 12/28. Until we can push the updated app, you'll need to sync periodically to get the corrected numbers (app has old math, server saves the correct numbers). Android goes out ASAP. More info on Trello. .modal-footer - button.btn.btn-default.cancel(ng-click='User.set({"flags.mathUpdates":true}); $close()') Dismiss + button.btn.btn-default(ng-click='User.set({"flags.mathUpdates":true}); $close()') Dismiss script(type='text/ng-template', id='modals/newStuff.html') .modal-header @@ -501,5 +501,5 @@ script(type='text/ng-template', id='modals/newStuff.html') a(href='https://trello.com/card/custom-day-start/50e5d3684fe3a7266b0036d6/15') Add custom day start .modal-footer - button.btn.btn-default.cancel(ng-click='$close()') Cool - button.btn.btn-warning.cancel(ng-click='dismissAlert(); $close()') Dismiss This Alert + button.btn.btn-default(ng-click='$close()') Cool + button.btn.btn-warning(ng-click='dismissAlert(); $close()') Dismiss This Alert diff --git a/views/shared/modals/quests.jade b/views/shared/modals/quests.jade index a7e2e5e451..8635b192ad 100644 --- a/views/shared/modals/quests.jade +++ b/views/shared/modals/quests.jade @@ -19,7 +19,7 @@ script(type='text/ng-template', id='modals/questCompleted.html') p {{Content.quests[user.party.quest.completed].completion}} quest-rewards(key='{{user.party.quest.completed}}', header=env.t('youReceived')) .modal-footer - button.btn.btn-default.btn-primary(ng-click='set({"party.quest.completed":""}); $close()')=env.t('accept') + button.btn.btn-primary(ng-click='set({"party.quest.completed":""}); $close()')=env.t('accept') script(type='text/ng-template', id='modals/showQuest.html') .modal-header @@ -33,8 +33,8 @@ script(type='text/ng-template', id='modals/showQuest.html') .npc_ian.pull-left p=env.t('questSend') .modal-footer - button.btn.btn-default.btn-small.btn-cancel(ng-click='closeQuest(); $close()')=env.t('cancel') - button.btn.btn-default.btn-primary(ng-click='questInit(); $close()')=env.t('inviteParty') + button.btn.btn-default(ng-click='closeQuest(); $close()')=env.t('cancel') + button.btn.btn-primary(ng-click='questInit(); $close()')=env.t('inviteParty') script(type='text/ng-template', id='modals/buyQuest.html') .modal-header @@ -44,8 +44,8 @@ script(type='text/ng-template', id='modals/buyQuest.html') div(ng-bind-html='selectedQuest.notes') quest-rewards(key='{{selectedQuest.key}}') .modal-footer - button.btn.btn-large.cancel(ng-click='closeQuest(); $close()')=env.t('neverMind') - button.btn.btn-default.btn-large.btn-primary(ng-click='purchase("quests", quest); closeQuest(); $close()')=env.t('buyQuest') + button.btn.btn-default(ng-click='closeQuest(); $close()')=env.t('neverMind') + button.btn.btn-primary(ng-click='purchase("quests", quest); closeQuest(); $close()')=env.t('buyQuest') script(type='text/ng-template', id='modals/questInvitation.html') .modal-header @@ -55,6 +55,6 @@ script(type='text/ng-template', id='modals/questInvitation.html') div(ng-bind-html='Content.quests[party.quest.key].notes') quest-rewards(key='{{party.quest.key}}') .modal-footer - button.btn.btn-default.btn-small.btn-cancel(ng-click='questHold = true; $close()')=env.t('askLater') - button.btn.btn-default.btn-small.btn-cancel(ng-click='party.$questReject(); $close()')=env.t('reject') - button.btn.btn-default.btn-primary(ng-click='party.$questAccept(); $close()')=env.t('accept') + button.btn.btn-default(ng-click='questHold = true; $close()')=env.t('askLater') + button.btn.btn-default(ng-click='party.$questReject(); $close()')=env.t('reject') + button.btn.btn-primary(ng-click='party.$questAccept(); $close()')=env.t('accept') diff --git a/views/shared/modals/rebirth.jade b/views/shared/modals/rebirth.jade index 4eeb07f7df..495eccdaab 100644 --- a/views/shared/modals/rebirth.jade +++ b/views/shared/modals/rebirth.jade @@ -8,7 +8,7 @@ script(type='text/ng-template', id='modals/rebirthEnabled.html') p span=env.t('rebirthUnlock') .modal-footer - button.btn.btn-default.cancel(ng-click='$close()')=env.t('close') + button.btn.btn-default(ng-click='$close()')=env.t('close') script(type='text/ng-template', id='modals/rebirth.html') .modal-header @@ -35,12 +35,12 @@ script(type='text/ng-template', id='modals/rebirth.html') .achievement-sun.pull-left(style='margin-right: 5px') p=env.t('rebirthEarnAchievement') .modal-footer - button.btn.btn-default.btn-large.cancel(ng-click='$close()')=env.t('neverMind') + button.btn.btn-default(ng-click='$close()')=env.t('neverMind') span(ng-if='user.balance < 2') - a.btn.btn-success.btn-large(ng-click='openModal("buyGems")')=env.t('buyMoreGems') + a.btn.btn-success(ng-click='openModal("buyGems")')=env.t('buyMoreGems') span.gem-cost=env.t('notEnoughGems') span(ng-if='user.balance >= 2', ng-controller='SettingsCtrl') - a.btn.btn-danger.btn-large(ng-click='$close(); rebirth()')=env.t('beReborn') + a.btn.btn-danger(ng-click='$close(); rebirth()')=env.t('beReborn') span.gem-cost | 8  =env.t('gems') diff --git a/views/shared/modals/reroll.jade b/views/shared/modals/reroll.jade index f01d53e4ea..ae7460b44d 100644 --- a/views/shared/modals/reroll.jade +++ b/views/shared/modals/reroll.jade @@ -7,12 +7,12 @@ script(type='text/ng-template', id='modals/reroll.html') p=env.t('fortifyText') .modal-footer - button.btn.btn-default.btn-large.cancel(ng-click='$close()')=env.t('neverMind') + button.btn.btn-default(ng-click='$close()')=env.t('neverMind') span(ng-if='user.balance < 1') - a.btn.btn-success.btn-large(ng-click='openModal("buyGems")')=env.t('buyMoreGems') + a.btn.btn-success(ng-click='openModal("buyGems")')=env.t('buyMoreGems') span.gem-cost=env.t('notEnoughGems') span(ng-if='user.balance >= 1', ng-controller='SettingsCtrl') - a.btn.btn-danger.btn-large(ng-click='$close(); reroll()')=env.t('fortify') + a.btn.btn-danger(ng-click='$close(); reroll()')=env.t('fortify') span.gem-cost | 4  = env.t('gems') diff --git a/views/shared/modals/settings.jade b/views/shared/modals/settings.jade index 149d39d6cf..15db914df2 100644 --- a/views/shared/modals/settings.jade +++ b/views/shared/modals/settings.jade @@ -5,7 +5,7 @@ script(type='text/ng-template', id='modals/reset.html') p=env.t('resetText1') p=env.t('resetText2') .modal-footer - button.btn.btn-default.cancel(ng-click='$close();')=env.t('neverMind') + button.btn.btn-default(ng-click='$close();')=env.t('neverMind') button.btn.btn-danger(ng-click='$close(); reset()')=env.t('resetDo') script(type='text/ng-template', id='modals/restore.html') @@ -46,9 +46,9 @@ script(type='text/ng-template', id='modals/restore.html') label.control-label=env.t('fix21Streaks') //- This is causing too many problems for users h3=env.t('other') - a.btn.btn-small.btn-warning(ng-controller='FooterCtrl', ng-click='addMissedDay()')=env.t('triggerDay') + a.btn.btn-sm.btn-warning(ng-controller='FooterCtrl', ng-click='addMissedDay()')=env.t('triggerDay') .modal-footer - button.btn.btn-default.cancel(ng-click='$close()')=env.t('discardChanges') + button.btn.btn-default(ng-click='$close()')=env.t('discardChanges') button.btn.btn-primary(ng-click='restore(); $close();')=env.t('saveAndClose') script(type='text/ng-template', id='modals/delete.html') @@ -62,4 +62,4 @@ script(type='text/ng-template', id='modals/delete.html') input.form-control(type='text', ng-model='_deleteAccount') .modal-footer button.btn.btn-default(ng-click='$close()')=env.t('neverMind') - button.btn.btn-danger.btn-small(ng-disabled='_deleteAccount != "DELETE"', ng-click='$close(); delete()')=env.t('deleteDo') + button.btn.btn-danger(ng-disabled='_deleteAccount != "DELETE"', ng-click='$close(); delete()')=env.t('deleteDo') diff --git a/views/shared/profiles/achievements.jade b/views/shared/profiles/achievements.jade index 64cb816b10..ccf0468a4f 100644 --- a/views/shared/profiles/achievements.jade +++ b/views/shared/profiles/achievements.jade @@ -24,8 +24,8 @@ div(ng-if='profile.contributor.level || user._id == profile._id') .achievement.achievement-firefox(ng-if='profile.contributor.level') div(ng-class='{muted: !profile.contributor.level}') h5 - span.label(ng-if='profile.contributor.level', class='label-contributor-{{profile.contributor.level}}') {{contribText(profile.contributor, profile.backer)}} - span.label(ng-if='!profile.contributor.level')=env.t('contribName') + span.label.label-default(ng-if='profile.contributor.level', class='label-contributor-{{profile.contributor.level}}') {{contribText(profile.contributor, profile.backer)}} + span.label.label-default(ng-if='!profile.contributor.level')=env.t('contribName') small =env.t('contribText') a(href='http://habitrpg.wikia.com/wiki/Contributing_to_HabitRPG', target='_blank')=env.t('readMore') diff --git a/views/shared/tasks/task.jade b/views/shared/tasks/task.jade index 633eb414bc..cfda0f99b3 100644 --- a/views/shared/tasks/task.jade +++ b/views/shared/tasks/task.jade @@ -118,7 +118,7 @@ li(bindonce='list', bo-id='"task-"+task.id', ng-repeat='task in obj[list.type+"s // Checklists div(ng-if='!$state.includes("options.social.challenges")') - button.btn.btn-deafult.btn-small(ng-if='!task.checklist[0] && (task.type=="daily" || task.type=="todo")',ng-click='addChecklist(task)') + button.btn.btn-deafult.btn-sm(ng-if='!task.checklist[0] && (task.type=="daily" || task.type=="todo")',ng-click='addChecklist(task)') span.glyphicon.glyphicon-tasks |     =env.t('addChecklist') diff --git a/views/static/front.jade b/views/static/front.jade index 379ce36a8f..abd69a049b 100644 --- a/views/static/front.jade +++ b/views/static/front.jade @@ -16,7 +16,7 @@ block content //while acting similarly to a logo h1#tagline=env.t('tagline') p.lead - button.btn.btn-primary.btn-large#frontpage-play-button(ng-click='playButtonClick()')=env.t('playButton') + button.btn.btn-primary.btn-lg#frontpage-play-button(ng-click='playButtonClick()')=env.t('playButton') hr img(src='/marketing/devices.png') //we'd want the tagline centered, for sure, and a bit more pop, but without using jumbotron diff --git a/views/static/login-modal.jade b/views/static/login-modal.jade index b17d41d171..5d5a5b917f 100644 --- a/views/static/login-modal.jade +++ b/views/static/login-modal.jade @@ -47,7 +47,7 @@ script(id='modals/login.html', type='text/ng-template') input.form-control(type='text', name='email', placeholder=env.t('email') , ng-model='passwordResetEmail') //span.help-inline {.errors.passwordReset} .form-group - input.btn(type='submit', value=env.t('submit')) + input.btn.btn-default(type='submit', value=env.t('submit')) .tab-pane#register-tab form(ng-submit='register()', name='registrationForm') diff --git a/views/static/plans.jade b/views/static/plans.jade index e062d398e2..c8446edd8f 100644 --- a/views/static/plans.jade +++ b/views/static/plans.jade @@ -94,8 +94,8 @@ block content th //| Price td - a.btn.muted(href='https://docs.google.com/forms/d/17torT7OlxgtbHAPdBDRQNG2lTdIQyrGXk4O2YXvUMig/viewform',popover=env.t('notYetPlan'),popover-placement='right',popover-trigger='mouseenter')=env.t('contactUs') + a.btn.btn-default.muted(href='https://docs.google.com/forms/d/17torT7OlxgtbHAPdBDRQNG2lTdIQyrGXk4O2YXvUMig/viewform',popover=env.t('notYetPlan'),popover-placement='right',popover-trigger='mouseenter')=env.t('contactUs') td - a.btn.muted(href='https://docs.google.com/forms/d/17torT7OlxgtbHAPdBDRQNG2lTdIQyrGXk4O2YXvUMig/viewform',popover=env.t('notYetPlan'),popover-placement='right',popover-trigger='mouseenter')=env.t('contactUs') + a.btn.btn-default.muted(href='https://docs.google.com/forms/d/17torT7OlxgtbHAPdBDRQNG2lTdIQyrGXk4O2YXvUMig/viewform',popover=env.t('notYetPlan'),popover-placement='right',popover-trigger='mouseenter')=env.t('contactUs') td a.btn.btn-primary(href='https://docs.google.com/forms/d/12Jqj_8f3oQS0B3ZUHewHbK61uLjBdzBeB0zyEqB9lxM/viewform')=env.t('contactUs') \ No newline at end of file