Merge branch 'master' of github.com:diaspora/diaspora

app/views/shared/_group_nav.haml

@@ -14,12 +14,10 @@
         = render "groups/new_group"
 
   - if @group
-    %ul#friend_pictures
+    #friend_pictures
       - for friend in @group.people
-        %li
-          = person_image_link(friend)
-          = friend.real_name
-      %li= link_to (image_tag 'add_friend_button.png'), "#add_request_pane", :id => 'add_request_button'
+        = person_image_link(friend)
+      = link_to (image_tag 'add_friend_button.png'), "#add_request_pane", :id => 'add_request_button'
 
       .yo{:style => 'display:none'}
         #add_request_pane

public/stylesheets/application.css

@@ -302,10 +302,9 @@ label {
   position: relative;
   height: 80px; }
   #publisher textarea {
-    width: 95%;
+    width: 485px;
     height: 40px;
-    margin-top: 0;
-    -webkit-border-radius: 0; }
+    margin-top: 0; }
   #publisher .user_image img {
     height: 50px;
     padding-left: 10px; }
@@ -414,7 +413,7 @@ h1.big_text {
 
 #group {
   color: black;
-  background-color: #eeeeee; }
+  margin-bottom: 1em; }
   #group ul {
     margin: 0;
     padding: 0;
@@ -425,9 +424,9 @@ h1.big_text {
     #group ul .selected {
       color: black;
       font-weight: bold;
-      font-size: 24px; }
+      font-size: 30px; }
   #group #friend_pictures img {
-    height: 20px; }
+    height: 40px; }
 
 #add_photo_loader {
   position: absolute;

public/stylesheets/sass/application.sass

@@ -373,13 +373,11 @@ label
   :height 80px
 
   textarea
-    :width 95%
+    :width 485px
     :height 40px
     :margin
       :top 0
 
-    :-webkit-border-radius 0
-
   .user_image
     img
       :height 50px
@@ -527,8 +525,8 @@ h1.big_text
 
 #group
   :color #000
-  :background
-    :color #eee
+  :margin
+    :bottom 1em
   ul
     :margin 0
     :padding 0
@@ -544,11 +542,12 @@ h1.big_text
       :color #000
       :font
         :weight bold
-        :size 24px
+        :size 30px
 
   #friend_pictures
     img
-      :height 20px
+      :height 40px
+
 
 #add_photo_loader
   :position absolute