Merge branch 'master' into openid

[rails.git] / public / stylesheets / common.css

diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index c61cf928b4b75a2715db92b942800e543218746f..0282e47f315f99762d07c8218b3096fb286e2fa6 100644 (file)
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -583,6 +583,37 @@ hr {
   margin-top: 10px;
 }
 
+/* Rules for the login form */
+
+.loginBox {
+  float: left;
+  border-style: solid;
+  border-width: 1px;
+  padding-left: 10px;
+  padding-right: 10px;
+  padding-bottom: 10px;
+}
+
+.loginBox table {
+  width: 100%;
+}
+
+.loginBox img {
+  border: 0;
+}
+
+.loginBox #openid_buttons img {
+  vertical-align: middle;
+}
+
+.loginBox input[type="submit"] {
+  float: right;
+}
+
+#openid_buttons {
+  margin-bottom: 20px;
+}
+
 /* Rules for the account settings page */
 
 #accountForm td {
@@ -718,6 +749,11 @@ input[type="submit"] {
   border: 1px solid black;
 }
 
+input.openid_url { 
+  background: url('../images/openid_input.png') repeat-y left;
+  padding-left: 16px;
+}
+
 /* Rules for user images */
 
 img.user_image {
@@ -761,23 +797,9 @@ abbr.geo {
   background: #fff;
 }
 
-input.openid_url { 
-  background: url('../images/openid-inputicon.gif') repeat-y left;
-  padding-left: 16px;
-}
+/* Rules for OpenID logo */
 
-/* Rules for Login page */
-.loginBox {
-  float: left;
-  width: 400px;
-  height: 200px;
-  margin-bottom: 40px;
-  border-style: solid;
-  border-width: 1px;
-  padding-left: 10px;
-  padding-right: 10px;
-}
-
-.loginBox img {
+.openid_logo {
+  vertical-align: text-bottom;
   border: 0;
 }