Skip to content

Commit

Permalink
Small fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
gabceb committed Feb 22, 2013
1 parent 53339a7 commit 9ac14de
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
6 changes: 1 addition & 5 deletions app/assets/stylesheets/_base.sass
Expand Up @@ -111,14 +111,10 @@ body
margin: -150px 320px 0 0

.about
p,h1,h3,
p,h1,h3,ul,
margin-left: auto
margin-right: auto
width: 600px
ul
margin-left: auto
margin-right: auto
width: 600px

.devise
padding-top: 20px
Expand Down
1 change: 0 additions & 1 deletion app/controllers/admin/admin_controller.rb
Expand Up @@ -5,7 +5,6 @@ def index
@settings = Setting.my_settings
@all_users = User.find(:all, :conditions => ["id != ?", current_user.id])

# Note that this reject! will remove users from all_users in order to show users in 2 different tables
@waiting_for_approval_users = []
@approved_users = []

Expand Down

0 comments on commit 9ac14de

Please sign in to comment.