mirror of
https://github.com/wallabag/wallabag.git
synced 2024-11-26 02:51:04 +00:00
Fix pagination on list mode
This commit is contained in:
parent
b9be1cf1ee
commit
f836b98fa6
5 changed files with 26 additions and 21 deletions
|
@ -8,6 +8,7 @@ main {
|
|||
}
|
||||
|
||||
ul.row {
|
||||
margin: 0.4rem 0 0;
|
||||
padding: 0 0.75rem;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -12,12 +12,10 @@
|
|||
}
|
||||
|
||||
.results {
|
||||
height: 1em;
|
||||
|
||||
.nb-results,
|
||||
.pagination {
|
||||
margin: 15px 15px 0;
|
||||
}
|
||||
display: flex;
|
||||
padding: 1rem 1rem 0;
|
||||
flex-wrap: wrap;
|
||||
justify-content: space-between;
|
||||
|
||||
.nb-results {
|
||||
display: inline-flex;
|
||||
|
@ -29,10 +27,11 @@
|
|||
}
|
||||
|
||||
.pagination {
|
||||
float: right;
|
||||
|
||||
ul {
|
||||
margin: 0 !important;
|
||||
display: flex;
|
||||
margin: 0;
|
||||
flex-wrap: wrap;
|
||||
justify-content: space-around;
|
||||
|
||||
.prev.disabled,
|
||||
.next.disabled {
|
||||
|
|
|
@ -8,6 +8,10 @@
|
|||
footer {
|
||||
padding-left: 240px;
|
||||
}
|
||||
|
||||
.pagination {
|
||||
margin-left: auto;
|
||||
}
|
||||
}
|
||||
|
||||
@media only screen and (max-width: 992px) {
|
||||
|
@ -18,10 +22,6 @@
|
|||
padding-left: 0;
|
||||
}
|
||||
|
||||
.pagination {
|
||||
width: auto;
|
||||
}
|
||||
|
||||
.nav-panels .action {
|
||||
padding-right: 0.75rem;
|
||||
}
|
||||
|
@ -62,9 +62,13 @@
|
|||
display: none;
|
||||
}
|
||||
|
||||
.pagination li.prev,
|
||||
.pagination li.next {
|
||||
width: auto;
|
||||
.pagination li {
|
||||
margin-bottom: 0.5rem;
|
||||
|
||||
&.prev,
|
||||
&.next {
|
||||
width: auto;
|
||||
}
|
||||
}
|
||||
|
||||
.drag-target + .drag-target {
|
||||
|
|
|
@ -21,8 +21,8 @@
|
|||
{% block content %}
|
||||
{% set listMode = app.user.config.listMode %}
|
||||
{% set currentRoute = app.request.attributes.get('_route') %}
|
||||
<div class="results clearfix">
|
||||
<div class="nb-results left">
|
||||
<div class="results">
|
||||
<div class="nb-results">
|
||||
{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
|
||||
<a href="{{ path('switch_view_mode') }}"><i class="material-icons">{% if listMode == 0 %}view_list{% else %}view_module{% endif %}</i></a>
|
||||
{% if app.user.config.rssToken %}
|
||||
|
@ -34,7 +34,6 @@
|
|||
{% endif %}
|
||||
</div>
|
||||
|
||||
<br />
|
||||
<ul class="{% if listMode == 1 %}collection{% else %}row data{% endif %}">
|
||||
{% for entry in entries %}
|
||||
<li id="entry-{{ entry.id|e }}" class="col {% if listMode == 0 %}l3 m6{% else %}collection-item{% endif %} s12">
|
||||
|
@ -52,7 +51,9 @@
|
|||
</ul>
|
||||
|
||||
{% if entries.getNbPages > 1 %}
|
||||
{{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
|
||||
<div class="results">
|
||||
{{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<!-- Export -->
|
||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue