mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-08-05 12:02:13 +00:00
done trying to futz with user-menu css for maintaining visibility when
header hidden. Instead, just put it elsewhere in html if header hidden. fixes #981
This commit is contained in:
parent
4c0fe42d4e
commit
92e8e5b597
2 changed files with 35 additions and 36 deletions
|
|
@ -1,44 +1,42 @@
|
|||
<header:>
|
||||
<header class="site-header" role="banner" data-partySize="{#if gt(_partyMembers.length,1)}{truarr(_partyMembers.length)}{else}0{/}">
|
||||
<span class="{#if equal(_user.preferences.hideHeader,true)}hidden{/}">
|
||||
<!-- avatar -->
|
||||
<div class="herobox-wrap main-herobox">
|
||||
<app:avatar:avatar profile={_user} main=true>
|
||||
<header class="site-header {#if _user.preferences.hideHeader}hidden{/}" role="banner" data-partySize="{#if gt(_partyMembers.length,1)}{truarr(_partyMembers.length)}{else}0{/}">
|
||||
<!-- avatar -->
|
||||
<div class="herobox-wrap main-herobox">
|
||||
<app:avatar:avatar profile={_user} main=true>
|
||||
</div>
|
||||
|
||||
<!-- stat bars -->
|
||||
<div class="hero-stats">
|
||||
<div class="meter health" title="Health">
|
||||
<div class="bar" style="width: {percent(_user.stats.hp, 50)}%;"></div>
|
||||
<span class="meter-text"><i class=icon-heart></i> {ceil(_user.stats.hp)} / 50</span>
|
||||
</div>
|
||||
|
||||
<!-- stat bars -->
|
||||
<div class="hero-stats">
|
||||
<div class="meter health" title="Health">
|
||||
<div class="bar" style="width: {percent(_user.stats.hp, 50)}%;"></div>
|
||||
<span class="meter-text"><i class=icon-heart></i> {ceil(_user.stats.hp)} / 50</span>
|
||||
</div>
|
||||
|
||||
<div class="meter experience" title="Experience">
|
||||
<div class="bar" style="width: {percent(_user.stats.exp,tnl(_user.stats.lvl))}%;"></div>
|
||||
<span class="meter-text">
|
||||
{#if _user.history.exp}
|
||||
<a x-bind=click:toggleChart data-toggle-id="exp-chart" data-history-path="_user.history.exp" rel=tooltip title="Progress"><i class=icon-signal></i></a>
|
||||
{/}
|
||||
<i class=icon-star></i> {floor(_user.stats.exp)} / {tnl(_user.stats.lvl)}
|
||||
</span>
|
||||
</div>
|
||||
<div class="meter experience" title="Experience">
|
||||
<div class="bar" style="width: {percent(_user.stats.exp,tnl(_user.stats.lvl))}%;"></div>
|
||||
<span class="meter-text">
|
||||
{#if _user.history.exp}
|
||||
<a x-bind=click:toggleChart data-toggle-id="exp-chart" data-history-path="_user.history.exp" rel=tooltip title="Progress"><i class=icon-signal></i></a>
|
||||
{/}
|
||||
<i class=icon-star></i> {floor(_user.stats.exp)} / {tnl(_user.stats.lvl)}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- party -->
|
||||
<!-- I have an idea to use this loop for the user's herobox/avatar as well
|
||||
NOTE TO SELF: Ask Tyler if some kind of inter-leaving is possible
|
||||
where we can put ONE of the results of this loop BEFORE the progress bars, and the rest after-->
|
||||
{{#each _partyMembers as :member}}
|
||||
<div class="herobox-wrap" style="{{#if equal(:member.id, _userId)}}display:none;{{/}}">
|
||||
{{#unless equal(:member.id, _userId)}}
|
||||
<app:avatar:avatar profile={{:member}} party="true" />
|
||||
<!-- Would be way cleaner as a Derby template `data-content="<app:party:member-stats profile={{:member}} />"`, but it was just printing HTML as text -->
|
||||
<!-- I've re-implemented the rollover using the actual `herobox`/avatar template and data-attributes.
|
||||
This Derby template idea would have been really handy but this is pretty versatile, and keeps it all in the avatar section -->
|
||||
{{/}}
|
||||
</div>
|
||||
{{/}}
|
||||
</span>
|
||||
<!-- party -->
|
||||
<!-- I have an idea to use this loop for the user's herobox/avatar as well
|
||||
NOTE TO SELF: Ask Tyler if some kind of inter-leaving is possible
|
||||
where we can put ONE of the results of this loop BEFORE the progress bars, and the rest after-->
|
||||
{{#each _partyMembers as :member}}
|
||||
<div class="herobox-wrap" style="{{#if equal(:member.id, _userId)}}display:none;{{/}}">
|
||||
{{#unless equal(:member.id, _userId)}}
|
||||
<app:avatar:avatar profile={{:member}} party="true" />
|
||||
<!-- Would be way cleaner as a Derby template `data-content="<app:party:member-stats profile={{:member}} />"`, but it was just printing HTML as text -->
|
||||
<!-- I've re-implemented the rollover using the actual `herobox`/avatar template and data-attributes.
|
||||
This Derby template idea would have been really handy but this is pretty versatile, and keeps it all in the avatar section -->
|
||||
{{/}}
|
||||
</div>
|
||||
{{/}}
|
||||
|
||||
<app:alerts:hiding-bailey />
|
||||
</header>
|
||||
|
|
@ -38,6 +38,7 @@
|
|||
<div id="notification-area"></div>
|
||||
<div id="wrap">
|
||||
<app:alerts:flash />
|
||||
{#if _user.preferences.hideHeader}<app:settings:menu />{/} <!-- if they hide the header, we still need user-menu visible -->
|
||||
<div id="exp-chart" style="display:none;"></div>
|
||||
|
||||
<div id=main class="grid">
|
||||
|
|
|
|||
Loading…
Reference in a new issue