diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d1bc8a521..7f0ca264e 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -2,6 +2,16 @@ class ApplicationController < ActionController::Base protect_from_forgery :except => :receive layout 'application' before_filter :set_friends + + layout :layout_by_resource + + def layout_by_resource + if devise_controller? + "session_wall" + else + "application" + end + end def set_friends @friends = Friend.all diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml index f560b84b6..c291361cd 100644 --- a/app/views/devise/sessions/new.html.haml +++ b/app/views/devise/sessions/new.html.haml @@ -1,12 +1,11 @@ -%div.centered - - = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| - = f.text_field :email - %br += form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| + %p = f.password_field :password - %p - - if devise_mapping.rememberable? - = f.check_box :remember_me - = f.label :remember_me - = f.submit "Sign in" - = render :partial => "devise/shared/links" + %p + - if devise_mapping.rememberable? + /= f.check_box :remember_me + /= f.label :remember_me + + = hidden_field_tag "user_email", "#{User.first.email}", :name => "user[email]" + = f.submit "Sign in" +/= render :partial => "devise/shared/links" diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index a2e61aa18..3f064d2c0 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -127,7 +127,7 @@ ul#stream { li.message { line-height: 140%; - font-family: "Lucida Grande"; + font-family: "Lucida Grande", "sans-serif"; color: #999999; } li.message span.from { color: black; diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index bf9fef9d7..662225b86 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -239,3 +239,7 @@ ul.comment_set img#profile_picture :width 100% + + + +