From 34ec10189cc59ee8e9a92713c43a736e1d262781 Mon Sep 17 00:00:00 2001 From: Andrew Tomaka Date: Thu, 2 Oct 2014 17:06:30 -0400 Subject: [PATCH] Implement Bootstrap layout --- app/assets/stylesheets/custom.css.scss | 3 +++ app/views/layouts/application.html.erb | 35 ++++++++++++++++++++------ 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss index e69de29..e2b26c5 100644 --- a/app/assets/stylesheets/custom.css.scss +++ b/app/assets/stylesheets/custom.css.scss @@ -0,0 +1,3 @@ +body { + padding-top: 70px; +} diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 112cd5a..dfedfc2 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -8,16 +8,35 @@ -
-<% if current_user %> - Welcome, <%= current_user.name %>! - <%= link_to 'Logout', logout_path, id: 'logout' %> -<% else %> - <%= link_to 'Login with Google', '/auth/google_oauth2', id: 'login' %> -<% end %> + -<%= yield %> +
+ <%= yield %> +