From cebe2fc0935db76d376b576815d7f00bea6418e5 Mon Sep 17 00:00:00 2001
From: Jeremy Bridson <jeremy@silverstripe.com>
Date: Tue, 3 Apr 2012 14:34:42 +1200
Subject: [PATCH] BUGFIX:removed header from edit profile popup and restyled
 broken tabs - still needs a proper fix after beta II.

---
 admin/css/screen.css   | 11 +++++++++--
 admin/scss/_style.scss | 28 +++++++++++++++++++++++++++-
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/admin/css/screen.css b/admin/css/screen.css
index 5a195d488..043fc03a2 100644
--- a/admin/css/screen.css
+++ b/admin/css/screen.css
@@ -398,9 +398,12 @@ body.cms { overflow: hidden; }
 
 /** -------------------------------------------- Member Profile -------------------------------------------- */
 form.member-profile-form { padding: 0 16px 0 0; }
+form.member-profile-form .ui-tabs-nav { margin-right: 40px !important; float: right; }
+form.member-profile-form .ui-tabs-nav .ui-state-active, form.member-profile-form .ui-tabs-nav .ui-widget-content .ui-state-active, form.member-profile-form .ui-tabs-nav .ui-widget-header .ui-state-active { padding-bottom: 1px; margin-bottom: -1px; }
 form.member-profile-form .ui-tabs-nav .ui-state-default, form.member-profile-form .ui-tabs-nav .ui-widget-content .ui-state-default, form.member-profile-form .ui-tabs-nav .ui-widget-header .ui-state-default { border-top: none; }
-form.member-profile-form #Root_Permissions { clear: both; padding: 16px; }
-form.member-profile-form #Root_Main { clear: both; }
+form.member-profile-form .ui-tabs-nav .ui-state-default a, form.member-profile-form .ui-tabs-nav .ui-widget-content .ui-state-default a, form.member-profile-form .ui-tabs-nav .ui-widget-header .ui-state-default a { padding: 12px 20px 11px; }
+form.member-profile-form #Root_Permissions { clear: both; border-top: 1px solid #a6a6a6; }
+form.member-profile-form #Root_Main { clear: both; border-top: 1px solid #a6a6a6; padding-top: 16px; }
 form.member-profile-form #Root_Main .cms-help-toggle { text-indent: -9999em; display: inline-block; width: 20px; background: url(../images/question.png) no-repeat 0px 0px; }
 form.member-profile-form #FavouritePageID { margin-top: 8px; }
 form.member-profile-form #CsvFile .middleColumn { background: none !important; }
@@ -487,6 +490,10 @@ form.member-profile-form .ui-tabs-nav .ui-corner-all, form.member-profile-form .
 
 body.cms-dialog { overflow: auto; background: url("../images/textures/bg_cms_main_content.png") repeat left top #f0f3f4; }
 
+.ui-dialog.edit-profile-popup .ui-dialog-titlebar { height: 0px; padding: 0 4px 0 16px; }
+.ui-dialog.edit-profile-popup .ui-dialog-titlebar .ui-dialog-title { position: absolute; }
+.ui-dialog.edit-profile-popup .ss-ui-dialog { padding-right: 0px; }
+
 /** -------------------------------------------- "Insert X" forms -------------------------------------------- */
 .htmleditorfield-linkform .step2 { margin-bottom: 16px; }
 
diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss
index e911b9c7c..ab98388af 100644
--- a/admin/scss/_style.scss
+++ b/admin/scss/_style.scss
@@ -839,22 +839,35 @@ body.cms {
 form.member-profile-form {
 	padding: 0 $grid-x*2 0 0;
 	.ui-tabs-nav {
+		margin-right:40px !important; //adds a 40px gap to the right of the tabs to match designs on main CMS
+		float:right;
+		.ui-state-active, 
+		.ui-widget-content .ui-state-active, 
+		.ui-widget-header .ui-state-active {
+			padding-bottom: 1px;
+			margin-bottom:-1px;
+		}
 		.ui-state-default,
 		.ui-widget-content .ui-state-default,
 		.ui-widget-header .ui-state-default {
 			border: {
 				top:none;
 			}
+			a {
+				padding:12px 20px 11px;
+			}
 		}
 	}
 
 	#Root_Permissions {
 		clear:both;
-		padding: $grid-x*2;
+		border-top: 1px solid darken($color-tab, 20%);
 	}
 
 	#Root_Main {
 		clear:both;
+		border-top: 1px solid darken($color-tab, 20%);
+		padding-top:$grid-y*2;
 		.cms-help-toggle {
 			text-indent: -9999em;
 			display: inline-block;
@@ -1296,6 +1309,19 @@ body.cms-dialog {
 	background: url("../images/textures/bg_cms_main_content.png") repeat left top #F0F3F4;
 }
 
+.ui-dialog.edit-profile-popup {
+	.ui-dialog-titlebar {
+		height:0px; //removes the header outside of the iframe on edit profile popup. 
+		padding:0 4px 0 16px;
+
+		.ui-dialog-title {
+			position:absolute;
+		}
+	}
+	.ss-ui-dialog {
+		padding-right:0px;
+	}
+}