X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b244783e2e58457b57b10212dbe9973f76353f49..597fb5d27f092f956235c04d77cf74cab2012b1a:/app/assets/stylesheets/common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index b392de1df..f6a34534e 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -357,6 +357,7 @@ table {
   padding: 0;
   width: 15px;
   height: 15px;
+  min-width: 15px;
   text-indent: -1000px;
   overflow: hidden;
   background: image-url("sprite.png") 0 0 no-repeat;
@@ -1229,6 +1230,10 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 /* Rules for the login page */
 
+#login_openid_buttons {
+  height: 56px;
+}
+
 #login_openid_buttons li {
   float: left;
   padding: 5px 10px;
@@ -1236,57 +1241,54 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 /* Rules for the account confirmation page */
 
-div#contributorTerms {
-  border: 1px solid #ccc;
-  padding: 20px;
-  margin-bottom: 20px;
-  overflow: auto;
-  height: 398px;
-}
-
-div#contributorTerms p#last {
-  margin-bottom: 0px;
-}
-
-div#contributorTerms ol {
-  margin-bottom: 0px;
-}
-
-div#contributorTerms img {
-  display: block;
-  margin: 20px auto inherit auto;
-}
-
-form#termsForm div#buttons {
-  float: right;
-}
-
-form#termsForm input#agree {
-  margin-left: 40px;
-}
-
-div#slim_content form#termsForm {
-  width: auto;
-}
-
-p#contributorGuidance {
-  background-color: #f4f4ff;
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  margin-top: 20px;
-  padding: 10px;
+#terms {
+  .legale {
+    border: 1px solid #ccc;
+    padding: 20px;
+    margin-bottom: 20px;
+    overflow: auto;
+    height: 10em;
+  
+    &:p#last {
+      margin-bottom: 0px;
+    }
+    
+    &:ol {
+      margin-bottom: 0px;
+    }
+    
+    &:img {
+      display: block;
+      margin: 20px auto inherit auto;
+    }
+  }
+  
+  form.sign {
+    input[type=submit] {
+      float: left;
+    }
+    #decline {
+      background: #AAA;
+      &:hover {
+        background: #777;
+      }
+    }
+  }
+  fieldset {
+    margin-bottom: 20px;
+  }
+  #contributorGuidance {
+    background-color: #f4f4ff;
+    border-radius: 4px;
+    -moz-border-radius: 4px;
+  }
+  .signing-buttons {
+    height: 50px;
+  }
 }
 
 /* Rules for the account settings page */
 
-#accountForm {
-  margin-top: 20px;
-}
-
-#accountForm td {
-  padding-bottom: 10px;
-}
-
 #accountForm .user_map {
   position: relative;
   width: 500px;
@@ -1311,10 +1313,6 @@ p#contributorGuidance {
   display: inline !important;
 }
 
-#accountForm input[type=submit] {
-  margin-top: 15px;
-}
-
 .content_map.settings_map {
   float: none;
   width: 50%;
@@ -1427,24 +1425,29 @@ p#contributorGuidance {
 
 /* Rules for forms */
 
-.submitButton {
-  text-align: center;
+.standard-form fieldset {
+  margin-bottom: 20px;
 }
 
-.fieldName {
-  vertical-align: top;
+.standard-form label {
+  display: block;
+  width: 300px;
+  margin-right: 10px;
+  font-size: 14px;
   font-weight: bold;
-  font-size: 12px;
-  line-height: 1.6666;
-  text-align: right;
+  line-height: 1.5;
 }
 
-.submitButton {
-  text-align: right;
+.standard-form .form-row {
+  margin-bottom: 10px;
 }
 
-.minorNote {
-  font-size: 12px;
+.standard-form input[name=remember_me] {
+  float: left;
+}
+
+#remember_me_openid {
+  display: block;
 }
 
 input[type="text"],
@@ -1535,7 +1538,12 @@ ul.secondary-actions {
 
 /* Utility for general button styles */
 
+input[type="button"],
+input[type="submit"],
+input[type="reset"],
 a.button {
+  cursor: pointer;
+  border: 0;
   display: block;
   padding: 5px;
   min-width: 120px;
@@ -1724,6 +1732,20 @@ a.button.submit {
       margin-right: 10px;
     }
   }
+
+  .buttons input[type="submit"] {
+    display: inline-block;
+    margin-bottom:0;
+    width:99px;
+    min-width:99px;
+  }
+  .buttons input:first-child {
+    border-radius:2px 0 0 2px;
+    margin-right:1px;
+  }
+  .buttons input:last-child {
+    border-radius:0 2px 2px 0;
+  }
 }
 
 /* Rules for the user notes list */