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

app/views/status_messages/_status_message.html.haml

@@ -10,12 +10,13 @@
     .from
       = link_to post.person.real_name, post.person
       .aspect
-        → 
-        - if post.public?
-          the world
-        - else
-          - for aspect in current_user.aspects_with_post( post.id )
-            = link_to aspect.name, aspect
+        ➔
+        %ul
+          - if post.public?
+            the world
+          - else
+            - for aspect in current_user.aspects_with_post( post.id )
+              %li= link_to aspect.name, aspect
 
       - if current_user.owns?(post)
         .destroy_link

public/stylesheets/application.css

@@ -165,6 +165,7 @@ li.message {
       font-family: "Helvetica neue", Arial, Helvetica, sans-serif;
       text-shadow: 0 1px white; }
       li.message .content .from .aspect {
+        cursor: default;
         display: inline;
         color: #bbbbbb;
         font-size: 12px; }
@@ -173,6 +174,17 @@ li.message {
           color: #bbbbbb; }
           li.message .content .from .aspect a:hover {
             text-decoration: underline; }
+        li.message .content .from .aspect ul {
+          display: inline;
+          margin: 0;
+          padding: 0;
+          list-style: none; }
+          li.message .content .from .aspect ul li {
+            display: inline; }
+            li.message .content .from .aspect ul li:after {
+              content: ","; }
+            li.message .content .from .aspect ul li:last-child:after {
+              content: ""; }
       li.message .content .from a {
         font-weight: bold; }
     li.message .content div.info {
@@ -373,10 +385,7 @@ textarea {
   height: auto;
   border-radius: 5px;
   -webkit-border-radius: 5px;
-  -moz-border-radius: 5px;
-  box-shadow: 0 1px 2px white;
-  -moz-box-shadow: 0 1px 2px white;
-  -webkit-box-shadow: 0 1px 2px white; }
+  -moz-border-radius: 5px; }
 
 .submit_block {
   text-align: right;

public/stylesheets/sass/application.sass

@@ -212,6 +212,7 @@ li.message
         :shadow 0 1px #fff
 
       .aspect
+        :cursor default
         :display inline
         :color #bbb
         :font
@@ -224,6 +225,18 @@ li.message
           &:hover
             :text
               :decoration underline
+        ul
+          :display inline
+          :margin 0
+          :padding 0
+          :list
+            :style none
+          li
+            :display inline
+            &:after
+              :content ","
+            &:last-child:after
+              :content ""
 
       a
         :font
@@ -509,9 +522,6 @@ textarea
   :-webkit-border-radius 5px
   :-moz-border-radius 5px
 
-  :box-shadow 0 1px 2px #fff
-  :-moz-box-shadow 0 1px 2px #fff
-  :-webkit-box-shadow 0 1px 2px #fff
 
 .submit_block
   :text
@@ -720,7 +730,6 @@ h1.big_text
     :list
       :style none
 
-
     > li
       :padding 0
       :display inline