group nav is now links to nothing

app/views/layouts/application.html.haml

@@ -18,8 +18,7 @@
     = csrf_meta_tag
     = yield(:head)
 
-    = javascript_include_tag 'satisfaction' , 'satisfaction-display'
+    = javascript_include_tag 'satisfaction', 'satisfaction-display'
-
     = javascript_include_tag 'jquery.html5_upload'
 
   %body
@@ -44,11 +43,11 @@
 
         #group
           %ul
-            %li.selected ACM
+            %li.selected= link_to "OTHER PRESIDENTS", root_path
-            %li FAMILY
+            %li= link_to "OSTATUS", ostatus_path
-            %li WORK
+            /%li= link_to "NEW YORK", "#"
-            %li HIGH SCHOOL
+            /%li= link_to "NEW CIRCLE", "#"
-          #user_pictures
+          #friend_pictures
             = link_to(person_image_tag(current_user), root_path)
             = link_to(person_image_tag(current_user), root_path)
             = link_to(person_image_tag(current_user), root_path)
@@ -63,6 +62,8 @@
             = link_to(person_image_tag(current_user), root_path)
             - for friend in @friends
               = person_image_link(friend)
+            .add_new
+              = link_to "+", requests_path
 
     .container
       - if user_signed_in?
@@ -85,9 +86,6 @@
 
     .container
       .span-24.last
-
         = yield
-
-
       .span-24.last
         = render "posts/debug"

public/stylesheets/application.css

@@ -84,7 +84,6 @@ header {
       text-shadow: none; }
   header #session_action {
     float: right;
-    top: 0;
     text-shadow: 0 1px 0 black;
     padding-right: 10px; }
     header #session_action a {
@@ -155,9 +154,10 @@ h3 {
   font-weight: bold; }
 
 form {
+  position: relative;
   font-size: 120%;
   margin: 1em;
-  margin-left: 0em; }
+    margin-left: 0em; }
 
 #user_name {
   margin-bottom: 20px; }
@@ -301,7 +301,8 @@ label {
   background-color: rgba(10, 81, 109, 0.05);
   border-bottom: 2px #999999 solid;
   color: #999999;
-  padding: 15px 1em; }
+  padding: 15px 1em;
+    padding-bottom: 30px; }
 
 #new_blog,
 #new_bookmark {
@@ -416,15 +417,22 @@ h1.big_text {
 #group {
   color: #333333; }
   #group ul {
-    font-size: 18px;
     margin: 0;
-    padding: 0; }
+    padding: 0;
+    font-size: 14px; }
     #group ul > li {
       display: inline;
       margin-right: 10px; }
-      #group ul > li.selected {
+      #group ul > li.selected, #group ul > li.selected a {
         color: white;
-        font-weight: bold; }
+        font-weight: bold;
-  #group #user_pictures img {
+        font-size: 18px; }
+  #group a {
+    color: #333333;
+    font-weight: normal; }
+  #group #friend_pictures .add_new {
+    display: inline;
+    font-size: 40px; }
+  #group #friend_pictures img {
     display: inline-block;
     height: 40px; }

public/stylesheets/sass/application.sass

@@ -97,7 +97,6 @@ header
       
   #session_action
     :float right
-    :top 0
     :text-shadow 0 1px 0 #000
     a
       :color #777
@@ -181,11 +180,11 @@ h3
     :weight bold
 
 form
+  :position relative
   :font
     :size 120%
   :margin 1em
-  :margin-left 0em
+    :left 0em
-
   
 #user_name
   :margin
@@ -365,6 +364,7 @@ label
     :bottom 2px #999 solid
   :color #999
   :padding 15px 1em
+    :bottom 30px
 
 #new_blog, 
 #new_bookmark
@@ -517,19 +517,31 @@ h1.big_text
 #group
   :color #333
   ul
-    :font-size 18px
     :margin 0
     :padding 0
+    :font
+      :size 14px
     > li
       :display inline
       :margin
         :right 10px
       
-      &.selected
+      &.selected, &.selected a
         :color #fff
-        :font-weight bold
+        :font
+          :weight bold
+          :size 18px
 
-  #user_pictures
+  a
+    :color #333
+    :font
+      :weight normal
+
+  #friend_pictures
+    .add_new
+      :display inline
+      :font
+        :size 40px
     img
       :display inline-block
       :height 40px