Merge branch 'master' into develop

This commit is contained in:
Tyler Renelle 2013-02-17 02:46:36 -05:00
commit 0669511ebe
3 changed files with 7 additions and 1 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

View file

@ -25,6 +25,12 @@
background-repeat: repeat-x;
border-color: #252525;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
background:none;
color:black;
}
body {
padding-top:0px;
}
</style>
</head>
@ -32,7 +38,7 @@
<body>
<div class='jumbotron masthead'>
<div class='container'>
<h1>HabitRPG</h1>
<h1><img src="/img/logo/habitrpg_pixel.png" alt="HabitRPG"/></h1>
<p>A habit tracker app which treats your goals like a Role Playing Game. Level up as you succeed, lose HP as you fail, earn money to buy weapons and armor.</p>
<a href="http://kck.st/XoA3Yg" class='btn btn-success btn-large'>Kickstarter</a>
<a href="/?play=1" class='btn btn-primary btn-small'>Play</a>