From 568b42c12dc53e8673c9b2837e037cdb3c8f8981 Mon Sep 17 00:00:00 2001 From: Dan Elbert Date: Wed, 20 Jan 2016 20:29:08 -0600 Subject: [PATCH] ui update --- app/assets/stylesheets/application.scss | 2 +- app/controllers/application_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 775c97e..fee1554 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -31,7 +31,7 @@ html { } body { /* Margin bottom by footer height */ - margin-bottom: $footer_height; + margin-bottom: $footer_height + 20; background: image_url("grey_wash_wall.png"); } diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 5c6a2aa..778c726 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -11,7 +11,7 @@ class ApplicationController < ActionController::Base end 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" redirect_to login_path end