Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Bushido/kandan into style_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
HashNuke committed Apr 12, 2012
2 parents c2afda3 + a373e32 commit 63fc1fa
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
5 changes: 2 additions & 3 deletions README.md
Expand Up @@ -36,14 +36,13 @@ Just click launch on here https://bushi.do/apps/new?app=kandan; you and your tea
Looking for community help here

## Heroku
The following should work reliably on Heroku:
You'll need to have the [heroku gem](https://github.com/heroku/heroku) installed and to have an existing heroku account. Assuming that, this should work reliably on Heroku:

git clone https://github.com/Bushido/kandan.git
cd kandan
heroku create --stack cedar
git push heroku master
heroku run rake db:migrate kandan:bootstrap
heroku open
heroku run rake db:migrate kandan:bootstrap && heroku open


Your app should be up and running now. The admin email by default is `admin@kandan.me` with password `kandanadmin`, or you can sign up as another user.
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/_base.sass
Expand Up @@ -17,7 +17,7 @@
top: 0
background-color: $header-bg-1
+background-image(linear-gradient($header-bg-1, $header-bg-2))
z-index: 10
z-index: 90001
padding: 0 5px
+box-shadow(inset 0px -10px 10px -10px #000000)
border-bottom: 1px solid #FFF
Expand Down
6 changes: 3 additions & 3 deletions app/assets/stylesheets/_chat_area.sass
Expand Up @@ -123,10 +123,10 @@ html body .ui-tabs .ui-tabs-nav li

#mask_container
position: fixed
top: 64px !important
top: 0px
background: #E6EBEE url("/assets/page_bg.png") repeat
z-index: 9002
padding-top: 25px
z-index: 9000
padding-top: 55px
width: 80%

.corner_cover
Expand Down

0 comments on commit 63fc1fa

Please sign in to comment.