Permalink
Browse files

moving about to header nav, more style changes

  • Loading branch information...
1 parent e2a2ca2 commit c04d0d52195de8796097687b0eb8f2be1e74d7f7 @aaronpowell committed Feb 19, 2011
Showing with 16 additions and 8 deletions.
  1. +11 −3 public/css/main.css
  2. +5 −5 views/layout.haml
View
@@ -53,7 +53,6 @@ em {
#title {
font-size: 3.2em;
- width: 500px;
display:inline-block;
}
@@ -62,7 +61,7 @@ em {
text-decoration:none;
}
-#user-panel {
+nav {
float:right;
display:inline-block;
padding:10px 25px;
@@ -71,9 +70,18 @@ em {
color: #fff;
font-weight:bold;
text-align:center;
+ margin-right: 10px;
}
-#user-panel a, #user-panel a:hover, #user-panel a:visited {
+nav.user {
+ background-color: #113e7a;
+}
+
+nav:last {
+ margin-right:none;
+}
+
+nav a, nav a:hover, nav a:visited {
color: #fff;
}
View
@@ -5,26 +5,26 @@
%link{:href => '/css/main.css', :rel => 'stylesheet', :type => 'text/css'}
/[if lte IE 8]
:javascript
- document.createElement('footer');document.createElement('header');
+ document.createElement('footer');document.createElement('header');document.createElement('nav');
%body
#content
%header
%h1#title
%a{:href => '/'} Doin' Nothin'!
+ %nav
+ %a{:href => '/about', :title => 'About'} About
- if authorized?
- #user-panel.logged-in
+ %nav.user.logged-in
Hello #{session[:username]}!
%a{:href => '/sessions'} Sessions
|
%a{:href => '/logout'} Logout
- else
- #user-panel.logged-out
+ %nav.user.logged-out
%a{:href => '/login'} Login
%div#view
=yield
%footer
- %a{:href => '/about', :title => 'About'} About
- %br
A
%a{:href => "http://http://www.sinatrarb.com", :title => "Sinatra"} Sinatra
\+

0 comments on commit c04d0d5

Please sign in to comment.