diff --git a/app/views/status_messages/_status_message.html.haml b/app/views/status_messages/_status_message.html.haml index f4ac1cadf..d1568c7bb 100644 --- a/app/views/status_messages/_status_message.html.haml +++ b/app/views/status_messages/_status_message.html.haml @@ -24,6 +24,11 @@ = render "shared/reshare", :post => post, :current_user => current_user - if post.public? - .aspect_tag + .public_aspect_tag public + - else + .aspect_tag + %ul + - for aspect in current_user.aspects_with_post( post.id ) + %li= aspect.name diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index e886e3480..42b61f513 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -676,11 +676,11 @@ ul#settings_nav { #fancybox-close:hover { background-color: transparent; } -.aspect_tag { +.aspect_tag, +.public_aspect_tag { position: absolute; top: 15px; right: 2em; - background-color: #fffc7f; border-radius: 5px; -webkit-border-radius: 5px; -moz-border-radius: 5px; @@ -691,6 +691,28 @@ ul#settings_nav { border-bottom: 1px solid #eeeeee; cursor: default; } +.public_aspect_tag { + background-color: #fffc7f; } + +.aspect_tag { + background-color: #eeeeee; + color: #999999; + text-shadow: 0 1px white; } + .aspect_tag ul { + display: inline; + margin: 0; + padding: 0; + list-style: none; } + .aspect_tag ul li { + display: inline; + margin-right: 2px; + padding-right: 4px; + border-right: 1px solid #cccccc; } + .aspect_tag ul li:last-child { + margin-right: 0; + padding-right: 0; + border-right: none; } + #friend_pictures { line-height: 1em; } #friend_pictures img { diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index ab4674760..71589e3cc 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -866,12 +866,11 @@ ul#settings_nav :background :color transparent -.aspect_tag +.aspect_tag, +.public_aspect_tag :position absolute :top 15px :right 2em - :background - :color #FFFC7F :border-radius 5px :-webkit-border-radius 5px @@ -890,6 +889,42 @@ ul#settings_nav :cursor default +.public_aspect_tag + :background + :color #FFFC7F + +.aspect_tag + :background + :color #eee + :color #999 + :text + :shadow 0 1px #fff + + ul + :display inline + :margin 0 + :padding 0 + :list + :style none + + li + :display inline + :margin + :right 2px + :padding + :right 4px + :border + :right 1px solid #ccc + + &:last-child + :margin + :right 0 + :padding + :right 0 + :border + :right none + + #friend_pictures :line-height 1em img