From 9cee3c25fba2724bd52becfa1ee13973c8c7e763 Mon Sep 17 00:00:00 2001 From: Paul Clarke Date: Thu, 15 Sep 2016 15:44:03 +1200 Subject: [PATCH] Remove custom reportAdmin css overrides --- code/ReportAdmin.php | 2 +- javascript/ReportAdmin.js | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/code/ReportAdmin.php b/code/ReportAdmin.php index ba3fbe37..03820714 100644 --- a/code/ReportAdmin.php +++ b/code/ReportAdmin.php @@ -242,7 +242,7 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider $actions = new FieldList(); $form = new Form($this, "EditForm", $fields, $actions); - $form->addExtraClass('cms-edit-form cms-panel-padded center ' . $this->BaseCSSClasses()); + $form->addExtraClass('panel panel--padded panel--scrollable cms-edit-form cms-panel-padded' . $this->BaseCSSClasses()); $form->loadDataFrom($this->request->getVars()); $this->extend('updateEditForm', $form); diff --git a/javascript/ReportAdmin.js b/javascript/ReportAdmin.js index 20f5f719..fb5d3d4a 100644 --- a/javascript/ReportAdmin.js +++ b/javascript/ReportAdmin.js @@ -6,7 +6,7 @@ $.entwine('ss', function($){ $('.ReportAdmin .cms-edit-form').entwine({ onsubmit: function(e) { - var url = $.path.parseUrl(document.location.href).hrefNoSearch, + var url = $.path.parseUrl(document.location.href).hrefNoSearch, params = this.find(':input[name^=filters]').serializeArray(); params = $.grep(params, function(param) {return (param.value);}); // filter out empty if(params) url = $.path.addSearchParams(url, $.param(params)); @@ -14,10 +14,5 @@ return false; } }); - - $('.ReportAdmin').css({ - 'overflow-y': 'scroll', - 'padding-top': 0 - }); }); })(jQuery);