From 82c5b91debb8bbdb6c2f34c1ccb4cbaa6dffeb82 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 9 Aug 2016 13:30:19 +0200 Subject: [PATCH] Fixes: U4-8832 Remove custom styling of pagination on list views --- .../src/less/listview.less | 45 ------------------- .../propertyeditors/listview/listview.html | 20 +++++---- 2 files changed, 11 insertions(+), 54 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/listview.less b/src/Umbraco.Web.UI.Client/src/less/listview.less index 88762edf0c..95c8a49b36 100644 --- a/src/Umbraco.Web.UI.Client/src/less/listview.less +++ b/src/Umbraco.Web.UI.Client/src/less/listview.less @@ -166,51 +166,6 @@ background: none } -.umb-listview .pagination { - margin: 0; -} - -.umb-listview .table th { - font-weight: normal -} - -.umb-listview .showing { - padding: 8px 4px 2px 4px; - background: none; - font-size: 11px; - color: #b0b0b0 -} - -.umb-listview .pagination { - text-align: center; -} - -.umb-listview .pagination ul { - -webkit-border-radius: 0px; - -moz-border-radius: 0px; - border-radius: 0px; - -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0); - -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0); - box-shadow: 0 1px 2px rgba(0, 0, 0, 0); - background: none -} - -.umb-listview .pagination ul > li > a, .pagination ul > li > span { - border:none; - padding: 8px 4px 2px 4px; - background: none; - font-size: 12px; - color: #b0b0b0 -} - -.umb-listview .pagination ul > li.active > a, .umb-listview .pagination ul > li > a:hover { - color: @black; -} - -.umb-listview .pagination ul > li.disabled > a, .umb-listview .pagination ul > li.disabled > a:hover { - color: @grayLight; -} - /* TEMP */ .umb-listview .table-striped tbody td { diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html index 742d1251cb..3969483734 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html @@ -136,7 +136,7 @@ ng-if="options.allowBulkDelete && (buttonPermissions == null || buttonPermissions.canDelete)" type="button" button-style="link" - label="Delete" + label="Delete" label-key="actions_delete" icon="icon-trash" action="delete()" @@ -162,14 +162,16 @@ - - +
+ + +