Commits

Anonymous committed 72511b3

blockifying ps, fixing help text clear issue

  • Participants
  • Parent commits 308c52b

Comments (0)

Files changed (2)

ckeditor/media/ckeditor/ckeditor/contents.css

-/*
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.html or http://ckeditor.com/license
-*/
-
-body
-{
-	/* Font */
-	font-family: Arial, Verdana, sans-serif;
-	font-size: 12px;
-
-	/* Text color */
-	color: #222;
-
-	/* Remove the background color to make it transparent */
-	background-color: #fff;
-}
-
-html
-{
-	/* #3658: [IE6] Editor document has horizontal scrollbar on long lines
-	To prevent this misbehavior, we show the scrollbar always */
-	_overflow-y: scroll
-}
-
-img:-moz-broken
-{
-	-moz-force-broken-image-icon : 1;
-	width : 24px;
-	height : 24px;
-}
-img, input, textarea
-{
-	cursor: default;
-}
+/*
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+For licensing, see LICENSE.html or http://ckeditor.com/license
+*/
+
+body
+{
+	/* Font */
+	font-family: Arial, Verdana, sans-serif;
+	font-size: 12px;
+
+	/* Text color */
+	color: #222;
+
+	/* Remove the background color to make it transparent */
+	background-color: #fff;
+}
+
+html
+{
+	/* #3658: [IE6] Editor document has horizontal scrollbar on long lines
+	To prevent this misbehavior, we show the scrollbar always */
+	_overflow-y: scroll
+}
+
+img:-moz-broken
+{
+	-moz-force-broken-image-icon : 1;
+	width : 24px;
+	height : 24px;
+}
+img, input, textarea
+{
+	cursor: default;
+}
+
+/* http://perishablepress.com/press/2009/12/06/new-clearfix-hack */
+
+p:after {
+	clear: both;
+	content: ' ';
+	display: block;
+	font-size: 0;
+	line-height: 0;
+	visibility: hidden;
+	width: 0;
+	height: 0;
+}
+
+/*
+	The following zoom:1 rule is specifically for IE6 + IE7.
+	Move to separate stylesheet if invalid CSS is a problem.
+*/
+* html p,
+*:first-child+html p {
+	zoom: 1;
+}

ckeditor/media/ckeditor/css/grappelli.css

 fieldset div.form-row div span.cke_skin_kama {
     border: 0;
-    clear: left;
     padding: 0 !important;
-    clear: none;
     float: left;
 }
 span.cke_skin_kama span.cke_wrapper {
 }
 span.cke_wrapper iframe {
     border: 1px solid #CACACA;
+}
+.help {
+    clear: left;
 }