Skip to content
This repository
Browse code

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

…a (fixes #7528)
  • Loading branch information...
commit e51bf760e9912067570c27ccb24c2b3e2385dbb7 1 parent 609eaba
Naomi Guyer authored June 25, 2012
2  admin/css/screen.css
@@ -563,7 +563,7 @@ body.cms-dialog { overflow: auto; background: url("../images/textures/bg_cms_mai
563 563
 .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; }
564 564
 .htmleditorfield-dialog .ui-tabs ul.ui-tabs-nav li.ui-state-active a { color: #444444; text-shadow: none; }
565 565
 .htmleditorfield-dialog .ui-tabs .ui-tabs-panel { padding: 0; }
566  
-.htmleditorfield-dialog .ss-insert-media, .htmleditorfield-dialog .Actions { padding: 8px 16px; }
  566
+.htmleditorfield-dialog .ss-insert-media, .htmleditorfield-dialog .Actions, .htmleditorfield-dialog .ss-insert-link { padding: 8px 16px; }
567 567
 .htmleditorfield-dialog .details .file-url { display: block; width: 450px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; -o-text-overflow: ellipsis; }
568 568
 .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); }
569 569
 .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); }
2  admin/scss/_style.scss
@@ -1544,7 +1544,7 @@ body.cms-dialog {
1544 1544
 			padding:0;
1545 1545
 		}
1546 1546
 	}
1547  
-	.ss-insert-media, .Actions{
  1547
+	.ss-insert-media, .Actions, .ss-insert-link{
1548 1548
 		padding:$grid-y $grid-x*2 ;
1549 1549
 	}
1550 1550
 	.details{
13  forms/HtmlEditorField.php
@@ -299,9 +299,11 @@ function LinkForm() {
299 299
 			$this->controller,
300 300
 			"{$this->name}/LinkForm", 
301 301
 			new FieldList(
302  
-				new LiteralField(
303  
-					'Heading', 
304  
-					sprintf('<h3>%s</h3>', _t('HtmlEditorField.LINK', 'Insert Link'))
  302
+				$headerWrap = new CompositeField(
  303
+					new LiteralField(
  304
+						'Heading', 
  305
+						sprintf('<h3 class="htmleditorfield-mediaform-heading insert">%s</h3>', _t('HtmlEditorField.LINK', 'Insert Link'))
  306
+					)
305 307
 				),
306 308
 				$contentComposite = new CompositeField(
307 309
 					new OptionsetField(
@@ -340,8 +342,9 @@ function LinkForm() {
340 342
 					->setUseButtonTag(true)
341 343
 			)
342 344
 		);
343  
-		
344  
-		$contentComposite->addExtraClass('content');
  345
+
  346
+		$headerWrap->addExtraClass('CompositeField composite cms-content-header nolabel ');		
  347
+		$contentComposite->addExtraClass('ss-insert-link content');
345 348
 		
346 349
 		$form->unsetValidator();
347 350
 		$form->loadDataFrom($this);

0 notes on commit e51bf76

Please sign in to comment.
Something went wrong with that request. Please try again.