diff --git a/app/views/notifications/_popup.haml b/app/views/notifications/_popup.haml index 5f4a17a6df6db1b28bd53c140c179d570c4c5b52..0dbc75d4c6e87d285e2924d3f0b96adde7b846f9 100644 --- a/app/views/notifications/_popup.haml +++ b/app/views/notifications/_popup.haml @@ -2,5 +2,6 @@ -# licensed under the Affero General Public License version 3 or later. See -# the COPYRIGHT file. += person_image_tag(person) = link_to "#{person.name.titleize}", person_path(person.id) = object_link(note) diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 6068fa2e7217131c9d06867aa09e928b298b900e..2d1fe2fa97f54c26a3171bddd1c0cd9bd79b2bd5 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -276,6 +276,7 @@ en: notifications: request_accepted: "accepted your share request." new_request: "offered to share with you." + private_message: "sent you a message." comment_on_post: "commented on your" also_commented: "also commented on %{post_author}'s" mentioned: "has mentioned you in their" diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index a619bb1ebb8b4928ca6964fa2cfc832ab8bda474..41331bb38b705911ec9d5ed2a51ad647949461b4 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -1615,6 +1615,18 @@ h3 span.current_gs_step :padding 12px :color #fff + :vertical + :align middle + + .avatar + :display inline-block + :height 20px + :width 20px + :margin + :right 5px + :vertical + :align middle + .bottom_notification :position fixed :bottom 0