From e04c11c9e84e6c04f51163a99dbde6ba5c2e2a30 Mon Sep 17 00:00:00 2001
From: Daniel Friesen <dantman@users.mediawiki.org>
Date: Wed, 7 Sep 2011 03:25:11 +0000
Subject: [PATCH] Move the vector styles for the user login form into
 commonContent.css The vector styles are very generic and fit well as the
 common style. With a minor tweak to MonoBook (which actually partially fixes
 a bug in the signup form on Wikipedia) this style fits in perfectly without
 conflicting with MonoBook's styles.

---
 skins/common/commonContent.css | 16 ++++++++++++++++
 skins/monobook/main.css        |  8 ++++----
 skins/vector/screen.css        | 16 ----------------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/skins/common/commonContent.css b/skins/common/commonContent.css
index cffb11bdfd..26aa964aee 100644
--- a/skins/common/commonContent.css
+++ b/skins/common/commonContent.css
@@ -111,3 +111,19 @@ img.thumbborder {
 	border: 1px solid #dddddd;
 }
 
+/**
+ * Basic styles for the user login and create account forms
+ */
+#userlogin, #userloginForm {
+	border: solid 1px #cccccc;
+	padding: 1.2em;
+	margin: .5em;
+	float: left;
+}
+
+#userlogin {
+	min-width: 20em;
+	max-width: 90%;
+	width: 40em;
+}
+
diff --git a/skins/monobook/main.css b/skins/monobook/main.css
index e35e42d4de..ce06862bcc 100644
--- a/skins/monobook/main.css
+++ b/skins/monobook/main.css
@@ -688,8 +688,8 @@ td.htmlform-tip {
 	margin-top: 2em;
 }
 
-div#userloginForm form,
-div#userlogin form#userlogin2 {
+div#userloginForm,
+div#userlogin {
 	margin: 0 3em 1em 0;
 	border: 1px solid #aaa;
 	clear: both;
@@ -699,12 +699,12 @@ div#userlogin form#userlogin2 {
 }
 
 div#userloginForm table,
-div#userlogin form#userlogin2 table {
+div#userlogin table {
 	background-color: #f9f9f9;
 }
 
 div#userloginForm h2,
-div#userlogin form#userlogin2 h2 {
+div#userlogin h2 {
 	padding-top: 0;
 }
 
diff --git a/skins/vector/screen.css b/skins/vector/screen.css
index e035caa850..25929ce78b 100644
--- a/skins/vector/screen.css
+++ b/skins/vector/screen.css
@@ -661,22 +661,6 @@ div#footer #footer-places li {
 	margin-right: 0.25em;
 }
 
-/* 
- * Styles for the user login and create account forms
- */
-#userlogin, #userloginForm {
-	border: solid 1px #cccccc;
-	padding: 1.2em;
-	margin: .5em;
-	float: left;
-}
-
-#userlogin {
-	min-width: 20em;
-	max-width: 90%;
-	width: 40em;
-}
-
 /*
  * 
  * The following code is slightly modified from monobook
-- 
2.20.1