Merge branch 't/9619b'

ckeditor · Nov 14, 2012 · eff95ad · eff95ad
2 parents d9c56a0 + e68dcc0
commit eff95ad
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/core/creators/themedui.js b/core/creators/themedui.js
@@ -310,11 +310,9 @@ CKEDITOR.replaceClass = 'ckeditor';
 				' aria-labelledby="cke_{name}_arialbl">' +
 				'<span id="cke_{name}_arialbl" class="cke_voice_label">{voiceLabel}</span>' +
 					'<{outerEl} class="cke_inner cke_reset" role="presentation">' +
-						'<span id="{topId}" class="cke_top cke_reset_all"' +
-						' role="presentation" style="height:auto">{topHtml}</span>' +
-						'<{outerEl} id="{contentId}" class="cke_contents cke_reset"' +
-						' role="presentation"></{outerEl}>' +
-						'<span id="{bottomId}" class="cke_bottom cke_reset_all" role="presentation">{bottomHtml}</span>' +
+						'{topHtml}' +
+						'<{outerEl} id="{contentId}" class="cke_contents cke_reset" role="presentation"></{outerEl}>' +
+						'{bottomHtml}' +
 					'</{outerEl}>' +
 				'</{outerEl}>' );
 		}
@@ -325,11 +323,9 @@ CKEDITOR.replaceClass = 'ckeditor';
 			langDir: editor.lang.dir,
 			langCode: editor.langCode,
 			voiceLabel: editor.lang.editor,
-			topId: editor.ui.spaceId( 'top' ),
-			topHtml: topHtml || '',
+			topHtml: topHtml ? '<span id="' + editor.ui.spaceId( 'top' ) + '" class="cke_top cke_reset_all" role="presentation" style="height:auto">' + topHtml + '</span>' : '',
 			contentId: editor.ui.spaceId( 'contents' ),
-			bottomId: editor.ui.spaceId( 'bottom' ),
-			bottomHtml: bottomHtml || '',
+			bottomHtml: bottomHtml ? '<span id="' + editor.ui.spaceId( 'bottom' ) + '" class="cke_bottom cke_reset_all" role="presentation">' + bottomHtml + '</span>' : '',
 			outerEl: CKEDITOR.env.ie ? 'span' : 'div'	// #9571
 		}));
 
@@ -343,8 +339,8 @@ CKEDITOR.replaceClass = 'ckeditor';
 
 		// Make top and bottom spaces unelectable, but not content space,
 		// otherwise the editable area would be affected.
-		editor.ui.space( 'top' ).unselectable();
-		editor.ui.space( 'bottom' ).unselectable();
+		topHtml && editor.ui.space( 'top' ).unselectable();
+		bottomHtml && editor.ui.space( 'bottom' ).unselectable();
 
 		var width = editor.config.width, height = editor.config.height;
 		if ( width )

diff --git a/skins/moono/elementspath.css b/skins/moono/elementspath.css
@@ -23,6 +23,7 @@ The following is a visual representation of its main elements:
 .cke_path
 {
 	float: left;
+	margin: -2px 0 2px;
 }
 
 /* Each item of the elements path. */

diff --git a/skins/moono/mainui.css b/skins/moono/mainui.css
@@ -125,7 +125,7 @@ Special outer level classes used in this file:
 
 .cke_bottom
 {
-	padding: 4px 8px;
+	padding: 6px 8px 2px;
 	position: relative;
 
 	border-top: 1px solid #bfbfbf;
@@ -164,7 +164,11 @@ Special outer level classes used in this file:
 	font-size: 0;
 	vertical-align: bottom;
 
-	margin-top: 8px;
+	margin-top: 6px;
+
+	/* 	A margin in case of no other element in the same container
+		to keep a distance to the bottom edge. */
+	margin-bottom: 2px;
 
 	-moz-box-shadow: 0 1px 0 rgba(255,255,255,.3);
 	-webkit-box-shadow: 0 1px 0 rgba(255,255,255,.3);