From 7ff273263a7146731a0df0bc6a39cb3ffdfddbb8 Mon Sep 17 00:00:00 2001
From: jbridson <jeremy@silverstripe.com>
Date: Tue, 13 Mar 2012 10:54:57 +1300
Subject: [PATCH] BUGFIX:fixed issues with overflow on model and security admin
 - made changes more specific.

---
 admin/css/screen.css           |  5 +++++
 admin/scss/_ModelAdmin.scss    | 28 +++++++++++++++++-----------
 admin/scss/_SecurityAdmin.scss | 12 +++++++++++-
 3 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/admin/css/screen.css b/admin/css/screen.css
index 17a022ee2..974c70ebc 100644
--- a/admin/css/screen.css
+++ b/admin/css/screen.css
@@ -668,9 +668,14 @@ li.class-ErrorPage > a .jstree-pageicon { background-position: 0 -112px; }
 .cms-menu-list.collapsed li .text, .cms-menu-list.collapsed li .toggle-children { display: none; }
 .cms-menu-list.collapsed li > li { display: none; }
 
+.ModelAdmin .cms-content-fields { overflow: hidden; }
+.ModelAdmin .cms-content-fields .cms-edit-form { overflow-y: auto; }
 .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 .cms-search-form .resetformaction span { padding-left: 0px; }
 .ModelAdmin .cms-content-fields .cms-content-tools .cms-panel-content #Form_ImportForm { overflow: hidden; }
 
 .SecurityAdmin .cms-edit-form .cms-content-header h2 { display: none; }
 .SecurityAdmin .permissioncheckboxset .optionset li, .SecurityAdmin .permissioncheckboxsetfield_readonly .optionset li { float: none; width: auto; }
+
+.cms .cms-content .SecurityAdmin .cms-content-fields { overflow-y: auto; }
+.cms .cms-content .SecurityAdmin .cms-content-fields .aligned-right-label { margin-left: 184px; padding: 8px 0; }
diff --git a/admin/scss/_ModelAdmin.scss b/admin/scss/_ModelAdmin.scss
index 9e02fc992..2ec7615db 100644
--- a/admin/scss/_ModelAdmin.scss
+++ b/admin/scss/_ModelAdmin.scss
@@ -1,13 +1,19 @@
-.ModelAdmin .cms-content-fields .cms-content-tools .cms-panel-content {
-	.cms-search-form {
-		.resetformaction {
-			margin-right:0px;
-			span {
-				padding-left:0px;
+.ModelAdmin .cms-content-fields {
+	overflow:hidden; //removes scrolling from filter panel
+	.cms-edit-form {
+		overflow-y:auto; //adds scrolling only to the datagrid 
+	}
+	.cms-content-tools .cms-panel-content {
+		.cms-search-form {
+			.resetformaction {
+				margin-right:0px;
+				span {
+					padding-left:0px;
+				}
 			}
 		}
-	}
-	#Form_ImportForm {
-		overflow:hidden;
-	}
-}
\ No newline at end of file
+		#Form_ImportForm {
+			overflow:hidden;
+		}
+	}	
+}
diff --git a/admin/scss/_SecurityAdmin.scss b/admin/scss/_SecurityAdmin.scss
index cd05b0d34..c294d9748 100644
--- a/admin/scss/_SecurityAdmin.scss
+++ b/admin/scss/_SecurityAdmin.scss
@@ -12,4 +12,14 @@
 			}	
 		}
 	}
-}
\ No newline at end of file
+}
+
+.cms .cms-content .SecurityAdmin { //datagrid overflow on Security Admin	
+	.cms-content-fields {
+		overflow-y:auto;
+		.aligned-right-label { //align the label with the parent group field in add new group
+			margin-left:$grid-x*23;
+			padding:$grid-x 0;
+		}
+	}
+}