tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1346 from ajshort/pulls/tab-panel-padding 

Include padding on padded edit form panels inside a tabset
This commit is contained in:
Andrew Short 2013-03-30 04:16:54 -07:00
parent 94ea56b604 10f46ba08e
commit cc5cfed1e5
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
admin/css/screen.css
View File

@ -375,6 +375,7 @@ body.cms { overflow: hidden; }
.ui-tabs .ui-tabs { position: static; }
.ui-tabs .ui-tabs-panel { padding: 24px; background: transparent; border: 0; }
.ui-tabs .ui-tabs-panel.cms-edit-form { padding: 0; }
.ui-tabs .ui-tabs-panel.cms-panel-padded { padding: 16px 16px; }
.ui-tabs .ui-widget-header { border: 0; background: none; }
.ui-tabs .ui-tabs-nav { float: right; margin: 16px 0 -1px 0; padding: 0 12px 0 0; border-bottom: none; }
.ui-tabs .ui-tabs-nav ~ .ui-tabs-panel { border-top: 1px solid #c0c0c2; clear: both; }

4
admin/scss/_style.scss
View File

@ -162,9 +162,13 @@ body.cms {
padding: $grid-x*3;
background: transparent; // default it's white
border: 0; // suppress default borders
&.cms-edit-form {
padding: 0;
}
&.cms-panel-padded {
padding: $grid-y*2 $grid-x*2;
}
}
.ui-widget-header {