From 42096bb41b6a634a03772c2f280ffbf84d11e1f4 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Thu, 27 Oct 2016 11:58:19 +1300 Subject: [PATCH] BUG Prevent pagination wrapping Fixes https://github.com/silverstripe/silverstripe-asset-admin/issues/269 --- admin/client/dist/styles/bundle.css | 6 ++++-- admin/client/src/styles/legacy/GridField.scss | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/admin/client/dist/styles/bundle.css b/admin/client/dist/styles/bundle.css index b3430dc9f..7024dfb27 100644 --- a/admin/client/dist/styles/bundle.css +++ b/admin/client/dist/styles/bundle.css @@ -14169,6 +14169,7 @@ li.class-ErrorPage>a .jstree-pageicon{ .grid-field__paginator{ position:relative; + white-space:nowrap; } .grid-field__paginator_numbers{ @@ -14176,14 +14177,15 @@ li.class-ErrorPage>a .jstree-pageicon{ } .grid-field__paginator__controls{ + white-space:nowrap; position:absolute; height:36px; top:50%; left:50%; margin-top:-18px; - margin-left:-125px; + margin-left:-130px; z-index:5; - width:250px; + width:260px; text-align:center; } diff --git a/admin/client/src/styles/legacy/GridField.scss b/admin/client/src/styles/legacy/GridField.scss index 495372570..b9fa3ebfd 100644 --- a/admin/client/src/styles/legacy/GridField.scss +++ b/admin/client/src/styles/legacy/GridField.scss @@ -319,6 +319,7 @@ .grid-field__paginator { position: relative; + white-space: nowrap; } // TODO create pagination component @@ -327,14 +328,15 @@ } .grid-field__paginator__controls { + white-space: nowrap; position: absolute; height: 36px; top: 50%; left: 50%; margin-top: -18px; - margin-left: -125px; // half the width of .datagrid-pagination - centers pagination + margin-left: -130px; // half the width of .datagrid-pagination - centers pagination z-index: 5; - width: 250px; + width: 260px; text-align: center; .pagination-page-number {