Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

BUGFIX: Insert link styling broken, and inconsistent with Insert medi…

…a (fixes #7528)
  • Loading branch information...
commit e51bf760e9912067570c27ccb24c2b3e2385dbb7 1 parent 609eaba
@adrexia adrexia authored
View
2  admin/css/screen.css
@@ -563,7 +563,7 @@ body.cms-dialog { overflow: auto; background: url("../images/textures/bg_cms_mai
.htmleditorfield-dialog .ui-tabs ul.ui-tabs-nav li.ui-state-active { background: #f0f3f4 url("../admin/images/textures/bg_cms_main_content.png") repeat left top; }
.htmleditorfield-dialog .ui-tabs ul.ui-tabs-nav li.ui-state-active a { color: #444444; text-shadow: none; }
.htmleditorfield-dialog .ui-tabs .ui-tabs-panel { padding: 0; }
-.htmleditorfield-dialog .ss-insert-media, .htmleditorfield-dialog .Actions { padding: 8px 16px; }
+.htmleditorfield-dialog .ss-insert-media, .htmleditorfield-dialog .Actions, .htmleditorfield-dialog .ss-insert-link { padding: 8px 16px; }
.htmleditorfield-dialog .details .file-url { display: block; width: 450px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; -o-text-overflow: ellipsis; }
.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); }
View
2  admin/scss/_style.scss
@@ -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{
View
13 forms/HtmlEditorField.php
@@ -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(
@@ -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);
Please sign in to comment.
Something went wrong with that request. Please try again.