From 236e335a0abfb2141ec9aba2637fc0a19452f65b Mon Sep 17 00:00:00 2001
From: Joel Edwards <joel@silverstripe.com>
Date: Thu, 13 Dec 2012 15:01:06 +1300
Subject: [PATCH] Permission list styling improvements (#8100)

---
 admin/css/screen.css           |  4 +++-
 admin/scss/_SecurityAdmin.scss | 21 ++++++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/admin/css/screen.css b/admin/css/screen.css
index 8074e56d186..d9f0f04d2f5 100644
--- a/admin/css/screen.css
+++ b/admin/css/screen.css
@@ -971,7 +971,9 @@ li.class-ErrorPage > a a .jstree-pageicon { background-position: 0 -112px; }
 .ModelAdmin .cms-content-fields .cms-content-tools .cms-panel-content .cms-search-form .resetformaction { margin-right: 0px; }
 .ModelAdmin .cms-content-fields .cms-content-tools .cms-panel-content #Form_ImportForm { overflow: hidden; }
 
-.SecurityAdmin .permissioncheckboxset .optionset li, .SecurityAdmin .permissioncheckboxsetfield_readonly .optionset li { float: none; width: auto; }
+.permissioncheckboxset h5, .permissioncheckboxsetfield_readonly h5 { margin: 0; }
+.permissioncheckboxset .optionset, .permissioncheckboxsetfield_readonly .optionset { overflow: auto; }
+.permissioncheckboxset .optionset li, .permissioncheckboxsetfield_readonly .optionset li { float: none; width: auto; clear: both; }
 
 /* For user permissions the readonly checkboxes are set as display none and are replaced with a <span> that has a 
 green tick icon as a background this is created using compass generated classes and hardcoded in the php */
diff --git a/admin/scss/_SecurityAdmin.scss b/admin/scss/_SecurityAdmin.scss
index d815717d6c6..f87e058fb30 100644
--- a/admin/scss/_SecurityAdmin.scss
+++ b/admin/scss/_SecurityAdmin.scss
@@ -1,12 +1,15 @@
-.SecurityAdmin {
-	// Same rules in .member-profile-form
-	.permissioncheckboxset, .permissioncheckboxsetfield_readonly {
-		.optionset {
-			li {
-				float: none;
-				width: auto;
-			}	
-		}
+.permissioncheckboxset, .permissioncheckboxsetfield_readonly {
+	h5 {
+		margin: 0;
+	}
+	.optionset {
+		overflow: auto;
+
+		li {
+			float: none;
+			width: auto;
+			clear: both;
+		}	
 	}
 }