From a402e811dac1f999dcf623ce6099e554d76c6de4 Mon Sep 17 00:00:00 2001 From: Wille Marcel Date: Thu, 7 Sep 2017 22:14:33 -0300 Subject: [PATCH] Add padding between the last diary post and the pagination links Closes #1634 --- app/assets/stylesheets/common.scss | 4 ++++ app/views/diary_entry/list.html.erb | 28 +++++++++++++++------------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 578506621..6b99662a4 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -1664,6 +1664,10 @@ tr.turn:hover { display: inline; } +.pagination { + padding-top: $lineheight; +} + /* Rules for the diary entry page */ .diary_entry { diff --git a/app/views/diary_entry/list.html.erb b/app/views/diary_entry/list.html.erb index 756464aa2..d6af432fb 100644 --- a/app/views/diary_entry/list.html.erb +++ b/app/views/diary_entry/list.html.erb @@ -34,19 +34,21 @@ <%= render :partial => 'diary_list_entry', :collection => @entries %> <% end %> - <% if @entries.size < @page_size -%> - <%= t('diary_entry.list.older_entries') %> - <% else -%> - <%= link_to t('diary_entry.list.older_entries'), @params.merge(:page => @page + 1 ) %> - <% end -%> - - | - - <% if @page > 1 -%> - <%= link_to t('diary_entry.list.newer_entries'), @params.merge(:page => @page - 1) %> - <% else -%> - <%= t('diary_entry.list.newer_entries') %> - <% end -%> + <% end %> <% unless params[:friends] or params[:nearby] -%> -- 2.43.2