diff --git a/app/views/status_messages/_status_message.html.haml b/app/views/status_messages/_status_message.html.haml index 3912513589526573882e2cf85658589facef041b..8a7b6cbba2f028f537262a0dae447e1ebf19cf49 100644 --- a/app/views/status_messages/_status_message.html.haml +++ b/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 diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index fa7be11c82b6eb11d4ecd3cd104d51d135e7f9c0..6584d1dff423eeb6c2e8388af30ba94a4afa3016 100644 --- a/public/stylesheets/application.css +++ b/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; diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index a35c9dfd35a67413b2be802fa2c43cb4253229b3..fd22daa89aa65c9e96948b86f23e521cba1c6b54 100644 --- a/public/stylesheets/sass/application.sass +++ b/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