diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2017-12-05 10:03:32 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-05 10:03:32 +0100 |
commit | aeab8b342e462a446c6be54896ac76c41d68b471 (patch) | |
tree | 39bf1642c1d7dc768c9b50e3a7df73331eae1f4a /app/Resources/static/themes | |
parent | b9be1cf1ee771a34cbf496cc3b0290a01dbbe1c6 (diff) | |
parent | 1f84aa903d9dbba7420bd6da5e66cfd5d5f78b1a (diff) | |
download | wallabag-aeab8b342e462a446c6be54896ac76c41d68b471.tar.gz wallabag-aeab8b342e462a446c6be54896ac76c41d68b471.tar.zst wallabag-aeab8b342e462a446c6be54896ac76c41d68b471.zip |
Merge pull request #3459 from Simounet/fix/pagination
Pagination improved
Diffstat (limited to 'app/Resources/static/themes')
3 files changed, 22 insertions, 16 deletions
diff --git a/app/Resources/static/themes/material/css/cards.scss b/app/Resources/static/themes/material/css/cards.scss index 7b38a743..0819f0dc 100644 --- a/app/Resources/static/themes/material/css/cards.scss +++ b/app/Resources/static/themes/material/css/cards.scss | |||
@@ -8,6 +8,7 @@ main { | |||
8 | } | 8 | } |
9 | 9 | ||
10 | ul.row { | 10 | ul.row { |
11 | margin: 0.4rem 0 0; | ||
11 | padding: 0 0.75rem; | 12 | padding: 0 0.75rem; |
12 | } | 13 | } |
13 | } | 14 | } |
diff --git a/app/Resources/static/themes/material/css/entries.scss b/app/Resources/static/themes/material/css/entries.scss index c667be27..d38d97e4 100644 --- a/app/Resources/static/themes/material/css/entries.scss +++ b/app/Resources/static/themes/material/css/entries.scss | |||
@@ -12,12 +12,10 @@ | |||
12 | } | 12 | } |
13 | 13 | ||
14 | .results { | 14 | .results { |
15 | height: 1em; | 15 | display: flex; |
16 | 16 | padding: 1rem 1rem 0; | |
17 | .nb-results, | 17 | flex-wrap: wrap; |
18 | .pagination { | 18 | justify-content: space-between; |
19 | margin: 15px 15px 0; | ||
20 | } | ||
21 | 19 | ||
22 | .nb-results { | 20 | .nb-results { |
23 | display: inline-flex; | 21 | display: inline-flex; |
@@ -29,10 +27,11 @@ | |||
29 | } | 27 | } |
30 | 28 | ||
31 | .pagination { | 29 | .pagination { |
32 | float: right; | ||
33 | |||
34 | ul { | 30 | ul { |
35 | margin: 0 !important; | 31 | display: flex; |
32 | margin: 0; | ||
33 | flex-wrap: wrap; | ||
34 | justify-content: space-around; | ||
36 | 35 | ||
37 | .prev.disabled, | 36 | .prev.disabled, |
38 | .next.disabled { | 37 | .next.disabled { |
@@ -44,10 +43,12 @@ | |||
44 | padding: 0; | 43 | padding: 0; |
45 | } | 44 | } |
46 | 45 | ||
46 | span, | ||
47 | a { | 47 | a { |
48 | padding: 0 10px; | 48 | padding: 0 10px; |
49 | height: 30px; | 49 | height: 30px; |
50 | display: block; | 50 | display: block; |
51 | line-height: 30px; | ||
51 | } | 52 | } |
52 | 53 | ||
53 | .disabled { | 54 | .disabled { |
diff --git a/app/Resources/static/themes/material/css/media_queries.scss b/app/Resources/static/themes/material/css/media_queries.scss index 36d79a45..48f3aefc 100644 --- a/app/Resources/static/themes/material/css/media_queries.scss +++ b/app/Resources/static/themes/material/css/media_queries.scss | |||
@@ -8,6 +8,10 @@ | |||
8 | footer { | 8 | footer { |
9 | padding-left: 240px; | 9 | padding-left: 240px; |
10 | } | 10 | } |
11 | |||
12 | .pagination { | ||
13 | margin-left: auto; | ||
14 | } | ||
11 | } | 15 | } |
12 | 16 | ||
13 | @media only screen and (max-width: 992px) { | 17 | @media only screen and (max-width: 992px) { |
@@ -18,10 +22,6 @@ | |||
18 | padding-left: 0; | 22 | padding-left: 0; |
19 | } | 23 | } |
20 | 24 | ||
21 | .pagination { | ||
22 | width: auto; | ||
23 | } | ||
24 | |||
25 | .nav-panels .action { | 25 | .nav-panels .action { |
26 | padding-right: 0.75rem; | 26 | padding-right: 0.75rem; |
27 | } | 27 | } |
@@ -62,9 +62,13 @@ | |||
62 | display: none; | 62 | display: none; |
63 | } | 63 | } |
64 | 64 | ||
65 | .pagination li.prev, | 65 | .pagination li { |
66 | .pagination li.next { | 66 | margin-bottom: 0.5rem; |
67 | width: auto; | 67 | |
68 | &.prev, | ||
69 | &.next { | ||
70 | width: auto; | ||
71 | } | ||
68 | } | 72 | } |
69 | 73 | ||
70 | .drag-target + .drag-target { | 74 | .drag-target + .drag-target { |