Fix Bootstrap 3 regressions
* mobile notification padding * width of mobile notifications and stream page
This commit is contained in:
parent
ab1e879cc2
commit
4f9ac8dd96
2 changed files with 20 additions and 20 deletions
|
|
@ -1,22 +1,22 @@
|
|||
.col-md-12
|
||||
%h3
|
||||
= t('.notifications')
|
||||
%h3
|
||||
= t(".notifications")
|
||||
|
||||
.right
|
||||
-if params[:type]
|
||||
= link_to t('.mark_all_shown_as_read'), read_all_notifications_path(type: params[:type] ), class: 'btn btn-default'
|
||||
-else
|
||||
= link_to t('.mark_all_as_read'), read_all_notifications_path, class: 'btn btn-default'
|
||||
%ul.notifications
|
||||
- @group_days.each do |date, notes|
|
||||
%li
|
||||
.notification_day_header
|
||||
%span.label.label-default
|
||||
= locale_date(date)
|
||||
%ul.notifications_for_day
|
||||
- notes.each do |note|
|
||||
.stream_element{:data=>{guid: note.id}, class: "#{note.unread ? 'unread' : 'read'}"}
|
||||
.content.from.media
|
||||
.pull-right
|
||||
-if params[:type]
|
||||
= link_to t(".mark_all_shown_as_read"), read_all_notifications_path(type: params[:type] ), class: "btn btn-default"
|
||||
-else
|
||||
= link_to t(".mark_all_as_read"), read_all_notifications_path, class: "btn btn-default"
|
||||
%ul.notifications
|
||||
- @group_days.each do |date, notes|
|
||||
%li
|
||||
.notification_day_header
|
||||
%span.label.label-default
|
||||
= locale_date(date)
|
||||
%ul.notifications_for_day
|
||||
- notes.each do |note|
|
||||
.stream_element{data: {guid: note.id}, class: "#{note.unread ? "unread" : "read"}"}
|
||||
.content.from
|
||||
.media
|
||||
.media-left
|
||||
= person_image_link(note.actors.last, size: :thumb_small, class: "media-object")
|
||||
.media-body
|
||||
|
|
@ -24,4 +24,4 @@
|
|||
.time_notif
|
||||
= 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
|
||||
-# the COPYRIGHT file.
|
||||
|
||||
#main_stream.stream.col-md-12
|
||||
#main_stream.stream
|
||||
= render 'shared/stream', posts: @stream.stream_posts
|
||||
= render 'shared/stream_more_button'
|
||||
|
|
|
|||
Loading…
Reference in a new issue