fade in aspect badges on stream
This commit is contained in:
parent
55fa1646c7
commit
6ca0b0014b
3 changed files with 23 additions and 8 deletions
|
|
@ -19,11 +19,13 @@
|
|||
|
||||
- if post.public?
|
||||
%span.arrow ➔
|
||||
%span.aspect_badges
|
||||
%span.aspect_badge.public
|
||||
= t('the_world')
|
||||
|
||||
- elsif person.owner_id == current_user.id
|
||||
%span.arrow ➔
|
||||
%span.aspect_badges
|
||||
= aspect_badges(aspects_with_post(all_aspects, post))
|
||||
|
||||
= render 'status_messages/status_message', :post => post, :photos => photos
|
||||
|
|
|
|||
|
|
@ -51,15 +51,20 @@ var Stream = {
|
|||
|
||||
// fade in controls
|
||||
$stream.delegate(".stream_element", "mouseenter", function(evt) {
|
||||
var element = $(this),
|
||||
controls = element.find('.controls');
|
||||
var controls = $(this).find('.controls'),
|
||||
badges = $(this).find('.aspect_badges');
|
||||
|
||||
controls.fadeIn(100);
|
||||
controls.fadeIn(100);
|
||||
badges.fadeTo(100,1);
|
||||
});
|
||||
$stream.delegate(".stream_element", "mouseleave", function(evt) {
|
||||
var element = $(this),
|
||||
controls = element.find('.controls');
|
||||
var controls = $(this).find('.controls'),
|
||||
badges = $(this).find('.aspect_badges');
|
||||
|
||||
controls.show()
|
||||
.fadeOut(100);
|
||||
.fadeOut(50);
|
||||
badges.fadeTo(50,0.5);
|
||||
});
|
||||
|
||||
// reshare button action
|
||||
|
|
|
|||
|
|
@ -2050,6 +2050,14 @@ h3,h4
|
|||
.avatar
|
||||
:float left
|
||||
.arrow,
|
||||
|
||||
.stream_element
|
||||
.aspect_badges
|
||||
:opacity 0.5
|
||||
&:hover
|
||||
.aspect_badges
|
||||
:opacity 1
|
||||
|
||||
.aspect_badge
|
||||
:position relative
|
||||
:margin
|
||||
|
|
|
|||
Loading…
Reference in a new issue