From f836b98fa644601697c107738726dcf8a92dfecd Mon Sep 17 00:00:00 2001 From: Simounet Date: Mon, 4 Dec 2017 19:34:46 +0100 Subject: Fix pagination on list mode --- app/Resources/static/themes/material/css/cards.scss | 1 + app/Resources/static/themes/material/css/entries.scss | 17 ++++++++--------- .../static/themes/material/css/media_queries.scss | 18 +++++++++++------- 3 files changed, 20 insertions(+), 16 deletions(-) (limited to 'app/Resources/static') 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 { } ul.row { + margin: 0.4rem 0 0; padding: 0 0.75rem; } } diff --git a/app/Resources/static/themes/material/css/entries.scss b/app/Resources/static/themes/material/css/entries.scss index c667be27..b12ae799 100644 --- a/app/Resources/static/themes/material/css/entries.scss +++ b/app/Resources/static/themes/material/css/entries.scss @@ -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 { 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 @@ 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 { -- cgit v1.2.3 From 1f84aa903d9dbba7420bd6da5e66cfd5d5f78b1a Mon Sep 17 00:00:00 2001 From: Simounet Date: Mon, 4 Dec 2017 22:46:35 +0100 Subject: Fix wrong selected page number alignment on pagination --- app/Resources/static/themes/material/css/entries.scss | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/Resources/static') diff --git a/app/Resources/static/themes/material/css/entries.scss b/app/Resources/static/themes/material/css/entries.scss index b12ae799..d38d97e4 100644 --- a/app/Resources/static/themes/material/css/entries.scss +++ b/app/Resources/static/themes/material/css/entries.scss @@ -43,10 +43,12 @@ padding: 0; } + span, a { padding: 0 10px; height: 30px; display: block; + line-height: 30px; } .disabled { -- cgit v1.2.3