Merge branch 't/9721e'

ckeditor · Dec 27, 2012 · c824c5d · c824c5d
2 parents 8341c16 + 331ccc2
commit c824c5d
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 1 deletion.
diff --git a/skins/kama/editor_ie7.css b/skins/kama/editor_ie7.css
@@ -193,3 +193,10 @@ a.cke_button
 	/* Positioning is required for IE7 on text inputs not to stretch dialog horizontally. (#8971)*/
 	position: relative;
 }
+
+/* Reset vertical paddings which put editing area under bottom UI space. (#9721) */
+.cke_wysiwyg_div
+{
+	padding-top: 0 !important;
+	padding-bottom: 0 !important;
+}
diff --git a/skins/kama/mainui.css b/skins/kama/mainui.css
@@ -56,7 +56,7 @@ Special outer level classes used in this file:
 	-webkit-border-radius: 5px;
 	border-radius: 5px;
 	border: 1px solid #D3D3D3;
-	
+
 	/* Spacing between the outer and the inner boundaries. */
 	padding: 5px;
 }
@@ -192,4 +192,8 @@ Special outer level classes used in this file:
 	overflow: auto;
 	padding: 0 8px;
 	outline-style: none;
+
+	-moz-box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
 }
diff --git a/skins/moono/editor_ie7.css b/skins/moono/editor_ie7.css
@@ -204,3 +204,10 @@ a.cke_button
 	/* Positioning is required for IE7 on text inputs not to stretch dialog horizontally. (#8971)*/
 	position: relative;
 }
+
+/* Reset vertical paddings which put editing area under bottom UI space. (#9721) */
+.cke_wysiwyg_div
+{
+	padding-top: 0 !important;
+	padding-bottom: 0 !important;
+}
diff --git a/skins/moono/mainui.css b/skins/moono/mainui.css
@@ -218,4 +218,8 @@ Special outer level classes used in this file:
 	overflow: auto;
 	padding: 0 8px;
 	outline-style: none;
+
+	-moz-box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
 }