nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bootstrap3 regression fixes: avatars for likes, aspect dropdown on notification page, tag input

Browse source
This commit is contained in:
Steffen van Bergerem 2015-06-05 12:09:42 +02:00
parent e0a4d778fd
commit 7b7700b317
3 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/stylesheets/leftnavbar.scss
View file

@ -90,7 +90,6 @@
}
/* ---- override app/stylesheets/vendor/autoSuggest.css ---- */
ul.as-selections { padding: 4px 5px; }
.as-original{ width: 100%; }
.tag_input {
line-height: $font-size-base;

1
app/assets/stylesheets/stream_element.scss
View file

@ -67,6 +67,7 @@
font-size: 12px;
line-height: 16px;
.author-name, .bd { display: inline-block; }
.author-name { margin-right: 3px; }
.entypo.heart {
display: inline-block;
font-size: 16px;

2
app/views/notifications/_notification.haml
View file

@ -3,7 +3,7 @@
%i.entypo.eye{ :title => (note.unread ? t('notifications.index.mark_read') : t('notifications.index.mark_unread')) }
- if note.type == "Notifications::StartedSharing" && contact = current_user.contact_for(note.effective_target)
.pull-right
= aspect_membership_dropdown(contact, note.effective_target, 'left')
= aspect_membership_dropdown(contact, note.effective_target, "right")
.media-object.pull-left
= person_image_link note.actors.first, :size => :thumb_small, :class => 'hovercardable'