From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 27 Jan 2014 20:07:24 +0000 (+0000)
Subject: Merge "Use box-sizing:border-box for textarea"
X-Git-Tag: 1.31.0-rc.0~17126
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=d5e4bea76b0a68479510904db622edfd65255afd;hp=34a9db1d673f9498e0dbedc520ece0958328235c;p=lhc%2Fweb%2Fwiklou.git

Merge "Use box-sizing:border-box for textarea"
---

diff --git a/resources/mediawiki/mediawiki.feedback.js b/resources/mediawiki/mediawiki.feedback.js
index 1afe51eff6..9de69b29ed 100644
--- a/resources/mediawiki/mediawiki.feedback.js
+++ b/resources/mediawiki/mediawiki.feedback.js
@@ -106,12 +106,12 @@
 						$( '<div style="margin-top: 1em;"></div>' ).append(
 							mw.msg( 'feedback-subject' ),
 							$( '<br>' ),
-							$( '<input type="text" class="feedback-subject" name="subject" maxlength="60" style="width: 99%;"/>' )
+							$( '<input type="text" class="feedback-subject" name="subject" maxlength="60" style="width: 100%; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box;"/>' )
 						),
 						$( '<div style="margin-top: 0.4em;"></div>' ).append(
 							mw.msg( 'feedback-message' ),
 							$( '<br>' ),
-							$( '<textarea name="message" class="feedback-message" style="width: 99%;" rows="5" cols="60"></textarea>' )
+							$( '<textarea name="message" class="feedback-message" rows="5" cols="60"></textarea>' )
 						)
 					),
 					$( '<div class="feedback-mode feedback-bugs"></div>' ).append(
diff --git a/skins/cologneblue/screen.css b/skins/cologneblue/screen.css
index bc5dd316cf..40a943296d 100644
--- a/skins/cologneblue/screen.css
+++ b/skins/cologneblue/screen.css
@@ -56,9 +56,6 @@ p, pre, .mw-code, td, th, li, dd, dt {
 textarea {
 	overflow: auto;
 	width: 100%;
-}
-
-#editform textarea {
 	display: block;
 	-moz-box-sizing: border-box;
 	-webkit-box-sizing: border-box;
diff --git a/skins/common/commonContent.css b/skins/common/commonContent.css
index 35071a452f..a8699233cb 100644
--- a/skins/common/commonContent.css
+++ b/skins/common/commonContent.css
@@ -150,16 +150,6 @@ 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/common/commonElements.css b/skins/common/commonElements.css
index 742f839c2e..ad7942a667 100644
--- a/skins/common/commonElements.css
+++ b/skins/common/commonElements.css
@@ -207,6 +207,10 @@ form {
 textarea {
 	width: 100%;
 	padding: .1em;
+	display: block;
+	-moz-box-sizing: border-box;
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
 }
 select {
 	vertical-align: top;
diff --git a/skins/common/config.css b/skins/common/config.css
index 39206c3a00..d64627376e 100644
--- a/skins/common/config.css
+++ b/skins/common/config.css
@@ -138,5 +138,6 @@
 }
 
 #config-live-log {
-	margin-right: 18em;
+	overflow: hidden;
+	min-width: 20em;
 }
diff --git a/skins/modern/main.css b/skins/modern/main.css
index 5da7d5bd76..6f73f0e1df 100644
--- a/skins/modern/main.css
+++ b/skins/modern/main.css
@@ -155,8 +155,7 @@ div.mw_clear {
 textarea {
 	width: 100%;
 	padding: .1em;
-}
-#editform textarea {
+	display: block;
 	-moz-box-sizing: border-box;
 	-webkit-box-sizing: border-box;
 	box-sizing: border-box;