From 110284626aad13aa7dfaa595355097fe534b4bb0 Mon Sep 17 00:00:00 2001 From: SansPseudoFix Date: Sat, 29 Aug 2015 15:15:35 +0200 Subject: [PATCH] Fix mobile pagination for notifications view Fix syntax Fix syntax closes #6364 --- Changelog.md | 1 + app/assets/stylesheets/mobile/mobile.scss | 2 +- app/views/notifications/index.mobile.haml | 7 ++++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Changelog.md b/Changelog.md index 5f41e795b..2afd96c5a 100644 --- a/Changelog.md +++ b/Changelog.md @@ -20,6 +20,7 @@ * Links in the left sidebar are now clickable on full width [#6267](https://github.com/diaspora/diaspora/pull/6267) * Guard against passing nil into person\_image\_tag [#6286](https://github.com/diaspora/diaspora/pull/6286) * Prevent Handlebars from messing up indentation of pre tags [#6339](https://github.com/diaspora/diaspora/pull/6339) +* Fix pagination design on notifications page [#6364](https://github.com/diaspora/diaspora/pull/6364) ## Features diff --git a/app/assets/stylesheets/mobile/mobile.scss b/app/assets/stylesheets/mobile/mobile.scss index 183995e01..107dab276 100644 --- a/app/assets/stylesheets/mobile/mobile.scss +++ b/app/assets/stylesheets/mobile/mobile.scss @@ -849,7 +849,7 @@ form#new_user.new_user input.btn { text-shadow: 1px 1px 20px rgb(126, 240, 77); } -#conversation_inbox { +#conversation_inbox, .notifications { .pagination { margin-left: auto; margin-right: auto; diff --git a/app/views/notifications/index.mobile.haml b/app/views/notifications/index.mobile.haml index 7258fc418..67e542618 100644 --- a/app/views/notifications/index.mobile.haml +++ b/app/views/notifications/index.mobile.haml @@ -21,4 +21,9 @@ .time_notif = timeago(note.created_at) - = will_paginate @notifications, :renderer => WillPaginate::ActionView::BootstrapLinkRenderer + = will_paginate @notifications, + previous_label: "«", + next_label: "»", + inner_window: 1, + outer_window: 0, + renderer: WillPaginate::ActionView::BootstrapLinkRenderer