Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

MINOR Using new setDescription() styling in HtmlEditorField

  • Loading branch information...
commit db076c0f0273ab255f6289428abdd0c51694cd42 1 parent 9e4b526
@chillu chillu authored
View
3  admin/css/screen.css
@@ -558,9 +558,6 @@ body.cms-dialog { overflow: auto; background: url("../images/textures/bg_cms_mai
.htmleditorfield-dialog .details .cms-file-info .field { border: none; -webkit-box-shadow: 0 0 0 rgba(0, 0, 0, 0); -moz-box-shadow: 0 0 0 rgba(0, 0, 0, 0); box-shadow: 0 0 0 rgba(0, 0, 0, 0); }
.htmleditorfield-dialog .details .field { border-bottom: 1px solid rgba(201, 205, 206, 0.8); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
.htmleditorfield-dialog .details .field.last { border-bottom: none; -webkit-box-shadow: 0 0 0 rgba(0, 0, 0, 0); -moz-box-shadow: 0 0 0 rgba(0, 0, 0, 0); box-shadow: 0 0 0 rgba(0, 0, 0, 0); margin-bottom: 0; }
-.htmleditorfield-dialog .details .img-detail-group { border-bottom: 1px solid rgba(201, 205, 206, 0.8); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); margin: 0 0 8px 0; }
-.htmleditorfield-dialog .details .img-detail-group .extraLabel { display: block; position: relative; top: -8px; margin-left: 184px; color: #ccc; color: rgba(0, 0, 0, 0.5); font-style: italic; padding: 0; text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.7); }
-.htmleditorfield-dialog .details .img-detail-group .field { border-bottom: none; -webkit-box-shadow: 0 0 0 rgba(0, 0, 0, 0); -moz-box-shadow: 0 0 0 rgba(0, 0, 0, 0); box-shadow: 0 0 0 rgba(0, 0, 0, 0); }
.htmleditorfield-linkform .step2 { margin-bottom: 16px; }
View
20 admin/scss/_style.scss
@@ -1530,26 +1530,6 @@ body.cms-dialog {
margin-bottom:0;
}
}
- .img-detail-group{
- border-bottom: 1px solid $color-shadow-light;
- @include box-shadow(0 1px 0 lighten($color-shadow-light, 95%));
- margin: 0 0 8px 0;
- .extraLabel{
- display:block;
- position:relative;
- top: 0 - $grid-y;
- margin-left:176px + $grid-y; //width of main label
- color: #ccc;
- color: rgba(#000, 0.5);
- font-style:italic;
- padding:0;
- @include text-shadow(1px 1px 0 rgba($color-text-shadow, 0.7));
- }
- .field{
- border-bottom:none;
- @include box-shadow(0 0 0 rgba(0, 0, 0, 0));
- }
- }
}
}
View
26 forms/HtmlEditorField.php
@@ -691,22 +691,16 @@ protected function getFieldsForImage($url, $file) {
)
)->setName("FilePreviewData")->addExtraClass('cms-file-info-data')
)->setName("FilePreview")->addExtraClass('cms-file-info'),
- CompositeField::create(
- new TextField(
- 'AltText',
- _t('HtmlEditorField.IMAGEALT', 'Alternative text (alt)'),
- $file->Title,
- 80
- ),
- new LiteralField('extraAlt', '<div class="middleColumn extraLabel">' . _t('HtmlEditorField.IMAGEALTTEXTDESC', 'Shown to screen readers or if image can not be displayed') . '</div>')
- ) -> addExtraClass('img-detail-group first'),
- CompositeField::create(
- new TextField(
- 'Title',
- _t('HtmlEditorField.IMAGETITLETEXT', 'Title text (tooltip)')
- ),
- new LiteralField('extraTitle', '<div class="middleColumn extraLabel">' . _t('HtmlEditorField.IMAGETITLETEXTDESC', 'For additional information about the image') . '</div>')
- )-> addExtraClass('img-detail-group'),
+ TextField::create(
+ 'AltText',
+ _t('HtmlEditorField.IMAGEALT', 'Alternative text (alt)'),
+ $file->Title,
+ 80
+ )->setDescription(_t('HtmlEditorField.IMAGEALTTEXTDESC', 'Shown to screen readers or if image can not be displayed')),
+ TextField::create(
+ 'Title',
+ _t('HtmlEditorField.IMAGETITLETEXT', 'Title text (tooltip)')
+ )->setDescription(_t('HtmlEditorField.IMAGETITLETEXTDESC', 'For additional information about the image')),
new TextField('CaptionText', _t('HtmlEditorField.CAPTIONTEXT', 'Caption text')),
$alignment = new DropdownField(
'CSSClass',
Please sign in to comment.
Something went wrong with that request. Please try again.