Skip to content

Commit c8e2e14

Browse files
author
Łukasz Serwatka
authored
Merge pull request #526 from inakijv/EZP-28461_pagination_consistency
[EZP-28461] Pagination design consistency
2 parents ecda9f5 + defe7cc commit c8e2e14

File tree

18 files changed

+55
-41
lines changed

18 files changed

+55
-41
lines changed

‎src/bundle/Resources/public/scss/_custom.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ $ez-alloyeditor-color-hover: #65B6F0;
4141

4242
$ez-pagination-bg: transparent;
4343
$ez-pagination-margin: 0.25rem;
44-
$ez-pagination-font-size: 0.9rem;
44+
$ez-pagination-font-size: 1rem;
4545
$ez-pagination-page-link-radius: 50%;
4646
$ez-pagination-border-radius: 0.3rem;
4747

‎src/bundle/Resources/public/scss/_pagination.scss‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
.ez-pagination {
22
font-size: $ez-pagination-font-size;
3+
4+
&__text {
5+
font-size: .75rem;
6+
}
7+
8+
&__btn {
9+
font-size: 1rem;
10+
}
11+
12+
&__spacing {
13+
margin-top: -2rem;
14+
}
315
}
416

517
.page-item {
@@ -25,8 +37,10 @@
2537
.page-item.prev, .page-item.next {
2638
&.disabled .page-link {
2739
color: $ez-white;
28-
background-color: $ez-ground-base-medium;
29-
border: $ez-ground-base-medium;
40+
background-color: $ez-color-secondary;
41+
border: $ez-color-secondary;
42+
opacity: .3;
43+
cursor: not-allowed;
3044
}
3145
}
3246

‎src/bundle/Resources/views/admin/bookmark/list.html.twig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,14 @@
8686

8787

8888
{% if pager.haveToPaginate %}
89-
<div class="row justify-content-center align-items-center mb-2">
90-
<span>
89+
<div class="row justify-content-center align-items-center ez-pagination__spacing mb-2">
90+
<span class="ez-pagination__text">
9191
{{ 'pagination.viewing'|trans({
9292
'%viewing%': pager.currentPageResults|length,
9393
'%total%': pager.nbResults}, 'pagination')|desc('Viewing <strong>%viewing%</strong> out of <strong>%total%</strong> items')|raw }}
9494
</span>
9595
</div>
96-
<div class="row justify-content-center align-items-center">
96+
<div class="row justify-content-center align-items-center ez-pagination__btn mb-5">
9797
{{ pagerfanta(pager, 'ez') }}
9898
</div>
9999
{% endif %}

‎src/bundle/Resources/views/admin/content_type/list.html.twig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@
7474
{{ form_end(form_content_types_delete) }}
7575

7676
{% if pager.haveToPaginate %}
77-
<div class="row justify-content-center align-items-center mb-2">
78-
<span>
77+
<div class="row justify-content-center align-items-center mb-2 ez-pagination__spacing">
78+
<span class="ez-pagination__text">
7979
{{ 'pagination.viewing'|trans({
8080
'%viewing%': pager.currentPageResults|length,
8181
'%total%': pager.nbResults}, 'pagination')|desc('Viewing <strong>%viewing%</strong> out of <strong>%total%</strong> items')|raw }}
8282
</span>
8383
</div>
84-
<div class="row justify-content-center align-items-center">
84+
<div class="row justify-content-center align-items-center ez-pagination__btn mb-5">
8585
{{ pagerfanta(pager, 'ez', {
8686
'routeName': route_name,
8787
'routeParams': {'contentTypeGroupId': group.id}

‎src/bundle/Resources/views/admin/content_type_group/list.html.twig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,14 @@
9898
{{ form_end(form_content_type_groups_delete) }}
9999

100100
{% if pager.haveToPaginate %}
101-
<div class="row justify-content-center align-items-center mb-2">
102-
<span>
101+
<div class="row justify-content-center align-items-center mb-2 ez-pagination__spacing">
102+
<span class="ez-pagination__text">
103103
{{ 'pagination.viewing'|trans({
104104
'%viewing%': pager.currentPageResults|length,
105105
'%total%': pager.nbResults}, 'pagination')|desc('Viewing <strong>%viewing%</strong> out of <strong>%total%</strong> items')|raw }}
106106
</span>
107107
</div>
108-
<div class="row justify-content-center align-items-center">
108+
<div class="row justify-content-center align-items-center ez-pagination__btn mb-5">
109109
{{ pagerfanta(pager, 'ez') }}
110110
</div>
111111
{% endif %}

‎src/bundle/Resources/views/admin/language/list.html.twig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,13 @@
113113

114114
{% if pager.haveToPaginate %}
115115
<div class="row justify-content-center align-items-center mb-2">
116-
<span>
116+
<span class="ez-pagination__text">
117117
{{ 'language.viewing'|trans({
118118
'%viewing%': pager.currentPageResults|length,
119119
'%total%': pager.nbResults})|desc('Viewing <strong>%viewing%</strong> out of <strong>%total%</strong> items')|raw }}
120120
</span>
121121
</div>
122-
<div class="row justify-content-center align-items-center">
122+
<div class="row justify-content-center align-items-center ez-pagination__btn mb-5">
123123
{{ pagerfanta(pager, 'ez') }}
124124
</div>
125125
{% endif %}

‎src/bundle/Resources/views/admin/policy/list.html.twig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,14 @@
9797
{{ form_end(form_policies_delete) }}
9898

9999
{% if pager.haveToPaginate %}
100-
<div class="row justify-content-center align-items-center mb-2">
101-
<span>
100+
<div class="row justify-content-center align-items-center mb-2 ez-pagination__spacing">
101+
<span class="ez-pagination__text">
102102
{{ 'pagination.viewing'|trans({
103103
'%viewing%': pager.currentPageResults|length,
104104
'%total%': pager.nbResults}, 'pagination')|desc('Viewing <strong>%viewing%</strong> out of <strong>%total%</strong> items')|raw }}
105105
</span>
106106
</div>
107-
<div class="row justify-content-center align-items-center">
107+
<div class="row justify-content-center align-items-center ez-pagination__btn mb-5">
108108
{{ pagerfanta(pager, 'ez',{
109109
'routeName': route_name,
110110
'routeParams': {'_fragment': 'policies', 'roleId': role.id},

‎src/bundle/Resources/views/admin/role/list.html.twig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,13 @@
117117

118118
{% if pager.haveToPaginate %}
119119
<div class="row justify-content-center align-items-center mb-2">
120-
<span>
120+
<span class="ez-pagination__text">
121121
{{ 'role.viewing'|trans({
122122
'%viewing%': pager.currentPageResults|length,
123123
'%total%': pager.nbResults})|desc('Viewing <strong>%viewing%</strong> out of <strong>%total%</strong> items')|raw }}
124124
</span>
125125
</div>
126-
<div class="row justify-content-center align-items-center">
126+
<div class="row justify-content-center align-items-center ez-pagination__btn mb-5">
127127
{{ pagerfanta(pager, 'ez') }}
128128
</div>
129129
{% endif %}

‎src/bundle/Resources/views/admin/role_assignment/list.html.twig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,14 @@
8888
{{ form_end(form_role_assignments_delete) }}
8989

9090
{% if pager.haveToPaginate %}
91-
<div class="row justify-content-center align-items-center mb-2">
92-
<span>
91+
<div class="row justify-content-center align-items-center mb-2 ez-pagination__spacing">
92+
<span class="ez-pagination__text">
9393
{{ 'pagination.viewing'|trans({
9494
'%viewing%': pager.currentPageResults|length,
9595
'%total%': pager.nbResults}, 'pagination')|desc('Viewing <strong>%viewing%</strong> out of <strong>%total%</strong> items')|raw }}
9696
</span>
9797
</div>
98-
<div class="row justify-content-center align-items-center">
98+
<div class="row justify-content-center align-items-center ez-pagination__btn mb-5">
9999
{{ pagerfanta(pager, 'ez',{
100100
'routeName': route_name,
101101
'routeParams': {'_fragment': 'users-and-groups', 'roleId': role.id},

‎src/bundle/Resources/views/admin/search/list.html.twig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@
5454
{% endfor %}
5555
</tbody>
5656
</table>
57-
<div class="row justify-content-center align-items-center">
58-
<h6>{{ 'search.viewing'|trans({'%viewing%': pagerfanta.currentPageResults|length, '%total%': pagerfanta.nbResults})|desc('Viewing %viewing% out of %total% sub-items') }}</h6>
57+
<div class="row justify-content-center align-items-center ez-pagination__spacing">
58+
<h6 class="ez-pagination__text">{{ 'search.viewing'|trans({'%viewing%': pagerfanta.currentPageResults|length, '%total%': pagerfanta.nbResults})|desc('Viewing %viewing% out of %total% sub-items') }}</h6>
5959
</div>
60-
<div class="row justify-content-center align-items-center">
60+
<div class="row justify-content-center align-items-center ez-pagination__btn mb-5">
6161
{% if pagerfanta.haveToPaginate %}
6262
{{ pagination|raw }}
6363
{% endif %}

0 commit comments

Comments
 (0)