Merge pull request #6074 from svbergerem/mobile-notification-padding
Fix some Bootstrap 3 regressions
This commit is contained in:
commit
c054d17bbb
2 changed files with 20 additions and 20 deletions
|
|
@ -1,22 +1,22 @@
|
||||||
.col-md-12
|
%h3
|
||||||
%h3
|
= t(".notifications")
|
||||||
= t('.notifications')
|
|
||||||
|
|
||||||
.right
|
.pull-right
|
||||||
-if params[:type]
|
-if params[:type]
|
||||||
= link_to t('.mark_all_shown_as_read'), read_all_notifications_path(type: params[:type] ), class: 'btn btn-default'
|
= link_to t(".mark_all_shown_as_read"), read_all_notifications_path(type: params[:type] ), class: "btn btn-default"
|
||||||
-else
|
-else
|
||||||
= link_to t('.mark_all_as_read'), read_all_notifications_path, class: 'btn btn-default'
|
= link_to t(".mark_all_as_read"), read_all_notifications_path, class: "btn btn-default"
|
||||||
%ul.notifications
|
%ul.notifications
|
||||||
- @group_days.each do |date, notes|
|
- @group_days.each do |date, notes|
|
||||||
%li
|
%li
|
||||||
.notification_day_header
|
.notification_day_header
|
||||||
%span.label.label-default
|
%span.label.label-default
|
||||||
= locale_date(date)
|
= locale_date(date)
|
||||||
%ul.notifications_for_day
|
%ul.notifications_for_day
|
||||||
- notes.each do |note|
|
- notes.each do |note|
|
||||||
.stream_element{:data=>{guid: note.id}, class: "#{note.unread ? 'unread' : 'read'}"}
|
.stream_element{data: {guid: note.id}, class: "#{note.unread ? "unread" : "read"}"}
|
||||||
.content.from.media
|
.content.from
|
||||||
|
.media
|
||||||
.media-left
|
.media-left
|
||||||
= person_image_link(note.actors.last, size: :thumb_small, class: "media-object")
|
= person_image_link(note.actors.last, size: :thumb_small, class: "media-object")
|
||||||
.media-body
|
.media-body
|
||||||
|
|
@ -24,4 +24,4 @@
|
||||||
.time_notif
|
.time_notif
|
||||||
= timeago(note.created_at)
|
= timeago(note.created_at)
|
||||||
|
|
||||||
= will_paginate @notifications, renderer: WillPaginate::ActionView::BootstrapLinkRenderer
|
= will_paginate @notifications, renderer: WillPaginate::ActionView::BootstrapLinkRenderer
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,6 @@
|
||||||
-# licensed under the Affero General Public License version 3 or later. See
|
-# licensed under the Affero General Public License version 3 or later. See
|
||||||
-# the COPYRIGHT file.
|
-# the COPYRIGHT file.
|
||||||
|
|
||||||
#main_stream.stream.col-md-12
|
#main_stream.stream
|
||||||
= render 'shared/stream', posts: @stream.stream_posts
|
= render 'shared/stream', posts: @stream.stream_posts
|
||||||
= render 'shared/stream_more_button'
|
= render 'shared/stream_more_button'
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue