Merge "(bug 40610) Prevent editing textarea from overflowing out of bodyContent"

diff --git a/skins/common/commonContent.css b/skins/common/commonContent.css
index 20182b4..a550d97 100644 (file)
--- a/skins/common/commonContent.css
+++ b/skins/common/commonContent.css
@@ -112,6 +112,16 @@ img.thumbborder {
        border: 1px solid #dddddd;
 }
 
+/**
+ * Edit forms
+ */
+#editform textarea {
+       display: block;
+       -moz-box-sizing: border-box;
+       -webkit-box-sizing: border-box;
+       box-sizing: border-box;
+}
+
 /**
  * Basic styles for the user login and create account forms
  */

diff --git a/skins/modern/main.css b/skins/modern/main.css
index 7149551..80cdcda 100644 (file)
--- a/skins/modern/main.css
+++ b/skins/modern/main.css
@@ -150,6 +150,11 @@ textarea {
        width: 100%;
        padding: .1em;
 }
+#editform textarea {
+       -moz-box-sizing: border-box;
+       -webkit-box-sizing: border-box;
+       box-sizing: border-box;
+}
 
 #searchBody {
        text-align: center;