Add bailey the crier for alerts. move CHANGELOG.md into the modal

This commit is contained in:
Tyler Renelle 2013-05-02 16:48:24 +01:00
parent a40a41fa9c
commit 77bd61c244
9 changed files with 72 additions and 28 deletions

View file

@ -1,17 +0,0 @@
## 3/27/2013
* Drop system + pets overhaul
* http://www.kickstarter.com/projects/lefnire/habitrpg-mobile/posts/439433
* https://trello.com/card/pets/50e5d3684fe3a7266b0036d6/166
## 3/21/2013
* More design tweaks to header & avatars: https://github.com/lefnire/habitrpg/issues/585
## 3/20/2013
* New Design: https://github.com/lefnire/habitrpg/issues/585
* Toggle helm visible: https://trello.com/card/toggle-helm-visible/50e5d3684fe3a7266b0036d6/153
* Toggle Header: https://trello.com/card/toggle-header/50e5d3684fe3a7266b0036d6/241
* Deletable Accounts: https://trello.com/card/deletable-accounts/50e5d3684fe3a7266b0036d6/69
* Undo Button: https://trello.com/card/undo-button/50e5d3684fe3a7266b0036d6/20
## 3/3/2013
* Add custom day start: https://trello.com/card/custom-day-start/50e5d3684fe3a7266b0036d6/15

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
public/img/npcs/bailey.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

View file

@ -83,4 +83,18 @@ borderDarken = 20%
z-index: 3000
position:absolute
left:5px
top:5px
top:5px
// Bailey
.rewards-module
z-index:2000
.hiding-bailey
cursor: pointer
position:absolute
right: 50px
top: 117px //FIXME this isn't a good method, but i suck at css - tyler
.new-stuff-word-bubble-container
height: 90px

View file

@ -147,3 +147,6 @@ hr
top: 0;
right: 0px;
z-index: 1001;
.modal-body
margin: 10px

View file

@ -1,11 +1,54 @@
<newStuff:>
{#if equal(_user.flags.newStuff,'show')}
<div class='new-stuff'>
<p class='alert alert-success'>
<a href="https://github.com/lefnire/habitrpg/blob/develop/CHANGELOG.md" target="_blank">New Stuff!</a> <a x-bind="click:closeNewStuff"><i class='icon-remove'></i></a>
</p>
<modals:>
<app:modals:modal modalId='new-stuff-modal' header="New Stuff">
<p class='new-stuff-word-bubble-container'>
<img src="/img/npcs/bailey.png" />
</div>
<div class="popover fade right in" style="top: 0px; left: 100px; display: block;">
<div class="arrow"></div>
<h3 class="popover-title">Bailey</h3>
<div class="popover-content"><a target="_blank" href="http://www.kickstarter.com/profile/mihakuu">Bailey</a> the Crier here! Announcing new stuff!</div>
</div>
</p>
<hr/>
<p>
<h4>3/27/2013</h4>
<ul>
<li>Drop system + pets overhaul (<a href="http://www.kickstarter.com/projects/lefnire/habitrpg-mobile/posts/439433">Blog Post</a> | <a href="https://trello.com/card/pets/50e5d3684fe3a7266b0036d6/166">Trello Card</a>)</li>
</ul>
<h4>3/21/2013</h4>
<ul>
<li><a href="https://github.com/lefnire/habitrpg/issues/585">More design tweaks to header & avatars</a></li>
</ul>
<h4>3/20/2013</h4>
<ul>
<li><a href="https://github.com/lefnire/habitrpg/issues/585">New Design</a></li>
<li><a href="https://trello.com/card/toggle-helm-visible/50e5d3684fe3a7266b0036d6/153">Toggle helm visible</a></li>
<li><a href="https://trello.com/card/toggle-header/50e5d3684fe3a7266b0036d6/241">Toggle Header</a></li>
<li><a href="https://trello.com/card/deletable-accounts/50e5d3684fe3a7266b0036d6/69">Deletable Accounts</a></li>
<li><a href="https://trello.com/card/undo-button/50e5d3684fe3a7266b0036d6/20">Undo Button</a></li>
</ul>
<h4>3/3/2013</h4>
<ul>
<li><a href="https://trello.com/card/custom-day-start/50e5d3684fe3a7266b0036d6/15">Add custom day start</a></li>
</ul>
</p>
<@footer>
<button class="btn" data-dismiss="modal" aria-hidden="true" x-bind="click:closeNewStuff">Close</button>
</@footer>
</app:modals:modal>
<hiding-bailey:>
{#if equal(_user.flags.newStuff,'show')}
<img class='hiding-bailey' src="/img/npcs/bailey-face.png"
rel=tooltip title=Psst data-placement=top
data-toggle=modal data-target='#new-stuff-modal'
/>
{/}
<flash:>
@ -13,4 +56,4 @@
<ul class="unstyled alert alert-error">
{#each _flash.error as :error}<li>{:error}</li>{/}
</ul>
{/}
{/}

View file

@ -23,13 +23,13 @@
<Header:>
<app:modals:modals />
<ui:connectionAlert>
<app:alerts:newStuff />
<div class="header-wrap">
{#if _undo}<a x-bind="click:undo" class='label undo-button'>Undo</a>{/}
<app:settings:menu />
<app:header:header />
<app:alerts:hiding-bailey />
</div>
<Body:>

View file

@ -3,6 +3,7 @@
<app:avatar:modals />
<app:settings:modals />
<app:pets:modals />
<app:alerts:modals />
<!-- Game Over Modal -->
<div style="{#unless equal(_user.stats.lvl,0)}display:none;{/}">

View file

@ -1,5 +1,5 @@
<rewardsColumn:>
<div class="module">
<div class="module rewards-module">
<div class="task-column rewards">
<!-- cash or tokens -->
<span class='option-box pull-right wallet'>