Permalink
Browse files

Standardizing header on logged in and logged out screens

  • Loading branch information...
1 parent 8179cca commit d2647634e348bf86dcf0a57ecc2a289e86551c77 @joshe committed Aug 28, 2011
Showing with 14 additions and 3 deletions.
  1. +3 −1 app/stylesheets/partials/_page.scss
  2. +6 −2 app/views/layouts/_header.html.haml
  3. +5 −0 public/stylesheets/style.css
@@ -85,4 +85,6 @@ header {
#main {}
-footer {}
+footer {
+ text-align: right;
+}
@@ -1,5 +1,9 @@
%h6.logo Welcome to iamin
- unless session[:user_id].nil?
.userInfo
- %span.user= "Hi #{@u.first_name}"
- = link_to 'Logout', :controller => "access", :action => "logout"
+ %span.user= "Hi "
+ = link_to "#{@u.first_name}", :controller => "access", :action => "show", :id => @u.id
+ = link_to 'Logout', :controller => "access", :action => "logout"
+- else
+ .userInfo
+ = link_to "Create an account", :controller => "access", :action => "new"
@@ -346,6 +346,11 @@ header div.userInfo {
text-align: right;
}
+/* line 88, ../../app/stylesheets/partials/_page.scss */
+footer {
+ text-align: right;
+}
+
/* line 1, ../../app/stylesheets/partials/_typography.scss */
h1, h2, h3, h4, h5, h6 {
color: #181818;

0 comments on commit d264763

Please sign in to comment.