X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7bd8f813ef824d3d04d756b55ce989d61e3e5b22..f3b319cb4f9521ca2fb1f514c8b368bd894bab3b:/app/assets/stylesheets/common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 9071fa32b..599cce32d 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -93,7 +93,7 @@ h3 {
 h4,h5,h6 {
   font-size: 14px;
   margin-top: 10px;
-  margin-bottom: 20px;
+  margin-bottom: 10px;
   font-weight: bold;
   line-height: 1.5;
 }
@@ -122,7 +122,7 @@ h6:first-child {
 
 .column-1 {
   width: 50%;
-  margin-bottom: 20px;
+  margin-bottom: 10px;
 }
 
 .small_icon {
@@ -193,15 +193,15 @@ table {
 
 #logo h1 {
   font-size: 18px;
-  line-height: 1.1;
+  line-height: 1;
   text-align: center;
-  margin: 0px;
+  margin: 0;
 }
 
 #logo h2 {
   font-size: 10px;
   line-height: 15px;
-  margin: 0px;
+  margin: 0;
 }
 
 /* Rules for the site name */
@@ -221,7 +221,6 @@ table {
 }
 
 .sidebar-copy.intro {
-  margin-top: -1px;
   border-top: 1px solid #ccc;
 }
 
@@ -235,7 +234,7 @@ table {
   padding: 5px;
   border-top: 1px solid #ccc;
   margin-top: 4px;
-  margin-bottom: -4px;
+  margin-bottom: -5px;
   background: #e00;
   font-size: 12px;
   font-weight: bold;
@@ -254,7 +253,7 @@ table {
   padding: 5px;
   border-top: 1px solid #ccc;
   margin-top: 4px;
-  margin-bottom: -4px;
+  margin-bottom: -5px;
   background: #ea0;
   font-size: 12px;
   p {
@@ -1094,8 +1093,8 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 /* Rules for the user map */
 
 .content_map .leaflet-popup-content {
-  margin: 10px 15px;
-  min-height: 62px;
+  margin: 10px;
+  min-height: 50px;
 }
 
 /* Rules for user popups on maps */
@@ -1105,17 +1104,14 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 }
 
 .user_popup p {
-  padding-top: 3px;
-  padding-bottom: 3px;
-  margin-top: 0px;
-  margin-bottom: 0px;
-  margin-left: 55px;
-  margin-right: 2px;
+  padding-top:0;
+  padding-bottom: 5px;
+  margin-top: 0;
 }
 
 .user_popup img.user_thumbnail {
   float: left;
-  margin-right: 10px;
+  margin: 0 10px 0 0;
 }
 
 /* Rules for user popups on maps */
@@ -1156,7 +1152,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 .diary_post {
   max-width: 740px;
   position: relative;
-  margin-top: 20px;
+  margin-top: 10px;
   padding-top: 20px;
   border-top: 1px solid #ccc;
 
@@ -1240,45 +1236,50 @@ 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 */
@@ -1431,24 +1432,22 @@ p#contributorGuidance {
 
 /* Rules for forms */
 
-.submitButton {
-  text-align: center;
-}
+.standard-form fieldset {
+  margin-bottom: 20px;
 
-.fieldName {
-  vertical-align: top;
-  font-weight: bold;
-  font-size: 12px;
-  line-height: 1.6666;
-  text-align: right;
 }
 
-.submitButton {
-  text-align: right;
+.standard-form label {
+  display: block;
+  width: 200px;
+  margin-right: 10px;
+  font-size: 14px;
+  font-weight: bold;
+  line-height: 1.5;
 }
 
-.minorNote {
-  font-size: 12px;
+.standard-form .form-row {
+  margin-bottom: 10px;
 }
 
 input[type="text"],
@@ -1510,7 +1509,6 @@ ul.secondary-actions {
   margin-left: 0;
   &.pager {
     display: inline-block;
-    margin-bottom: 20px;
     margin-right: 60px;
   }
   li {
@@ -1540,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;
@@ -1612,6 +1615,16 @@ a.button.submit {
     padding: 2px 3px;
   }
 
+  pre {
+    font-size: 13px;
+    background: #e8e8e8;
+    padding: 2px 3px;
+
+    code {
+      padding: 0;
+    }
+  }
+
   img {
     padding: 20px;
     background-color: #f4f4ff;
@@ -1683,6 +1696,7 @@ a.button.submit {
     margin-left: 15px;
     background-color: #f8f8ff;
     padding: 10px;
+    width: 300px;
     max-width: 450px;
 
     ul {