sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-05-22 13:48:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4177 from holyspecter/challenge-action-bacground-bug

Browse source 
Minor bug: In challenges area, Join button has a yellow background
This commit is contained in:
Tyler Renelle 2014-10-27 13:58:26 -06:00
commit 5d67995458
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
public/css/challenges.styl
View file

@ -6,6 +6,9 @@ ul.challenge-accordion-header-specs
margin: 2px 5px
float:left
&.transparent
background-color: transparent;
#create-challenge-btn
margin-bottom: 10px

4
views/options/social/challenges.jade
View file

@ -138,7 +138,7 @@ script(type='text/ng-template', id='partials/options.social.challenges.html')
.panel.panel-default(ng-repeat='challenge in challenges|filter:filterChallenges track by challenge._id ')
.panel-heading
ul.pull-right.challenge-accordion-header-specs
li(ng-if='challenge.official')
li.transparent(ng-if='challenge.official')
span.label.label-success=env.t('officialChallenge')
li {{challenge.group.name}}
li
@ -154,7 +154,7 @@ script(type='text/ng-template', id='partials/options.social.challenges.html')
span.inline-block.Pet_Currency_Gem1x
|  
=env.t('prize')
li
li.transparent
// leave / join
a.btn.btn-sm.btn-danger(ng-show='challenge._isMember', ng-click='clickLeave(challenge, $event)')
span.glyphicon.glyphicon-ban-circle