tabs on top

app/views/layouts/application.html.haml

@@ -60,8 +60,10 @@
       .container
         #group
           %ul
+            %li= link_to "All Groups", root_url
             - for group in @groups
-              %li= link_to group.name, group
+              %li{:class => ("selected" if current_group?(group))}
+                = link_to group.name, group
             %li.new_group= link_to("new", "#add_group_pane", :id => "add_group_button")
 
           .yo{ :style => "display:none;"}

app/views/shared/_group_nav.haml

@@ -1,30 +1,9 @@
-#group
-  %ul
-    - if @group == :all
-      = link_to "All Groups", root_url, :class => "selected"
+#friend_pictures
+  - for friend in @friends
+    = person_image_link(friend)
+  = link_to (image_tag 'add_friend_button.png'), "#add_request_pane", :id => 'add_request_button'
 
-    - elsif @group
-      = link_to @group.name, @group, :class => "selected"
-      = link_to "edit", edit_group_path(@group)
-    
-    - for group in @groups
-      - unless (group.id.to_s == params[:id])
-        %li
-          = link_to group.name, group
-
-    %li.new_group= link_to("NEW GROUP", "#add_group_pane", :id => "add_group_button")
-
-    .yo{ :style => "display:none;"}
-      #add_group_pane
-        = render "groups/new_group"
-
-  - if @group
-    #friend_pictures
-      - for friend in @friends
-        = person_image_link(friend)
-      = link_to (image_tag 'add_friend_button.png'), "#add_request_pane", :id => 'add_request_button'
-
-      - unless @group == :all
-        .yo{:style => 'display:none'}
-          #add_request_pane
-            = render "requests/new_request"
+  - unless @group == :all
+    .yo{:style => 'display:none'}
+      #add_request_pane
+        = render "requests/new_request"

public/stylesheets/application.css

@@ -72,6 +72,7 @@ header {
     margin-bottom: 0;
   color: black;
   background-color: #333333;
+  border-bottom: 2px solid #666666;
   padding: 0; }
   header #diaspora_text {
     padding-top: 5px;
@@ -424,12 +425,24 @@ h1.big_text {
   color: black; }
   #group ul {
     margin: 0;
+      margin-bottom: -5px;
     padding: 0;
     list-style: none;
     font-size: 14px; }
     #group ul > li {
       display: inline;
-      margin-right: 2em; }
+      margin-right: 1.5em;
+      padding: 0.3em 0.5em; }
+      #group ul > li:hover {
+        background-color: #333333; }
+      #group ul > li a {
+        color: #999999; }
+        #group ul > li a:hover {
+          background: none; }
+    #group ul .selected {
+      background-color: white; }
+      #group ul .selected a {
+        color: black; }
 
 #friend_pictures img {
   height: 40px; }

public/stylesheets/sass/application.sass

@@ -78,6 +78,8 @@ header
   :color #000
   :background
     :color #333
+  :border
+    :bottom 2px solid #666
   :padding 0
 
   #diaspora_text
@@ -336,9 +338,6 @@ ul.comment_set
     :font
       :size larger
 
-
-
-
 #debug_info
   :margin-top 20px
 
@@ -540,6 +539,7 @@ h1.big_text
   :color #000
   ul
     :margin 0
+      :bottom -5px
     :padding 0
     :list
       :style none
@@ -548,7 +548,25 @@ h1.big_text
     > li
       :display inline
       :margin
-        :right 2em
+        :right 1.5em
+
+      :padding 0.3em 0.5em
+
+      &:hover
+        :background
+          :color #333
+
+      a
+        :color #999
+        
+        &:hover
+          :background none
+      
+    .selected
+      :background
+        :color #fff
+      a
+        :color #000
 
 #friend_pictures
   img