Parameterise font sizes

Extract font size and line height as parameters and replace many
spacing values with multiples of the line height parameter.

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 5aebc464b2775ed37a56700cb6356f30085bcf9f..aad4d128eaefb5eaa78ba238a7a3ebe083654ba5 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1,3 +1,7 @@
+/* Parameters */
+$lineheight: 20px;
+$typeheight: 14px;
+

 /* Styles common to large and small screens */
 
 /* Minimal CSS reset */
 /* Styles common to large and small screens */
 
 /* Minimal CSS reset */


@@ -27,7 +31,7 @@ li { list-style: none; }
 input,
 select,
 textarea,
 input,
 select,
 textarea,

-body { font: 14px/20px "Helvetica Neue",Arial,sans-serif; }
+body { font: $typeheight/$lineheight "Helvetica Neue",Arial,sans-serif; }

 
 abbr, acronym {
   border-bottom: .1em dotted;
 
 abbr, acronym {
   border-bottom: .1em dotted;


@@ -56,7 +60,7 @@ abbr, acronym {
 
 body {
   font-family: 'Helvetica Neue',Arial,sans-serif;
 
 body {
   font-family: 'Helvetica Neue',Arial,sans-serif;

-  font-size: 14px;
+  font-size: $typeheight;

   line-height: 1.6666;
   color: #222;
   background-color: #fff;
   line-height: 1.6666;
   color: #222;
   background-color: #fff;


@@ -70,8 +74,8 @@ body.slim {
 }
 
 h1, h2, h3 {
 }
 
 h1, h2, h3 {

-  margin-top: 10px;
-  margin-bottom: 20px;
+  margin-top: $lineheight/2;
+  margin-bottom: $lineheight;

   font-weight: bold;
   line-height: 1.2;
 }
   font-weight: bold;
   line-height: 1.2;
 }


@@ -86,20 +90,20 @@ h1, h2 {
 
 h3 {
   font-size: 21px;
 
 h3 {
   font-size: 21px;

-  margin-top: 10px;
-  margin-bottom: 20px;
+  margin-top: $lineheight/2;
+  margin-bottom: $lineheight;

 }
 
 h4,h5,h6 {
 }
 
 h4,h5,h6 {

-  font-size: 14px;
-  margin-top: 10px;
-  margin-bottom: 10px;
+  font-size: $typeheight;
+  margin-top: $lineheight/2;
+  margin-bottom: $lineheight/2;

   font-weight: bold;
   line-height: 1.5;
 }
 
 p, ul {
   font-weight: bold;
   line-height: 1.5;
 }
 
 p, ul {

-  margin-bottom: 20px;
+  margin-bottom: $lineheight;

 }
 
 p > img {
 }
 
 p > img {


@@ -122,12 +126,12 @@ h6:first-child {
 
 .column-1 {
   width: 50%;
 
 .column-1 {
   width: 50%;

-  margin-bottom: 10px;
+  margin-bottom: $lineheight/2;

 }
 
 .small_icon {
   vertical-align: middle;
 }
 
 .small_icon {
   vertical-align: middle;

-  margin-right: 5px;
+  margin-right: $lineheight/4;

 }
 
 /* Rules for links */
 }
 
 /* Rules for links */


@@ -153,11 +157,11 @@ hr {
 
 table {
   width: 100%;
 
 table {
   width: 100%;

-  margin-bottom: 20px;
+  margin-bottom: $lineheight;

   th, td {
     text-align: left;
   th, td {
     text-align: left;

-    padding: 5px;
-    line-height: 20px;
+    padding: $lineheight/4;
+    line-height: $lineheight;

   }
   th {
     font-weight: bold;
   }
   th {
     font-weight: bold;


@@ -186,7 +190,7 @@ table {
   display: block;
   width: 170px;
   min-width: 170px;
   display: block;
   width: 170px;
   min-width: 170px;

-  padding: 20px 5px;
+  padding: $lineheight $lineheight/4;

   text-align: center;
   margin: auto;
 }
   text-align: center;
   margin: auto;
 }


@@ -199,7 +203,7 @@ table {
 }
 
 #logo h2 {
 }
 
 #logo h2 {

-  font-size: 10px;
+  font-size: $lineheight/2;

   line-height: 15px;
   margin: 0;
 }
   line-height: 15px;
   margin: 0;
 }


@@ -213,9 +217,9 @@ table {
 /* Rules for the introductory text displayed in the left sidebar to new users */
 
 .sidebar-copy {
 /* Rules for the introductory text displayed in the left sidebar to new users */
 
 .sidebar-copy {

-  padding: 5px 10px;
+  padding: $lineheight/4 $lineheight/2;

   p {
   p {

-    margin: 5px 0;
+    margin: $lineheight/4 0;

   }
 }
 .sidebar-copy.intro {
   }
 }
 .sidebar-copy.intro {


@@ -229,7 +233,7 @@ table {
  */
 
 .sidebar-alert {
  */
 
 .sidebar-alert {

-  padding: 5px;
+  padding: $lineheight/4;

   border-top: 1px solid #ccc;
   margin-top: 4px;
   margin-bottom: -5px;
   border-top: 1px solid #ccc;
   margin-top: 4px;
   margin-bottom: -5px;


@@ -237,7 +241,7 @@ table {
   font-size: 12px;
   font-weight: bold;
   p {
   font-size: 12px;
   font-weight: bold;
   p {

-    margin: 5px;
+    margin: $lineheight/4;

   }
 }
 
   }
 }
 


@@ -248,14 +252,14 @@ table {
  */
 
 .sidebar-notice {
  */
 
 .sidebar-notice {

-  padding: 5px;
+  padding: $lineheight/4;

   border-top: 1px solid #ccc;
   margin-top: 4px;
   margin-bottom: -5px;
   background: #ea0;
   font-size: 12px;
   p {
   border-top: 1px solid #ccc;
   margin-top: 4px;
   margin-bottom: -5px;
   background: #ea0;
   font-size: 12px;
   p {

-    margin: 5px;
+    margin: $lineheight/4;

   }
 }
 
   }
 }
 


@@ -264,14 +268,14 @@ table {
 .left_menu {
   left: 0px;
   margin: 0;
 .left_menu {
   left: 0px;
   margin: 0;

-  padding: 5px 10px;
+  padding: $lineheight/4 $lineheight/2;

   font-size: 12px;
   line-height: 1.25;
   list-style-type: none;
   border-bottom: 1px solid #ccc;
   border-top: 1px solid #ccc;
   img {
   font-size: 12px;
   line-height: 1.25;
   list-style-type: none;
   border-bottom: 1px solid #ccc;
   border-top: 1px solid #ccc;
   img {

-    margin: 10px 0px;
+    margin: $lineheight/2 0px;

   }
 
   ul {
   }
 
   ul {


@@ -286,7 +290,7 @@ table {
   }
   
   h4 {
   }
   
   h4 {

-    padding: 5px 0 5px 0;
+    padding: $lineheight/4 0 $lineheight/4 0;

     font-size: 12px;
     margin: 0;
   }
     font-size: 12px;
     margin: 0;
   }


@@ -300,7 +304,7 @@ table {
 
 #sotm {
   width: 165px;
 
 #sotm {
   width: 165px;

-  margin: 10px;
+  margin: $lineheight/2;

   padding: 0px;
   border: 0px;
   background: #fff;
   padding: 0px;
   border: 0px;
   background: #fff;


@@ -317,8 +321,8 @@ table {
 
 .optionalbox {
   left: 0px;
 
 .optionalbox {
   left: 0px;

-  padding: 5px 10px;
-  margin: 5px 0;
+  padding: $lineheight/4 $lineheight/2;
+  margin: $lineheight/4 0;

   text-align: left;
 }
 
   text-align: left;
 }
 


@@ -334,10 +338,10 @@ table {
   input[type="text"] {
     width: 165px;
     padding: 3px;
   input[type="text"] {
     width: 165px;
     padding: 3px;

-    font-size: 14px;
+    font-size: $typeheight;

     line-height: 1.1;
     height: 25px;
     line-height: 1.1;
     height: 25px;

-    padding: 2px 0px 2px 5px;
+    padding: 2px 0px 2px $lineheight/4;

     box-shadow: inset #DDD 0px 1px 3px;
   }
   
     box-shadow: inset #DDD 0px 1px 3px;
   }
   


@@ -356,14 +360,14 @@ table {
     overflow: hidden;
     background: image-url("sprite.png") 0 0 no-repeat;
     position: absolute;
     overflow: hidden;
     background: image-url("sprite.png") 0 0 no-repeat;
     position: absolute;

-    top: 5px;
-    right: 5px;
+    top: $lineheight/4;
+    right: $lineheight/4;

     cursor: pointer;
   }
 }
 
 .search_help {
     cursor: pointer;
   }
 }
 
 .search_help {

-  margin: 5px 0 0 0;
+  margin: $lineheight/4 0 0 0;

 }
 
 /* Utility for de-emphasizing content */
 }
 
 /* Utility for de-emphasizing content */


@@ -380,15 +384,15 @@ table {
 .donate {
   display: block;
   width: 164px;
 .donate {
   display: block;
   width: 164px;

-  padding: 5px;
+  padding: $lineheight/4;

   border: 1px solid #AED1A0;
   background: #cbeea7;
   border: 1px solid #AED1A0;
   background: #cbeea7;

-  font-size: 14px;
+  font-size: $typeheight;

   line-height: 1.4;
   text-align: center;
   border-radius: 2px;
   color: #222;
   line-height: 1.4;
   text-align: center;
   border-radius: 2px;
   color: #222;

-  margin: 10px 10px 0px 10px;
+  margin: $lineheight/2 $lineheight/2 0px $lineheight/2;

 
   &:hover {
     background: #9ed485;
 
   &:hover {
     background: #9ed485;


@@ -404,7 +408,7 @@ table {
 /* Rules for Creative Commons logo button */
 
 #cclogo {
 /* Rules for Creative Commons logo button */
 
 #cclogo {

-  margin: 10px 0;
+  margin: $lineheight/2 0;

   float: right;
 }
 
   float: right;
 }
 


@@ -437,7 +441,7 @@ table {
   a, a:link, a:visited {
     float: left;
     font-weight: bold;
   a, a:link, a:visited {
     float: left;
     font-weight: bold;

-    padding: 3px 10px;
+    padding: 3px $lineheight/2;

     text-decoration: none;
     color: #333;
     float: left;
     text-decoration: none;
     color: #333;
     float: left;


@@ -476,7 +480,7 @@ table {
 /* Utility for styling notification numbers */
 
 .count-number {
 /* Utility for styling notification numbers */
 
 .count-number {

-  padding: 2px 5px;
+  padding: 2px $lineheight/4;

   border-radius: 3px;
   background: #d7d7ff;
   margin: 0 2px;
   border-radius: 3px;
   background: #d7d7ff;
   margin: 0 2px;


@@ -489,7 +493,7 @@ table {
 #greeting {
   float: right;
   padding-top: 3px;
 #greeting {
   float: right;
   padding-top: 3px;

-  margin-right: 5px;
+  margin-right: $lineheight/4;

 }
 
 .greeting-bar-unread {
 }
 
 .greeting-bar-unread {


@@ -516,7 +520,7 @@ table {
 
   ul.secondary-actions {
     float: left;
 
   ul.secondary-actions {
     float: left;

-    margin-right: 5px;
+    margin-right: $lineheight/4;

 
     &:only-child {
       margin-right: 0px;
 
     &:only-child {
       margin-right: 0px;


@@ -526,7 +530,7 @@ table {
 
 .site-index .leaflet-top,
 .site-export .leaflet-top {
 
 .site-index .leaflet-top,
 .site-export .leaflet-top {

-  top: 10px !important;
+  top: $lineheight/2 !important;

   .leaflet-control {
     margin-top: 0px !important;
   }
   .leaflet-control {
     margin-top: 0px !important;
   }


@@ -534,11 +538,11 @@ table {
 
 .site-index #map .olControlScaleLine,
 .site-export #map .olControlScaleLine {
 
 .site-index #map .olControlScaleLine,
 .site-export #map .olControlScaleLine {

-  left: 10px !important;
+  left: $lineheight/2 !important;

 }
 
 .leaflet-popup-scrolled {
 }
 
 .leaflet-popup-scrolled {

-  padding-right: 20px;
+  padding-right: $lineheight;

   border-bottom: 0px !important;
   border-top: 0px !important;
 }
   border-bottom: 0px !important;
   border-top: 0px !important;
 }


@@ -551,7 +555,7 @@ table {
 /* Rules for edit menu */
 
 .menuicon {
 /* Rules for edit menu */
 
 .menuicon {

-  padding: 0 5px;
+  padding: 0 $lineheight/4;

   font-weight: normal;
   display: inline-block;
   &:hover {
   font-weight: normal;
   display: inline-block;
   &:hover {


@@ -570,7 +574,7 @@ table {
     margin: 0px;
   }
   li {
     margin: 0px;
   }
   li {

-    padding: 2px 5px;
+    padding: 2px $lineheight/4;

     border-top: 1px solid #eee;
     white-space: nowrap;
   }
     border-top: 1px solid #eee;
     white-space: nowrap;
   }


@@ -604,7 +608,7 @@ table {
   width: 33.3333%;
   .sidebar_heading {
     position: relative;
   width: 33.3333%;
   .sidebar_heading {
     position: relative;

-    padding: 10px 20px;
+    padding: $lineheight/2 $lineheight;

     z-index: 9999;
     background: #F4F4FF;
     border-bottom: 1px solid #ccc;
     z-index: 9999;
     background: #F4F4FF;
     border-bottom: 1px solid #ccc;


@@ -615,7 +619,7 @@ table {
   ul {
     margin-bottom: 0;
     li {
   ul {
     margin-bottom: 0;
     li {

-      margin-bottom: 5px;
+      margin-bottom: $lineheight/4;

       &:last-child {
         margin-bottom: 0;
       }
       &:last-child {
         margin-bottom: 0;
       }


@@ -625,10 +629,10 @@ table {
 
 #sidebar_close {
   position: absolute;
 
 #sidebar_close {
   position: absolute;

-  height: 20px;
+  height: $lineheight;

   top: 0px;
   bottom: 0;
   top: 0px;
   bottom: 0;

-  right: 20px;
+  right: $lineheight;

   margin: auto;
 }
 
   margin: auto;
 }
 


@@ -637,8 +641,8 @@ table {
   bottom: 0;
   width: 100%;
   h4 {
   bottom: 0;
   width: 100%;
   h4 {

-    padding: 0 20px 10px 20px;
-    margin-top: 10px;
+    padding: 0 $lineheight $lineheight/2 $lineheight;
+    margin-top: $lineheight/2;

     margin-bottom: 0;
     border-bottom: 1px solid #ddd;
   }
     margin-bottom: 0;
     border-bottom: 1px solid #ddd;
   }


@@ -647,22 +651,22 @@ table {
 /* Rules for the map key which appears in the popout sidebar */
 
 #mapkey {
 /* Rules for the map key which appears in the popout sidebar */
 
 #mapkey {

-  padding: 20px;
+  padding: $lineheight;

  .mapkey-table-key img {
     display: block;
     margin-left: auto;
     margin-right: auto;
   }
   td {
  .mapkey-table-key img {
     display: block;
     margin-left: auto;
     margin-right: auto;
   }
   td {

-    padding: 0 5px 5px 5px;
+    padding: 0 $lineheight/4 $lineheight/4 $lineheight/4;

   }
 }
 
 /* Rules for search results which appear in the popout sidebar */
 
 .search_searching {
   }
 }
 
 /* Rules for search results which appear in the popout sidebar */
 
 .search_searching {

-  margin-top: 5px;
-  margin-bottom: 5px;
+  margin-top: $lineheight/4;
+  margin-bottom: $lineheight/4;

 }
 
 .search_results_entry {
 }
 
 .search_results_entry {


@@ -676,8 +680,8 @@ table {
 
 .search_results_entry .search_searching {
   text-align: center;
 
 .search_results_entry .search_searching {
   text-align: center;

-  margin: 20px auto;
-  width: 20px;
+  margin: $lineheight auto;
+  width: $lineheight;

   display: block;
 }
 
   display: block;
 }
 


@@ -693,15 +697,15 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   position: relative;
   .browse_show_list.button {
     position: absolute;
   position: relative;
   .browse_show_list.button {
     position: absolute;

-    left: 20px;
-    right: 20px;
+    left: $lineheight;
+    right: $lineheight;

     bottom: -40px;
     margin-bottom: 0;
   }
   a.more-details {
     position: absolute;
     top: 0;
     bottom: -40px;
     margin-bottom: 0;
   }
   a.more-details {
     position: absolute;
     top: 0;

-    right: 20px;
+    right: $lineheight;

   }
   ul li {
     margin-bottom: 0;
   }
   ul li {
     margin-bottom: 0;


@@ -723,11 +727,11 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 }
 
 .export_area_inputs {
 }
 
 .export_area_inputs {

-  margin-bottom: 10px;
+  margin-bottom: $lineheight/2;

 }
 
 .export_bound {
 }
 
 .export_bound {

-  margin: 5px;
+  margin: $lineheight/4;

 }
 
 .export_details input[type="text"]#export_html_text {
 }
 
 .export_details input[type="text"]#export_html_text {


@@ -735,7 +739,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 }
 
 #sidebar #marker_inputs li:last-child {
 }
 
 #sidebar #marker_inputs li:last-child {

-  margin-bottom: 10px;
+  margin-bottom: $lineheight/2;

 }
 
 #export_osm,
 }
 
 #export_osm,


@@ -752,7 +756,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 /* Rules for the main content area */
 
 #content {
 /* Rules for the main content area */
 
 #content {

-  padding: 20px;
+  padding: $lineheight;

   position: relative;
 }
 
   position: relative;
 }
 


@@ -792,7 +796,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 #slim_container_content {
   max-width: 50em;
   background-color: #FFFFFF;
 #slim_container_content {
   max-width: 50em;
   background-color: #FFFFFF;

-  margin: 10px auto;
+  margin: $lineheight/2 auto;

   padding: 3px;
   border-radius: 25px;
   -moz-border-radius: 25px;
   padding: 3px;
   border-radius: 25px;
   -moz-border-radius: 25px;


@@ -800,7 +804,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 }
 
 #slim_content {
 }
 
 #slim_content {

-  margin: 10px;
+  margin: $lineheight/2;

   margin-top: 95px;
   max-width: 50em;
 
   margin-top: 95px;
   max-width: 50em;
 


@@ -810,30 +814,30 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 }
 
 #slim_header {
 }
 
 #slim_header {

-  margin: 30px 10px;
+  margin: 30px $lineheight/2;

   position: absolute;
   top: 0px;
   position: absolute;
   top: 0px;

-  margin-right: 5px;
+  margin-right: $lineheight/4;

   img {
     vertical-align: middle;
   img {
     vertical-align: middle;

-    margin-bottom: 5px;
-    margin-right: 5px;
+    margin-bottom: $lineheight/4;
+    margin-right: $lineheight/4;

   }
 }
 
 .content-heading {
   position: relative;
   }
 }
 
 .content-heading {
   position: relative;

-  padding: 20px;
+  padding: $lineheight;

   background: #F4F4FF;
   h1, h2 {
   background: #F4F4FF;
   h1, h2 {

-    margin-bottom: 10px;
+    margin-bottom: $lineheight/2;

     line-height: 100%;
     &:last-child {
       margin-bottom: 0;
     }
   }
   p {
     line-height: 100%;
     &:last-child {
       margin-bottom: 0;
     }
   }
   p {

-    margin-top: 10px;
+    margin-top: $lineheight/2;

     margin-bottom: 0px;
   }
 }
     margin-bottom: 0px;
   }
 }


@@ -845,14 +849,14 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   width: 45%;
   height: 400px;
   border: 1px solid #ccc;
   width: 45%;
   height: 400px;
   border: 1px solid #ccc;

-  margin-bottom: 20px;
+  margin-bottom: $lineheight;

   float: right;
 }
 
 .content_map #small_map {
   height: 100%;
   width: 100%;
   float: right;
 }
 
 .content_map #small_map {
   height: 100%;
   width: 100%;

-  margin-bottom: 20px;
+  margin-bottom: $lineheight;

 }
 
 /* Rules for the home page */
 }
 
 /* Rules for the home page */


@@ -882,7 +886,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 #changeset_list {
   width: 100%;
   ul {
 #changeset_list {
   width: 100%;
   ul {

-    padding: 10px 0;
+    padding: $lineheight/2 0;

     margin-bottom: 0px;
     border-top: 1px solid #ccc;
     &:last-child {
     margin-bottom: 0px;
     border-top: 1px solid #ccc;
     &:last-child {


@@ -895,8 +899,8 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   .date,
   .user {
     border-left: 1px solid #ccc;
   .date,
   .user {
     border-left: 1px solid #ccc;

-    padding-left: 5px;
-    margin-right: 5px;
+    padding-left: $lineheight/4;
+    margin-right: $lineheight/4;

   }
 }
 
   }
 }
 


@@ -914,10 +918,10 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 #changeset_list_map {
   position: absolute;
 
 #changeset_list_map {
   position: absolute;

-  bottom: 20px;
-  top: 20px;
-  right: 20px;
-  left: 20px;
+  bottom: $lineheight;
+  top: $lineheight;
+  right: $lineheight;
+  left: $lineheight;

   border: 1px solid #ccc;
 }
 
   border: 1px solid #ccc;
 }
 


@@ -929,8 +933,8 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 .browse-section {
   border-top: 1px solid #ccc;
 
 .browse-section {
   border-top: 1px solid #ccc;

-  margin-top: 10px;
-  padding-top: 10px;
+  margin-top: $lineheight/2;
+  padding-top: $lineheight/2;

   &:first-child {
     margin-top: 0;
   }
   &:first-child {
     margin-top: 0;
   }


@@ -941,7 +945,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     max-width: 100%;
   }
   h4, p {
     max-width: 100%;
   }
   h4, p {

-    margin-bottom: 5px;
+    margin-bottom: $lineheight/4;

   }
   p, ul, .bbox, .geo {
     display: inline-block;
   }
   p, ul, .bbox, .geo {
     display: inline-block;


@@ -963,7 +967,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   div {
     width: 33.3333%;
     text-align: center;
   div {
     width: 33.3333%;
     text-align: center;

-    padding: 5px 0;
+    padding: $lineheight/4 0;

     overflow: hidden;
     text-overflow: ellipsis;
     float: left;
     overflow: hidden;
     text-overflow: ellipsis;
     float: left;


@@ -981,13 +985,13 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 }
 
 #browse_map .secondary-actions {
 }
 
 #browse_map .secondary-actions {

-  margin-bottom: 10px;
+  margin-bottom: $lineheight/2;

 }
 
 /* Rules for the trace list shown by the traces tab etc */
 
 #trace_list {
 }
 
 /* Rules for the trace list shown by the traces tab etc */
 
 #trace_list {

-  font-size: 10px;
+  font-size: $lineheight/2;

   border-width: 0px;
   text-align: right;
   
   border-width: 0px;
   text-align: right;
   


@@ -1037,23 +1041,23 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 }
 
 .admin-user-info small {
 }
 
 .admin-user-info small {

-  margin-bottom: 10px;
+  margin-bottom: $lineheight/2;

   display: inline;
   display: inline;

-  margin-right: 20px;
+  margin-right: $lineheight;

 }
 
 .activity-block {
   clear: left;
   border-bottom: 1px solid #ccc;
 }
 
 .activity-block {
   clear: left;
   border-bottom: 1px solid #ccc;

-  padding-bottom: 20px;
+  padding-bottom: $lineheight;

   float: left;
   h3 {
   float: left;
   h3 {

-    margin-bottom: 10px;
+    margin-bottom: $lineheight/2;

   }
 }
 
 .contact-activity {
   }
 }
 
 .contact-activity {

-  margin-top: 20px;
+  margin-top: $lineheight;

   width: 100%;
 }
 
   width: 100%;
 }
 


@@ -1068,10 +1072,10 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 .user-view {
   p#no_home_location {
 
 .user-view {
   p#no_home_location {

-    margin: 20px;
+    margin: $lineheight;

   }
   .user_thumbnail {
   }
   .user_thumbnail {

-    margin-top: 5px;
+    margin-top: $lineheight/4;

     float: left;
   }
 }
     float: left;
   }
 }


@@ -1079,7 +1083,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 /* Rules for the user map */
 
 .content_map .leaflet-popup-content {
 /* Rules for the user map */
 
 .content_map .leaflet-popup-content {

-  margin: 10px;
+  margin: $lineheight/2;

   min-height: 50px;
 }
 
   min-height: 50px;
 }
 


@@ -1099,14 +1103,14 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   
   img.user_thumbnail {
     float: left;
   
   img.user_thumbnail {
     float: left;

-    margin: 0 10px 0 0;
+    margin: 0 $lineheight/2 0 0;

   }
 }
 
 /* Rules for the user list */
 
 #user_list {
   }
 }
 
 /* Rules for the user list */
 
 #user_list {

-  font-size: 10px;
+  font-size: $lineheight/2;

   width: 100%;
 
   tr {
   width: 100%;
 
   tr {


@@ -1121,7 +1125,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 #user_list_actions {
   float: right;
 
 #user_list_actions {
   float: right;

-  margin-top: 10px;
+  margin-top: $lineheight/2;

 }
 
 /* Rules for the diary list page */
 }
 
 /* Rules for the diary list page */


@@ -1133,8 +1137,8 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 .diary_post {
   max-width: 740px;
   position: relative;
 .diary_post {
   max-width: 740px;
   position: relative;

-  margin-top: 10px;
-  padding-top: 20px;
+  margin-top: $lineheight/2;
+  padding-top: $lineheight;

   border-top: 1px solid #ccc;
 
   &:first-child {
   border-top: 1px solid #ccc;
 
   &:first-child {


@@ -1158,10 +1162,10 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 }
 
 #content  .post_heading {
 }
 
 #content  .post_heading {

-  margin-bottom: 20px;
+  margin-bottom: $lineheight;

   h2 {
     margin-top: 0;
   h2 {
     margin-top: 0;

-    margin-bottom: 10px;
+    margin-bottom: $lineheight/2;

     font-size: 24px;
   }
 }
     font-size: 24px;
   }
 }


@@ -1175,27 +1179,27 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     height: 400px;
     border: 1px solid #ccc;
     display: none;
     height: 400px;
     border: 1px solid #ccc;
     display: none;

-    margin-bottom: 20px;
+    margin-bottom: $lineheight;

   }
   #newcomment {
     border-top: 1px solid #ccc;
   }
   #newcomment {
     border-top: 1px solid #ccc;

-    padding-top: 20px;
-    margin-top: 10px;
+    padding-top: $lineheight;
+    margin-top: $lineheight/2;

   }
   .comments {
     max-width: 740px;
   }
   .diary-comment {
   }
   .comments {
     max-width: 740px;
   }
   .diary-comment {

-    margin-top: 10px;
+    margin-top: $lineheight/2;

     border-top: 1px dashed #ccc;
     border-top: 1px dashed #ccc;

-    padding-top: 10px;
+    padding-top: $lineheight/2;

     &:first-child {
     &:first-child {

-      margin-top: 20px;
-      padding-top: 20px;
+      margin-top: $lineheight;
+      padding-top: $lineheight;

       border-top: 1px solid #ccc;
     }
     p {
       border-top: 1px solid #ccc;
     }
     p {

-      margin-bottom: 10px;
+      margin-bottom: $lineheight/2;

     }
     .comment-heading {
       margin-bottom: 0;
     }
     .comment-heading {
       margin-bottom: 0;


@@ -1216,7 +1220,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 #login_openid_buttons li {
   float: left;
 
 #login_openid_buttons li {
   float: left;

-  padding: 5px 10px;
+  padding: $lineheight/4 $lineheight/2;

 }
 
 /* Rules for the account confirmation page */
 }
 
 /* Rules for the account confirmation page */


@@ -1224,8 +1228,8 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 #terms {
   .legale {
     border: 1px solid #ccc;
 #terms {
   .legale {
     border: 1px solid #ccc;

-    padding: 20px;
-    margin-bottom: 20px;
+    padding: $lineheight;
+    margin-bottom: $lineheight;

     overflow: auto;
     height: 10em;
   
     overflow: auto;
     height: 10em;
   


@@ -1239,7 +1243,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     
     &:img {
       display: block;
     
     &:img {
       display: block;

-      margin: 20px auto inherit auto;
+      margin: $lineheight auto inherit auto;

     }
   }
   
     }
   }
   


@@ -1255,7 +1259,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     }
   }
   fieldset {
     }
   }
   fieldset {

-    margin-bottom: 20px;
+    margin-bottom: $lineheight;

   }
   #contributorGuidance {
     background-color: #f4f4ff;
   }
   #contributorGuidance {
     background-color: #f4f4ff;


@@ -1322,7 +1326,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   
   tr td,
   tr th {
   
   tr td,
   tr th {

-    padding: 5px;
+    padding: $lineheight/4;

   }
 }
 
   }
 }
 


@@ -1331,8 +1335,8 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 }
 
 .info-line {
 }
 
 .info-line {

-  margin-bottom: 20px;
-  padding: 5px 0px 4px 0px;
+  margin-bottom: $lineheight;
+  padding: $lineheight/4 0px 4px 0px;

   border-bottom: 1px solid #ccc;
 
   form, form div {
   border-bottom: 1px solid #ccc;
 
   form, form div {


@@ -1351,7 +1355,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 /* Rules for "flash" notice boxes shown at the top of the content area */
 
 .flash {
 /* Rules for "flash" notice boxes shown at the top of the content area */
 
 .flash {

-    padding: 20px;
+    padding: $lineheight;

   &#error {
     background-color: #ff7070;
   }
   &#error {
     background-color: #ff7070;
   }


@@ -1376,12 +1380,12 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 #errorExplanation {
   width: 400px;
   border: 2px solid #ff7070;
 #errorExplanation {
   width: 400px;
   border: 2px solid #ff7070;

-  padding: 10px;
-  margin-bottom: 20px;
+  padding: $lineheight/2;
+  margin-bottom: $lineheight;

   background-color: #f0f0f0;
   h2 {
     margin: -10px;
   background-color: #f0f0f0;
   h2 {
     margin: -10px;

-    padding: 5px 5px 5px 15px;
+    padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;

     font-weight: bold;
     font-size: 12px;
     background-color: #c00;
     font-weight: bold;
     font-size: 12px;
     background-color: #c00;


@@ -1392,7 +1396,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   p {
     color: #333;
     margin-bottom: 0px;
   p {
     color: #333;
     margin-bottom: 0px;

-    padding: 5px;
+    padding: $lineheight/4;

   }
   
   ul li {
   }
   
   ul li {


@@ -1406,18 +1410,18 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 .standard-form {
   fieldset {
 
 .standard-form {
   fieldset {

-    margin-bottom: 20px;
+    margin-bottom: $lineheight;

   }
   label {
     display: block;
     width: 300px;
   }
   label {
     display: block;
     width: 300px;

-    margin-right: 10px;
-    font-size: 14px;
+    margin-right: $lineheight/2;
+    font-size: $typeheight;

     font-weight: bold;
     line-height: 1.5;
   }
   .form-row {
     font-weight: bold;
     line-height: 1.5;
   }
   .form-row {

-    margin-bottom: 10px;
+    margin-bottom: $lineheight/2;

   }
   input[name=remember_me] {
     float: left;
   }
   input[name=remember_me] {
     float: left;


@@ -1442,16 +1446,16 @@ img.user_image {
   max-width: 100px;
   max-height: 100px;
   border: 1px solid #ccc;
   max-width: 100px;
   max-height: 100px;
   border: 1px solid #ccc;

-  margin-bottom: 20px;
+  margin-bottom: $lineheight;

   float: left;
   float: left;

-  margin-right: 20px;
+  margin-right: $lineheight;

 }
 
 img.user_thumbnail {
   max-width: 50px;
   max-height: 50px;
   border: 1px solid #ccc;
 }
 
 img.user_thumbnail {
   max-width: 50px;
   max-height: 50px;
   border: 1px solid #ccc;

-  margin-right: 20px;
+  margin-right: $lineheight;

 }
 
 img.user_thumbnail_tiny {
 }
 
 img.user_thumbnail_tiny {


@@ -1494,8 +1498,8 @@ ul.secondary-actions {
     float: left;
     list-style: none;
     border-left: 1px solid #ccc;
     float: left;
     list-style: none;
     border-left: 1px solid #ccc;

-    padding-left: 5px;
-    margin-right: 5px;
+    padding-left: $lineheight/4;
+    margin-right: $lineheight/4;

     &:first-child {
       border-left: 0;
       padding-left: 0;
     &:first-child {
       border-left: 0;
       padding-left: 0;


@@ -1508,11 +1512,11 @@ ul.secondary-actions {
 
 /* Utility for managing inner content areas */
 
 
 /* Utility for managing inner content areas */
 

-.inner22 { padding: 20px;}
+.inner22 { padding: $lineheight;}

 
 

-.inner12 { padding: 10px 20px;}
+.inner12 { padding: $lineheight/2 $lineheight;}

 
 

-.inner02 { padding: 0 20px;}
+.inner02 { padding: 0 $lineheight;}

 
 /* Utility for general button styles */
 
 
 /* Utility for general button styles */
 


@@ -1523,9 +1527,9 @@ a.button {
   cursor: pointer;
   border: 0;
   display: block;
   cursor: pointer;
   border: 0;
   display: block;

-  padding: 5px;
+  padding: $lineheight/4;

   min-width: 120px;
   min-width: 120px;

-  margin-bottom: 10px;
+  margin-bottom: $lineheight/2;

   color: white;
   background: #7092FF;
   text-align: center;
   color: white;
   background: #7092FF;
   text-align: center;


@@ -1570,9 +1574,9 @@ a.button.submit {
 
 .richtext {
   h1, h2 {
 
 .richtext {
   h1, h2 {

-    padding-bottom: 10px;
+    padding-bottom: $lineheight/2;

     border-bottom: 1px dashed #cccccc;
     border-bottom: 1px dashed #cccccc;

-    margin-bottom: 10px;
+    margin-bottom: $lineheight/2;

   }
 
   h1 {
   }
 
   h1 {


@@ -1584,7 +1588,7 @@ a.button.submit {
   }
 
   h3 {
   }
 
   h3 {

-    font-size: 14px;
+    font-size: $typeheight;

   }
 
   code {
   }
 
   code {


@@ -1604,7 +1608,7 @@ a.button.submit {
   }
 
   img {
   }
 
   img {

-    padding: 20px;
+    padding: $lineheight;

     background-color: #f4f4ff;
     display: block;
     max-width: 100%;
     background-color: #f4f4ff;
     display: block;
     max-width: 100%;


@@ -1612,17 +1616,17 @@ a.button.submit {
   }
 
   blockquote {
   }
 
   blockquote {

-    border-left: 20px solid #f4f4ff;
-    padding-left: 20px;
+    border-left: $lineheight solid #f4f4ff;
+    padding-left: $lineheight;

     margin: 0;
     color: #7E7E7E;
   }
 
   ul, ol {
     font-style: italic;
     margin: 0;
     color: #7E7E7E;
   }
 
   ul, ol {
     font-style: italic;

-    padding-left: 20px;
-    margin-bottom: 20px;
-    margin-left: 20px;
+    padding-left: $lineheight;
+    margin-bottom: $lineheight;
+    margin-left: $lineheight;

   }
 
   ul li {
   }
 
   ul li {


@@ -1635,7 +1639,7 @@ a.button.submit {
 }
 
 .diary_post .richtext {
 }
 
 .diary_post .richtext {

-    margin-top: 20px;
+    margin-top: $lineheight;

   }
 
 .comments .richtext {
   }
 
 .comments .richtext {


@@ -1652,7 +1656,7 @@ a.button.submit {
 
     .richtext_preview {
       display: inline-block;
 
     .richtext_preview {
       display: inline-block;

-      padding: 20px;
+      padding: $lineheight;

       background-color: #f4f4ff;
       overflow-x: auto;
 
       background-color: #f4f4ff;
       overflow-x: auto;
 


@@ -1673,7 +1677,7 @@ a.button.submit {
     vertical-align: top;
     margin-left: 15px;
     background-color: #f8f8ff;
     vertical-align: top;
     margin-left: 15px;
     background-color: #f8f8ff;

-    padding: 10px;
+    padding: $lineheight/2;

     width: 300px;
     max-width: 450px;
 
     width: 300px;
     max-width: 450px;
 


@@ -1683,8 +1687,8 @@ a.button.submit {
 
     h4.heading, li {
       border-bottom: 1px solid #ccc;
 
     h4.heading, li {
       border-bottom: 1px solid #ccc;

-      margin-bottom: 5px;
-      padding-bottom: 5px;
+      margin-bottom: $lineheight/4;
+      padding-bottom: $lineheight/4;

     }
 
     li h4, li span, li p {
     }
 
     li h4, li span, li p {


@@ -1700,14 +1704,14 @@ a.button.submit {
 
     li span, li p {
       width: 60%;
 
     li span, li p {
       width: 60%;

-      margin-left: 10px;
-      margin-bottom: 5px;
+      margin-left: $lineheight/2;
+      margin-bottom: $lineheight/4;

       white-space: nowrap;
     }
 
     input.richtext_doedit,
     input.richtext_dopreview {
       white-space: nowrap;
     }
 
     input.richtext_doedit,
     input.richtext_dopreview {

-      margin-right: 10px;
+      margin-right: $lineheight/2;

     }
   }
 
     }
   }
 


@@ -1745,22 +1749,22 @@ a.button.submit {
 /* Rules for the notes interface */
 
 .note {
 /* Rules for the notes interface */
 
 .note {

-  padding-top: 10px;
+  padding-top: $lineheight/2;

 }
 
 .note {
   h2 {
 }
 
 .note {
   h2 {

-    margin-bottom: 10px;
+    margin-bottom: $lineheight/2;

   }
 
   div {
   }
 
   div {

-    margin-top: 10px;
+    margin-top: $lineheight/2;

   }
 
   .permalink {
     position: absolute;
   }
 
   .permalink {
     position: absolute;

-    top: 5px;
-    left: 5px;
+    top: $lineheight/4;
+    left: $lineheight/4;

     min-width: 15px;
     min-height: 15px;
     background: image-url("sprite.png") 0 -45px no-repeat;
     min-width: 15px;
     min-height: 15px;
     background: image-url("sprite.png") 0 -45px no-repeat;


@@ -1768,7 +1772,7 @@ a.button.submit {
 
   .permalink span {
     display: none;
 
   .permalink span {
     display: none;

-    padding-left: 20px;
+    padding-left: $lineheight;

   }
 
   .permalink:hover span {
   }
 
   .permalink:hover span {


@@ -1779,7 +1783,7 @@ a.button.submit {
     display: block;
     background-color: #ffe0cc;
     padding: 4px 6px;
     display: block;
     background-color: #ffe0cc;
     padding: 4px 6px;

-    margin-bottom: 10px;
+    margin-bottom: $lineheight/2;

   }
 
   .comment_body {
   }
 
   .comment_body {


@@ -1798,7 +1802,7 @@ a.button.submit {
   }
 
   .buttons {
   }
 
   .buttons {

-    margin-top: 5px;
+    margin-top: $lineheight/4;

     text-align: right;
   }
 }
     text-align: right;
   }
 }


@@ -1829,7 +1833,7 @@ a.button.submit {
 .ad {
   float: left;
   height: 120px;
 .ad {
   float: left;
   height: 120px;

-  padding: 10px;
+  padding: $lineheight/2;

   border: 0px;
   background: #fff;
 }
   border: 0px;
   background: #fff;
 }