[BUGFIX] RTE: Ajust toolbar wrap and framework overflow in frontend 36/36336/2
authorStanislas Rolland <typo3@sjbr.ca>
Wed, 28 Jan 2015 18:50:02 +0000 (13:50 -0500)
committerStanislas Rolland <typo3@sjbr.ca>
Wed, 28 Jan 2015 18:52:42 +0000 (19:52 +0100)
Releases: master
Resolves: #64567
Change-Id: Ia5080d1136ac71510de42b0d68d7633500f4d247
Reviewed-on: http://review.typo3.org/36336
Reviewed-by: Stanislas Rolland <typo3@sjbr.ca>
Tested-by: Stanislas Rolland <typo3@sjbr.ca>
typo3/sysext/rtehtmlarea/Resources/Public/Css/Skin/bootstrap.css
typo3/sysext/rtehtmlarea/Resources/Public/Css/Skin/htmlarea.css
typo3/sysext/t3skin/rtehtmlarea/htmlarea.css

index 062a6ee..a00aa0d 100644 (file)
@@ -1,3 +1,28 @@
+/*
+ * This file is part of the TYPO3 CMS project.
+ *
+ * It is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License, either version 2
+ * of the License, or any later version.
+ *
+ * For the full copyright and license information, please read the
+ * LICENSE.txt file that was distributed with this source code.
+ *
+ * The TYPO3 project - inspiring people to share!
+ */
+
+* {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+}
+*:before,
+*:after {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+}
+
 /* Buttons */
 .btn {
   display: inline-block;
@@ -210,4 +235,7 @@ fieldset[disabled] .form-control {
   cursor: not-allowed;
   background-color: #f5f5f5;
   opacity: 1;
+}
+.form-group {
+  margin-bottom: 15px;
 }
\ No newline at end of file
index 2b8f60f..0a41bd4 100644 (file)
        margin-left: -5px;
        padding: 2px 2px 2px 0;
 }
+.htmlarea .btn-toolbar:before,
+.htmlarea .btn-toolbar:after {
+       content: " ";
+       display: table;
+}
+.htmlarea .btn-toolbar:after {
+       clear: both;
+}
 .htmlarea .btn-toolbar .btn-group {
        margin: 1px 3px;
 }
index 87c4e17..26bb484 100644 (file)
 .htmlarea .btn-toolbar {
        padding: 2px;
 }
+.htmlarea .btn-toolbar:before,
+.htmlarea .btn-toolbar:after {
+       content: " ";
+       display: table;
+}
+.htmlarea .btn-toolbar:after {
+       clear: both;
+}
 .htmlarea .btn-toolbar .btn-group {
        margin: 1px 3px;
 }