Merge branch 'master' into ical

This commit is contained in:
Tyler Renelle 2013-02-16 16:20:34 -05:00
commit 29fecb36c8
4 changed files with 9 additions and 2 deletions

View file

@ -35,7 +35,7 @@
<body>
<div class='container'>
<div class='marketing'>
<img class='rotate-img' src="/img/BrowserQuest/habitrpg_mods/armor3.png" />
<img class='rotate-img' src="/img/BrowserQuest/habitrpg_mods/armor3_m.png" />
<h2>The server is under heavy load or is experiencing issues.</h2>
<p><a href="/">Try again</a> in a few, the developer has been notified. In the meantime, Habit could use your support to get these issues squared away - please consider backing the Kickstarter Campaign.</p>
<a href="http://kck.st/XoA3Yg" class='btn btn-success btn-large'>Kickstarter</a>

View file

@ -156,6 +156,7 @@ setupGrowlNotifications = (model) ->
#don't show notifications if user dead
return if user.get('stats.lvl') == 0
$.bootstrapGrowl html,
ele: '#notification-area',
type: type # (null, 'info', 'error', 'success')
top_offset: 20
align: 'right' # ('left', 'right', or 'center')

View file

@ -191,4 +191,9 @@ html,body,p,h1,ul,li,table,tr,th,td
.notification-action
vertical-align: baseline
#reset-modal
z-index:1500
z-index:1500
#notification-area
position: fixed;
top: 0;
right: 0px;
z-index: 1001;

View file

@ -309,6 +309,7 @@ do a find for the string after "→"
<Body:>
<br/>
<div id="notification-area"></div>
<div id=wrap class="container-fluid">
<app:alerts />