1 files changed, 63 insertions, 5 deletions

diff --git a/skins/common/commonContent.css b/skins/common/commonContent.css
index 0fe8489e..14d39b92 100644
--- a/skins/common/commonContent.css
+++ b/skins/common/commonContent.css
@@ -1,6 +1,9 @@
-/*
-** MediaWiki style sheet for general styles on complex content
-*/
+/**
+ * MediaWiki style sheet for general styles on complex content
+ *
+ * Styles for complex things which are a standard part of page content
+ * (ie: the CSS classing built into the system), like the TOC.
+ */
 
 /* Table of Contents */
 #toc,
@@ -11,6 +14,43 @@
 	padding: 5px;
 	font-size: 95%;
 }
+
+/**
+ * We want to display the ToC element with intrinsic width in block mode. The fit-content
+ * value for width is however not supported by large groups of browsers.
+ *
+ * We use display:table. Even though it should only contain other table-* display
+ * elements, there are no known problems with using this.
+ *
+ * Because IE < 8, FF 2 and other older browsers don't support display:table, we fallback to
+ * using inline-block mode, which features at least intrinsic width, but won't clear preceding
+ * inline elements. In practice inline elements surrounding the TOC are uncommon enough that
+ * this is an acceptable sacrifice.
+ */
+#toc,
+.toc {
+	display: -moz-inline-block;
+	display: inline-block;
+	display: table;
+
+	/* IE7 and earlier */
+	zoom: 1;
+	*display: inline;
+
+	padding: 7px;
+}
+
+/* CSS for backwards-compatibility with cached page renders and creative uses in wikitext */
+table#toc,
+table.toc {
+	border-collapse: collapse;
+}
+/* Remove additional paddings inside table-cells that are not present in <div>s */
+table#toc td,
+table.toc td {
+	padding: 0;
+}
+
 #toc h2,
 .toc h2 {
 	display: inline;
@@ -93,6 +133,7 @@ html .thumbcaption {
 div.magnify {
 	border: none !important;
 	background: none !important;
+	margin-left: 3px;
 }
 div.magnify a, div.magnify img {
 	display: block;
@@ -110,11 +151,28 @@ img.thumbborder {
 }
 
 /**
+ * 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
  */
 #userlogin, #userloginForm {
 	border: solid 1px #cccccc;
 	padding: 1.2em;
-	margin: .5em;
-	float: left;
+	margin: 0.5em;
+}
+
+#loginend {
+	margin: 0.5em;
+}
+
+#loginend table {
+	width: 100%;
 }