diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-04-13 09:42:18 +0200 |
---|---|---|
committer | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-04-13 09:42:18 +0200 |
commit | a417b869237763ee115982d6367a82aa6174d74e (patch) | |
tree | a9f06adbb39609e98e15ace717db843bd718f2cb /src/Wallabag/CoreBundle/Resources/public | |
parent | 245e2e2caed9445155de6c368ffcacf722b774b3 (diff) | |
parent | 18078ded1278af4d8352a0b71efbc48369a0da72 (diff) | |
download | wallabag-a417b869237763ee115982d6367a82aa6174d74e.tar.gz wallabag-a417b869237763ee115982d6367a82aa6174d74e.tar.zst wallabag-a417b869237763ee115982d6367a82aa6174d74e.zip |
Merge pull request #1918 from wallabag/improve-pagination
Improve pagination when user has lot of entries
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/public')
-rwxr-xr-x | src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css | 14 | ||||
-rwxr-xr-x | src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css | 20 |
2 files changed, 27 insertions, 7 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css index 1cb2ddf3..ba430cc4 100755 --- a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css +++ b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css | |||
@@ -512,7 +512,7 @@ img.preview { | |||
512 | width: 50%; | 512 | width: 50%; |
513 | } | 513 | } |
514 | 514 | ||
515 | .pagination { | 515 | div.pagination ul { |
516 | text-align: right; | 516 | text-align: right; |
517 | margin-bottom:50px; | 517 | margin-bottom:50px; |
518 | } | 518 | } |
@@ -523,25 +523,25 @@ img.preview { | |||
523 | color: #999; | 523 | color: #999; |
524 | } | 524 | } |
525 | 525 | ||
526 | .pagination > * { | 526 | div.pagination ul > * { |
527 | display: inline-block; | 527 | display: inline-block; |
528 | margin-left: 0.5em; | 528 | margin-left: 0.5em; |
529 | } | 529 | } |
530 | 530 | ||
531 | .pagination a { | 531 | div.pagination ul a { |
532 | color: #999; | 532 | color: #999; |
533 | text-decoration: none; | 533 | text-decoration: none; |
534 | } | 534 | } |
535 | 535 | ||
536 | .pagination a:hover, .pagination a:focus { | 536 | div.pagination ul a:hover, div.pagination ul a:focus { |
537 | text-decoration: underline; | 537 | text-decoration: underline; |
538 | } | 538 | } |
539 | 539 | ||
540 | .pagination .disabled { | 540 | div.pagination ul .disabled { |
541 | display: none; | 541 | display: none; |
542 | } | 542 | } |
543 | 543 | ||
544 | .pagination .current { | 544 | div.pagination ul .current { |
545 | height: 25px; | 545 | height: 25px; |
546 | padding: 4px 8px; | 546 | padding: 4px 8px; |
547 | border: 1px solid #d5d5d5; | 547 | border: 1px solid #d5d5d5; |
diff --git a/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css b/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css index 96c38822..a3915b1d 100755 --- a/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css +++ b/src/Wallabag/CoreBundle/Resources/public/themes/material/css/main.css | |||
@@ -80,6 +80,14 @@ main, #content, .valign-wrapper { | |||
80 | margin-bottom: 0; | 80 | margin-bottom: 0; |
81 | } | 81 | } |
82 | 82 | ||
83 | .pagination { | ||
84 | float: right; | ||
85 | } | ||
86 | |||
87 | .pagination ul { | ||
88 | margin: 0 !important; | ||
89 | } | ||
90 | |||
83 | .pagination li { | 91 | .pagination li { |
84 | padding: 0; | 92 | padding: 0; |
85 | } | 93 | } |
@@ -90,6 +98,18 @@ main, #content, .valign-wrapper { | |||
90 | display: block; | 98 | display: block; |
91 | } | 99 | } |
92 | 100 | ||
101 | .pagination li.active span { | ||
102 | padding: 0px 10px; | ||
103 | height: 30px; | ||
104 | display: block; | ||
105 | color: #fff; | ||
106 | } | ||
107 | |||
108 | .pagination .disabled { | ||
109 | margin-right: 10px; | ||
110 | margin-left: 10px; | ||
111 | } | ||
112 | |||
93 | .page-footer .footer-copyright p { | 113 | .page-footer .footer-copyright p { |
94 | display: inline; | 114 | display: inline; |
95 | } | 115 | } |