dan/parsley
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ui update

Browse Source
This commit is contained in:
Dan Elbert 2016-01-20 20:29:08 -06:00
parent 712e393ccf
commit 568b42c12d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/application.scss
View File

@ -31,7 +31,7 @@ html {
} }
body { body {
/* Margin bottom by footer height */ /* Margin bottom by footer height */
margin-bottom: $footer_height; margin-bottom: $footer_height + 20;
background: image_url("grey_wash_wall.png"); background: image_url("grey_wash_wall.png");
} }

2
app/controllers/application_controller.rb
View File

@ -11,7 +11,7 @@ class ApplicationController < ActionController::Base
end end
def ensure_admin_user def ensure_admin_user
unless current_user && current_user.is_admin? unless current_user? && current_user.admin?
flash[:warning] = "You must login as an admin" flash[:warning] = "You must login as an admin"
redirect_to login_path redirect_to login_path
end end