diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-12-06 10:54:03 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-12-06 10:54:03 +0000 |
| commit | 9ead3ea0a5fc9717eef7266101dfdb7742899fae (patch) | |
| tree | db64644645d483a51abcaa4954975760953344e0 | |
| parent | 0a45d594d51102d4fbc00995d74cd7355c1c46a9 (diff) | |
| download | redmine-9ead3ea0a5fc9717eef7266101dfdb7742899fae.tar.gz redmine-9ead3ea0a5fc9717eef7266101dfdb7742899fae.zip | |
Merged r14948 and r14949 (#19097).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14954 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | lib/redmine/pagination.rb | 9 | ||||
| -rw-r--r-- | public/stylesheets/application.css | 4 | ||||
| -rw-r--r-- | public/stylesheets/responsive.css | 8 |
3 files changed, 17 insertions, 4 deletions
diff --git a/lib/redmine/pagination.rb b/lib/redmine/pagination.rb index 34148d5dc..c07af54d6 100644 --- a/lib/redmine/pagination.rb +++ b/lib/redmine/pagination.rb @@ -185,7 +185,7 @@ module Redmine previous = nil paginator.linked_pages.each do |page| if previous && previous != page - 1 - html << content_tag('li', content_tag('span', '...'), :class => 'spacer') + html << content_tag('li', content_tag('span', '…'.html_safe), :class => 'spacer') end if page == paginator.page html << content_tag('li', content_tag('span', page.to_s), :class => 'current') @@ -207,11 +207,12 @@ module Redmine end html << '</ul>' - html << content_tag('span', "(#{paginator.first_item}-#{paginator.last_item}/#{paginator.item_count})", :class => 'items') + ' ' - + info = ''.html_safe + info << content_tag('span', "(#{paginator.first_item}-#{paginator.last_item}/#{paginator.item_count})", :class => 'items') + ' ' if per_page_links != false && links = per_page_links(paginator, &block) - html << content_tag('span', links.to_s, :class => 'per-page') + info << content_tag('span', links.to_s, :class => 'per-page') end + html << content_tag('span', info) html.html_safe end diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index ad2a0f4f0..288592027 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -509,6 +509,9 @@ span.pagination {margin-left:3px; color:#888;} border: 1px solid #ccc; margin-left: -1px; line-height: 2em; + margin-bottom: 1em; + white-space: nowrap; + text-align: center; } .pagination ul.pages li a, .pagination ul.pages li span { @@ -535,6 +538,7 @@ span.pagination {margin-left:3px; color:#888;} color: inherit; text-decoration: inherit; } +span.pagination>span {white-space:nowrap;} #search-form fieldset p {margin:0.2em 0;} diff --git a/public/stylesheets/responsive.css b/public/stylesheets/responsive.css index dc3ebba8a..73b40875d 100644 --- a/public/stylesheets/responsive.css +++ b/public/stylesheets/responsive.css @@ -825,3 +825,11 @@ width: 100%; } } + +@media all and (max-width: 599px) { + .pagination ul.pages li {display:none;} + .pagination ul.pages li.current, + .pagination ul.pages li.previous, + .pagination ul.pages li.next {display:inline-block; width:32%; overflow:hidden;} +} + |