Merge branch 't/9947a'

ckeditor · Feb 21, 2013 · 556cb20 · 556cb20 · jimmykane · Sep 3, 2013
2 parents 9f27ae2 + f370f54
commit 556cb20
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/skins/kama/mainui.css b/skins/kama/mainui.css
@@ -114,6 +114,7 @@ Special outer level classes used in this file:
 	border: 1px solid black;
 }
 
+
 /* Make the main spaces enlarge to hold potentially floated content. */
 .cke_top,
 .cke_contents,
@@ -126,6 +127,12 @@ Special outer level classes used in this file:
 	overflow: hidden;
 }
 
+/* Allow breaking toolbars when in a narrow editor. (#9947) */
+.cke_top
+{
+	white-space: normal;
+}
+
 /* The resizer is the small UI element that is rendered at the bottom right
    part of the editor. It makes is possible to resize the editor UI. */
 .cke_resizer

diff --git a/skins/moono/mainui.css b/skins/moono/mainui.css
@@ -103,6 +103,9 @@ Special outer level classes used in this file:
 	border-bottom: 1px solid #b6b6b6;
 	padding: 6px 8px 2px;
 
+	/* Allow breaking toolbars when in a narrow editor. (#9947) */
+	white-space: normal;
+
 	-moz-box-shadow: 0 1px 0 #fff inset;
 	-webkit-box-shadow: 0 1px 0 #fff inset;
 	box-shadow: 0 1px 0 #fff inset;