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

Merge pull request #888 from adrexia/7940-right-title-fix

Browse Source 
BUG: No indent on Right Title (fixes #7950)
This commit is contained in:
Will Rossiter 2012-10-17 21:51:55 -07:00
commit e62a5116da
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin/css/screen.css
View File

@ -149,8 +149,9 @@ form.nostyle input.text, form.nostyle textarea, form.nostyle select, form.nostyl
.field:after { content: "\0020"; display: block; height: 0; clear: both; overflow: hidden; visibility: hidden; } .field:after { content: "\0020"; display: block; height: 0; clear: both; overflow: hidden; visibility: hidden; }
.field.nolabel .middleColumn { margin-left: 0; } .field.nolabel .middleColumn { margin-left: 0; }
.field.nolabel .help { margin-left: 0; } .field.nolabel .help { margin-left: 0; }
.field.checkbox label.right { margin: 4px 0 0 0; display: inline; font-style: normal; color: #444444; clear: none; }
.field label.left { float: left; display: block; width: 176px; padding: 8px 8px 8px 0; line-height: 16px; font-weight: bold; text-shadow: 1px 1px 0 white; } .field label.left { float: left; display: block; width: 176px; padding: 8px 8px 8px 0; line-height: 16px; font-weight: bold; text-shadow: 1px 1px 0 white; }
.field label.right { cursor: pointer; } .field label.right { cursor: pointer; clear: both; color: #777777; display: block; font-style: italic; margin: 4px 0 0 184px; }
.field .middleColumn { margin-left: 184px; } .field .middleColumn { margin-left: 184px; }
.field span.readonly { padding-top: 8px; line-height: 16px; display: block; } .field span.readonly { padding-top: 8px; line-height: 16px; display: block; }
.field .help { clear: both; color: #777777; display: block; font-style: italic; margin: 4px 0 0 184px; } .field .help { clear: both; color: #777777; display: block; font-style: italic; margin: 4px 0 0 184px; }

23
admin/scss/_forms.scss
View File

@ -22,7 +22,6 @@ form.nostyle {
//TODO: use single border line with shadow instead:: http://daverupert.com/2011/06/two-tone-borders-with-css3/ //TODO: use single border line with shadow instead:: http://daverupert.com/2011/06/two-tone-borders-with-css3/
//overflow: hidden; //overflow: hidden;
// bottom padding accounts for the border and we have a negative // bottom padding accounts for the border and we have a negative
// margin with a postive padding to ensure the bottom border extends // margin with a postive padding to ensure the bottom border extends
// over the edges // over the edges
@ -47,9 +46,15 @@ form.nostyle {
margin-left: 0; margin-left: 0;
} }
} }
label { &.checkbox label.right{
margin: $grid-y/2 0 0 0;
display:inline;
font-style: normal;
color: $color-text;
clear:none;
}
label {
&.left { &.left {
float: left; float: left;
display: block; display: block;
@ -58,11 +63,15 @@ form.nostyle {
line-height: $grid-y * 2; line-height: $grid-y * 2;
font-weight: bold; font-weight: bold;
@include text-shadow(1px 1px 0 $color-text-shadow); @include text-shadow(1px 1px 0 $color-text-shadow);
} }
&.right { &.right {
cursor: pointer; cursor: pointer;
} clear: both;
color: lighten($color-text, 20%);
display: block;
font-style: italic;
margin: $grid-y/2 0 0 $grid-x*23;
}
} }
.middleColumn { .middleColumn {