From fc54fa160064e50c6234dfbd17df13fee1c5984c Mon Sep 17 00:00:00 2001
From: Christopher Joe <cjoe@silverstripe.com>
Date: Tue, 28 Feb 2017 10:35:56 +1300
Subject: [PATCH] Enhancement Add class to clear underline styling for
 fieldholders

---
 admin/client/dist/styles/bundle.css                      | 5 +++++
 admin/client/src/components/FieldHolder/FieldHolder.scss | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/admin/client/dist/styles/bundle.css b/admin/client/dist/styles/bundle.css
index 3ed0c2817..50afd0396 100644
--- a/admin/client/dist/styles/bundle.css
+++ b/admin/client/dist/styles/bundle.css
@@ -15093,6 +15093,11 @@ div.TreeDropdownField a.jstree-loading .jstree-pageicon{
   display:block;
 }
 
+.form-group.field--merge-below:after{
+  border-bottom:0;
+  box-shadow:none;
+}
+
 .btn-toolbar{
   margin-top:1.2308rem;
   margin-bottom:1.2308rem;
diff --git a/admin/client/src/components/FieldHolder/FieldHolder.scss b/admin/client/src/components/FieldHolder/FieldHolder.scss
index 8e7a35d1c..8541f8383 100644
--- a/admin/client/src/components/FieldHolder/FieldHolder.scss
+++ b/admin/client/src/components/FieldHolder/FieldHolder.scss
@@ -1,3 +1,8 @@
 .form__field-message-item {
   display: block;
 }
+
+.form-group.field--merge-below:after {
+  border-bottom: 0;
+  box-shadow: none;
+}