Merge branch 'master' of github.com:lefnire/habitrpg

Conflicts:
	styles/app/index.styl
This commit is contained in:
Tyler Renelle 2013-02-08 18:28:10 -05:00
commit 3d4de16c6e

View file

@ -18,13 +18,17 @@ html,body,p,h1,ul,li,table,tr,th,td
padding: 12px 16px
white-space: nowrap
position:fixed
width: 100%;
z-index: 1000;
width: 100%
z-index: 1000
#head .pull-right
margin-right: 2%
margin-left: 1%
.bootstrap-growl{
position:fixed !important
}
.color-worst pre
background-color: rgb(230, 184, 175)
.color-worse pre