From 4bb0785ad5bdad8fc8fcbbe35c61f585f58f4cce Mon Sep 17 00:00:00 2001 From: Eden Halperin Date: Wed, 6 Nov 2013 16:49:24 -0500 Subject: [PATCH] Browse section pagination --- app/assets/stylesheets/common.css.scss | 13 +++++++++++++ app/assets/stylesheets/small.css.scss | 7 +++++++ app/views/browse/_paging_nav.html.erb | 8 +++----- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss index d8b843000..644c0a20c 100644 --- a/app/assets/stylesheets/common.css.scss +++ b/app/assets/stylesheets/common.css.scss @@ -1082,6 +1082,19 @@ a.donate { h4 { padding: 0; + border-radius: 3px; + + &.paginate { + margin-top: 4px; + padding: 1px 6px; + border: 1px solid #eee; + span { + padding: 0 0 0 14px; + float: right; + border-left: 1px solid #eee; + > a { padding-left: 5px; } + } + } } } diff --git a/app/assets/stylesheets/small.css.scss b/app/assets/stylesheets/small.css.scss index de1b44bb5..51549f87f 100644 --- a/app/assets/stylesheets/small.css.scss +++ b/app/assets/stylesheets/small.css.scss @@ -80,6 +80,13 @@ nav.secondary { } } +#compact-secondary-nav { + display: none; +} +.compact-hide { + display: inline-block; +} + #content { margin-top: 58px; } .map-layout { diff --git a/app/views/browse/_paging_nav.html.erb b/app/views/browse/_paging_nav.html.erb index f691d4504..50e75bff8 100644 --- a/app/views/browse/_paging_nav.html.erb +++ b/app/views/browse/_paging_nav.html.erb @@ -1,6 +1,5 @@ -
+

<% current_page = pages.current_page %> - <% if pages.page_count > 1 %> <%= t'browse.paging_nav.showing_page' %> <%= current_page.number %> (<%= current_page.first_item %><% @@ -9,7 +8,6 @@ end %> <%= t'browse.paging_nav.of'%> <%= pages.item_count %>) -· -<%= raw pagination_links_each(pages, {}) { |n| link_to_page(n, page_param) } %> +<%= raw pagination_links_each(pages, {}) { |n| link_to_page(n, page_param) } %> <% end %> -

+ -- 2.43.2