diff --git a/app/views/shared/_reshare.haml b/app/views/shared/_reshare.haml index bf785e4fa..a7a85249a 100644 --- a/app/views/shared/_reshare.haml +++ b/app/views/shared/_reshare.haml @@ -16,10 +16,6 @@ = link_to "Reshare", "#" %ul.reshare_box - - for aspect in current_user.aspects_with_post( post.id ) - - %li.currently_sharing= aspect.name - - for aspect in current_user.aspects - unless aspect.posts.include? post %li.aspect_to_share= link_to aspect, :controller => "aspects", :action => "show", :id => aspect.id, :prefill => post.message diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 6596fd00d..92596fbfc 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -208,12 +208,12 @@ li.message { li.message:hover div.info a:active, li.message:hover .time a:active { color: #005d9c; } -.reshare_pane { +.destroy_link .reshare_pane { margin-left: 5px; margin-right: 5px; display: inline; position: relative; } - .reshare_pane ul.reshare_box { + .destroy_link .reshare_pane ul.reshare_box { width: 150px; display: none; z-index: 10; @@ -227,21 +227,24 @@ li.message { -moz-box-shadow: 0 0 5px #666666; text-shadow: 0 2px white; color: black; } - .reshare_pane ul.reshare_box > li { + .destroy_link .reshare_pane ul.reshare_box > li { font-weight: bold; - padding: 8px; - padding-right: 15px; + color: #cccccc; border-top: 1px solid white; border-bottom: 1px solid #cccccc; } - .reshare_pane ul.reshare_box > li:first-child { + .destroy_link .reshare_pane ul.reshare_box > li:first-child { border-top: none; } - .reshare_pane ul.reshare_box > li:last-child { + .destroy_link .reshare_pane ul.reshare_box > li:last-child { border-bottom: none; } - .reshare_pane ul.reshare_box > li a { + .destroy_link .reshare_pane ul.reshare_box > li a { display: block; - height: 100%; } - .reshare_pane ul.reshare_box > li a:hover { - background-color: #eeeeee; } + height: 100%; + padding: 2px 5px; } + .destroy_link .reshare_pane ul.reshare_box > li a:hover { + background-color: #eeeeee; + text-decoration: none; } + .destroy_link .reshare_pane ul.reshare_box > li a:active { + background-color: #cccccc; } form { position: relative; diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 8c4480cd7..244032619 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -274,7 +274,7 @@ li.message &:active :color #005D9C -.reshare_pane +.destroy_link .reshare_pane :margin :left 5px :right 5px @@ -306,9 +306,7 @@ li.message > li :font :weight bold - - :padding 8px - :right 15px + :color #ccc :border :top 1px solid #fff :bottom 1px solid #ccc @@ -322,10 +320,16 @@ li.message a :display block :height 100% + :padding 2px 5px &:hover :background :color #eee + :text + :decoration none + &:active + :background + :color #ccc form