From 9158dead67637bd15ce6201f1575df5b261992bd Mon Sep 17 00:00:00 2001 From: Naomi Guyer Date: Thu, 18 Oct 2012 16:23:49 +1300 Subject: [PATCH] BUG: No indent on rightTitle (fixes #7950) Added margin and made non checkbox right title's match similar labels used elsewhere. --- admin/css/screen.css | 3 ++- admin/scss/_forms.scss | 23 ++++++++++++++++------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/admin/css/screen.css b/admin/css/screen.css index d61e17173..25d55efcc 100644 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -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.nolabel .middleColumn { 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.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 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; } diff --git a/admin/scss/_forms.scss b/admin/scss/_forms.scss index db718a2fb..fe6ae890b 100644 --- a/admin/scss/_forms.scss +++ b/admin/scss/_forms.scss @@ -22,7 +22,6 @@ form.nostyle { //TODO: use single border line with shadow instead:: http://daverupert.com/2011/06/two-tone-borders-with-css3/ //overflow: hidden; - // bottom padding accounts for the border and we have a negative // margin with a postive padding to ensure the bottom border extends // over the edges @@ -47,9 +46,15 @@ form.nostyle { 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 { float: left; display: block; @@ -58,11 +63,15 @@ form.nostyle { line-height: $grid-y * 2; font-weight: bold; @include text-shadow(1px 1px 0 $color-text-shadow); - } - + } &.right { cursor: pointer; - } + clear: both; + color: lighten($color-text, 20%); + display: block; + font-style: italic; + margin: $grid-y/2 0 0 $grid-x*23; + } } .middleColumn {