Skip to content

Commit

Permalink
BUGFIX: Insert link styling broken, and inconsistent with Insert media (
Browse files Browse the repository at this point in the history
fixes #7528)
  • Loading branch information
adrexia committed Jun 25, 2012
1 parent 609eaba commit e51bf76
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion admin/css/screen.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion admin/scss/_style.scss
Expand Up @@ -1544,7 +1544,7 @@ body.cms-dialog {
padding:0;
}
}
.ss-insert-media, .Actions{
.ss-insert-media, .Actions, .ss-insert-link{
padding:$grid-y $grid-x*2 ;
}
.details{
Expand Down
13 changes: 8 additions & 5 deletions forms/HtmlEditorField.php
Expand Up @@ -299,9 +299,11 @@ function LinkForm() {
$this->controller,
"{$this->name}/LinkForm",
new FieldList(
new LiteralField(
'Heading',
sprintf('<h3>%s</h3>', _t('HtmlEditorField.LINK', 'Insert Link'))
$headerWrap = new CompositeField(
new LiteralField(
'Heading',
sprintf('<h3 class="htmleditorfield-mediaform-heading insert">%s</h3>', _t('HtmlEditorField.LINK', 'Insert Link'))
)
),
$contentComposite = new CompositeField(
new OptionsetField(
Expand Down Expand Up @@ -340,8 +342,9 @@ function LinkForm() {
->setUseButtonTag(true)
)
);

$contentComposite->addExtraClass('content');

$headerWrap->addExtraClass('CompositeField composite cms-content-header nolabel ');
$contentComposite->addExtraClass('ss-insert-link content');

$form->unsetValidator();
$form->loadDataFrom($this);
Expand Down

0 comments on commit e51bf76

Please sign in to comment.