Skip to content
This repository
Browse code

BUGFIX:SSF-38 - fixed the issue with the size of the popup being to l…

…arge on-load - added overflow scroll. Altered the header and tabs to match the style of edit profile.
  • Loading branch information...
commit 6c697e5d05934111e784c8bb242adb4726c03526 1 parent c3d1c3c
authored April 05, 2012
17  admin/css/screen.css
@@ -468,15 +468,16 @@ form.member-profile-form .ui-tabs-nav .ui-corner-all, form.member-profile-form .
468 468
 .cms .ui-dialog .ss-ui-dialog.ui-dialog-content { padding-top: 0px; }
469 469
 
470 470
 .ui-dialog { background: url("../images/textures/bg_cms_main_content.png") repeat left top #f0f3f4; border: 3px solid #000 !important; border-radius: 8px; overflow: visible; padding: 0; }
471  
-.ui-dialog .ui-dialog-titlebar.ui-widget-header { font-size: 14px; padding: 4px 4px 4px 16px; border: none; background-color: transparent; background-image: url(../images/textures/cms_content_header.png); background-repeat: repeat; -moz-box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px inset; -webkit-box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px inset; -o-box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px inset; box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px inset; }
472  
-.ui-dialog .cms-dialog-content { background: url("../images/textures/bg_cms_main_content.png") repeat left top #f0f3f4; padding-bottom: 8px; overflow: visible; }
  471
+.ui-dialog .ui-dialog-titlebar.ui-widget-header { font-size: 14px; padding: 0; border: none; background-color: transparent; background-image: url(../images/textures/cms_content_header.png); background-repeat: repeat; -moz-box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px inset; -webkit-box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px inset; -o-box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px inset; box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px inset; }
  472
+.ui-dialog .ui-dialog-titlebar.ui-widget-header .ui-dialog-title { position: absolute; }
  473
+.ui-dialog .cms-dialog-content { background: url("../images/textures/bg_cms_main_content.png") repeat left top #f0f3f4; padding-bottom: 8px; padding-top: 0px; }
473 474
 .ui-dialog .cms-dialog-content .Actions { overflow: auto; margin: 8px 0; padding-bottom: 8px; float: right; }
474 475
 .ui-dialog .cms-dialog-content .ss-tabset { -moz-border-radius: none; -webkit-border-radius: none; -o-border-radius: none; -ms-border-radius: none; -khtml-border-radius: none; border-radius: none; }
475 476
 .ui-dialog .cms-dialog-content .ss-tabset .tab { background: none; overflow-y: auto; }
476 477
 .ui-dialog .cms-dialog-content .ss-tabset.ui-tabs { background: none; }
477  
-.ui-dialog .cms-dialog-content .ss-tabset.ui-tabs .ui-tabs-nav { border: none; padding: 0 40px 0 0; float: right; margin-top: -44px; }
478  
-.ui-dialog .cms-dialog-content .ss-tabset.ui-tabs .ui-tabs-nav li { font-weight: bold; line-height: 16px; padding: 12px 12px 10px; border-bottom: 2px solid #B3B3B3; }
479  
-.ui-dialog .cms-dialog-content .ss-tabset.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: -1px; }
  478
+.ui-dialog .cms-dialog-content .ss-tabset.ui-tabs .ui-tabs-nav { border: none; padding: 0 40px 0 0; float: right; }
  479
+.ui-dialog .cms-dialog-content .ss-tabset.ui-tabs .ui-tabs-nav li { margin: 0; font-weight: bold; line-height: 16px; padding: 12px 12px 10px; border-bottom: 2px solid #B3B3B3; }
  480
+.ui-dialog .cms-dialog-content .ss-tabset.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: -1px; padding-bottom: 11px; }
480 481
 .ui-dialog .cms-dialog-content .ss-tabset.ui-tabs .ui-tabs-nav li:first-child { margin-left: 15px; }
481 482
 .ui-dialog .cms-dialog-content .ss-tabset.ui-tabs .ui-tabs-nav .ui-state-focus a { outline: none; }
482 483
 .ui-dialog .cms-dialog-content .ss-tabset.ui-tabs .ui-tabs-nav .ui-state-default, .ui-dialog .cms-dialog-content .ss-tabset.ui-tabs .ui-tabs-nav .ui-widget-content .ui-state-default, .ui-dialog .cms-dialog-content .ss-tabset.ui-tabs .ui-tabs-nav .ui-widget-header .ui-state-default { background-color: #b0bec7; background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjUwJSIgeTE9IjAlIiB4Mj0iNTAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2IwYmVjNyIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzhjYTFhZSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background-size: 100%; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #b0bec7), color-stop(100%, #8ca1ae)); background-image: -webkit-linear-gradient(#b0bec7, #8ca1ae); background-image: -moz-linear-gradient(#b0bec7, #8ca1ae); background-image: -o-linear-gradient(#b0bec7, #8ca1ae); background-image: -ms-linear-gradient(#b0bec7, #8ca1ae); background-image: linear-gradient(#b0bec7, #8ca1ae); border-right-color: #a6a6a6; border-left-color: #d9d9d9; border-bottom: none; border-top: none; text-shadow: white 0 1px 0; }
@@ -484,16 +485,12 @@ form.member-profile-form .ui-tabs-nav .ui-corner-all, form.member-profile-form .
484 485
 .ui-dialog .cms-dialog-content .ss-tabset.ui-tabs .ui-tabs-nav .ui-state-active a, .ui-dialog .cms-dialog-content .ss-tabset.ui-tabs .ui-tabs-nav .ui-widget-content .ui-state-active a, .ui-dialog .cms-dialog-content .ss-tabset.ui-tabs .ui-tabs-nav .ui-widget-header .ui-state-active a { border-bottom: none; border-top: none; }
485 486
 .ui-dialog .cms-dialog-content .ss-tabset.ui-tabs .ui-tabs-nav .ui-corner-all, .ui-dialog .cms-dialog-content .ss-tabset.ui-tabs .ui-tabs-nav .ui-corner-top, .ui-dialog .cms-dialog-content .ss-tabset.ui-tabs .ui-tabs-nav .ui-corner-right, .ui-dialog .cms-dialog-content .ss-tabset.ui-tabs .ui-tabs-nav .ui-corner-tr { border-radius: 0; }
486 487
 .ui-dialog .cms-dialog-content .ss-tabset.ui-tabs .ui-tabs-nav .ui-corner-all, .ui-dialog .cms-dialog-content .ss-tabset.ui-tabs .ui-tabs-nav .ui-corner-top, .ui-dialog .cms-dialog-content .ss-tabset.ui-tabs .ui-tabs-nav .ui-corner-left, .ui-dialog .cms-dialog-content .ss-tabset.ui-tabs .ui-tabs-nav .ui-corner-tl { border-radius: 0; }
487  
-.ui-dialog .cms-dialog-content .ss-tabset.ui-tabs .ui-tabs-panel { background: url("../images/textures/bg_cms_main_content.png") repeat left top #f0f3f4; overflow-x: hidden; }
  488
+.ui-dialog .cms-dialog-content .ss-tabset.ui-tabs .ui-tabs-panel { background: url("../images/textures/bg_cms_main_content.png") repeat left top #f0f3f4; overflow-x: hidden; clear: both; border-top: 1px solid #a6a6a6; }
488 489
 .ui-dialog .cms-dialog-content .clear { clear: both; }
489 490
 .ui-dialog.loading { background-image: url(../images/spinner.gif); background-position: 50% 50%; background-repeat: no-repeat; }
490 491
 
491 492
 body.cms-dialog { overflow: auto; background: url("../images/textures/bg_cms_main_content.png") repeat left top #f0f3f4; }
492 493
 
493  
-.ui-dialog.edit-profile-popup .ui-dialog-titlebar { height: 0px; padding: 0 4px 0 16px; }
494  
-.ui-dialog.edit-profile-popup .ui-dialog-titlebar .ui-dialog-title { position: absolute; }
495  
-.ui-dialog.edit-profile-popup .ss-ui-dialog { padding-right: 0px; }
496  
-
497 494
 /** -------------------------------------------- "Insert X" forms -------------------------------------------- */
498 495
 .htmleditorfield-linkform .step2 { margin-bottom: 16px; }
499 496
 
33  admin/scss/_style.scss
@@ -1176,11 +1176,11 @@ form.member-profile-form {
1176 1176
 	border-radius: $grid-y;
1177 1177
   overflow: visible;
1178 1178
   padding: 0;
1179  
-
  1179
+ 
1180 1180
   // Titlebar for pop-up dialog.
1181 1181
 	.ui-dialog-titlebar.ui-widget-header {
1182 1182
 	  	font-size: $font-base-size+2;
1183  
-		padding: $grid-y/2 $grid-x/2 $grid-y/2 $grid-x*2;
  1183
+		padding: 0;
1184 1184
 		border:none;
1185 1185
 		background: {
1186 1186
 			color:transparent;
@@ -1188,12 +1188,15 @@ form.member-profile-form {
1188 1188
 			repeat:repeat;	
1189 1189
 		}
1190 1190
 		@include box-shadow($color-shadow-dark 0 0 ($grid-x / 2) inset);
  1191
+		.ui-dialog-title {
  1192
+			position:absolute;
  1193
+		}
1191 1194
 	}
1192 1195
 
1193 1196
 	.cms-dialog-content {
1194 1197
 		background: url("../images/textures/bg_cms_main_content.png") repeat left top #F0F3F4;
1195 1198
 		padding-bottom: $grid-y;
1196  
-		overflow:visible;
  1199
+		padding-top:0px;
1197 1200
 
1198 1201
 		.Actions {
1199 1202
 			overflow: auto;
@@ -1216,12 +1219,13 @@ form.member-profile-form {
1216 1219
 				.ui-tabs-nav {
1217 1220
 					border: none;
1218 1221
 					padding: 0 $grid-x*5 0 0; //allows for 40px gap to the right of tabs to match the tabs on main CMS
1219  
-					float: right;
1220  
-					margin-top:-44px;
  1222
+					float:right;
1221 1223
 
1222 1224
 					li {	
  1225
+						margin:0;
1223 1226
 						&.ui-tabs-selected {
1224 1227
 							margin-bottom: -1px;
  1228
+							padding-bottom:11px;
1225 1229
 						}
1226 1230
 
1227 1231
 						&:first-child {
@@ -1288,6 +1292,8 @@ form.member-profile-form {
1288 1292
 				.ui-tabs-panel {
1289 1293
 					background: url("../images/textures/bg_cms_main_content.png") repeat left top #F0F3F4;
1290 1294
 					overflow-x:hidden;
  1295
+					clear:both;
  1296
+					border-top: 1px solid darken($color-tab, 20%);
1291 1297
 				}
1292 1298
 			}
1293 1299
 		}
@@ -1309,23 +1315,6 @@ body.cms-dialog {
1309 1315
 	background: url("../images/textures/bg_cms_main_content.png") repeat left top #F0F3F4;
1310 1316
 }
1311 1317
 
1312  
-.ui-dialog.edit-profile-popup {
1313  
-	.ui-dialog-titlebar {
1314  
-		height:0px; //removes the header outside of the iframe on edit profile popup. 
1315  
-		padding:0 4px 0 16px;
1316  
-
1317  
-		.ui-dialog-title {
1318  
-			position:absolute;
1319  
-		}
1320  
-	}
1321  
-	.ss-ui-dialog {
1322  
-		padding-right:0px;
1323  
-	}
1324  
-}
1325  
-
1326  
-
1327  
-
1328  
-
1329 1318
 /** --------------------------------------------
1330 1319
  * "Insert X" forms
1331 1320
  * -------------------------------------------- */

0 notes on commit 6c697e5

Please sign in to comment.
Something went wrong with that request. Please try again.