tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-02 14:18:46 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX:removed header from edit profile popup and restyled broken tabs - still needs a proper fix after beta II.

Browse Source
This commit is contained in:
Jeremy Bridson 2012-04-03 14:34:42 +12:00
parent fac2664e01
commit cebe2fc093
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
admin/css/screen.css
View File

@ -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; }

28
admin/scss/_style.scss
View File

@ -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;
}
}