Merge branch 'master' into openid

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

diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index f7b1457548b670c21cf305e58e1250e5f8df90ba..36966f3bae46a07401a05d1f8323960991fc9402 100644 (file)
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -335,12 +335,12 @@ hr {
   display: none !important;
 }
 
-#map #permalink {
-  z-index:10000;
-  position:absolute;
-  bottom:15px;
-  right:15px;
-  font-size:smaller;
+#permalink {
+  z-index: 10000;
+  position: absolute;
+  bottom: 15px;
+  right: 15px;
+  font-size: smaller;
   text-align: right;
 }
 
@@ -598,10 +598,6 @@ hr {
   width: 100%;
 }
 
-.loginBox .fieldName img {
-  vertical-align: text-bottom;
-}
-
 .loginBox img {
   border: 0;
 }
@@ -618,6 +614,47 @@ hr {
   margin-bottom: 20px;
 }
 
+/* Rules for the account confirmation page */
+
+div#contributorTerms {
+  border: 1px solid black;
+  padding: 4px;
+  overflow: auto;
+  width: 80%;
+  height: 60%;
+}
+
+div#contributorTerms p#first {
+  margin-top: 0px;
+}
+
+div#contributorTerms p#last {
+  margin-bottom: 0px;
+}
+
+div#contributorTerms ol {
+  margin-bottom: 0px;
+}
+
+div#contributorTerms img {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 10%;
+}
+
+form#termsForm {
+  width: 80%;
+}
+
+form#termsForm div#buttons {
+  float: right;
+}
+
+form#termsForm input#agree {
+  margin-left: 50px;
+}
+
 /* Rules for the account settings page */
 
 #accountForm td {
@@ -754,7 +791,7 @@ input[type="submit"] {
 }
 
 input.openid_url { 
-  background: url('../images/openid-inputicon.gif') repeat-y left;
+  background: url('../images/openid_input.png') repeat-y left;
   padding-left: 16px;
 }
 
@@ -800,3 +837,10 @@ abbr.geo {
 .table1 { 
   background: #fff;
 }
+
+/* Rules for OpenID logo */
+
+.openid_logo {
+  vertical-align: text-bottom;
+  border: 0;
+}