X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/92210a5be1d1f2514a382cdba85d8fe01ffe4440..f26e417cf4d2640b93e066c9138814e24c171ee4:/app/assets/stylesheets/common.css.scss?ds=sidebyside

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 4ab90f7ab..2adabb5e1 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1,8 +1,19 @@
+/* Parameters */
+$lineheight: 20px;
+$typeheight: 14px;
+
+$offwhite: #f4f4ff;
+$blue: #7092FF;
+$lightblue: #B8C5F0;
+$grey: #AAA;
+$lightgrey: #CCC;
+$hovercolor: 20%;
+
 /* Styles common to large and small screens */
 
 /* Minimal CSS reset */
 
-html, body, ul, ol, li, form, fieldset, legend, h1, h2, h3, h4, h5, h6, p {
+html, body, ul, ol, li, form, fieldset, legend, h1, h2, h3, h4, h5, h6, p, input {
   margin: 0;
   padding: 0;
   border: 0;
@@ -27,7 +38,7 @@ li { list-style: none; }
 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;
@@ -46,11 +57,48 @@ abbr, acronym {
     clear: both;
 }
 
+/* Basic grid */
+
+.col0    { float:left; width:04.1666%; }
+.col1    { float:left; width:08.3333%; }
+.col2    { float:left; width:16.6666%; }
+.col3    { float:left; width:25.0000%; }
+.col4    { float:left; width:33.3333%; }
+.col5    { float:left; width:41.6666%; }
+.col6    { float:left; width:50.0000%; }
+.col7    { float:left; width:58.3333%; }
+.col8    { float:left; width:66.6666%; }
+.col9    { float:left; width:75.0000%; }
+.col10   { float:left; width:83.3333%; }
+.col11   { float:left; width:91.6666%; }
+.col12   { width:100%; }
+
+.margin0  { margin-left:04.1666%; }
+.margin1  { margin-left:08.3333%; }
+.margin2  { margin-left:16.6666%; }
+.margin3  { margin-left:25.0000%; }
+.margin4  { margin-left:33.3333%; }
+.margin5  { margin-left:41.6666%; }
+.margin6  { margin-left:50.0000%; }
+.margin7  { margin-left:58.3333%; }
+.margin8  { margin-left:66.6666%; }
+.margin9  { margin-left:75.0000%; }
+.margin10 { margin-left:83.3333%; }
+.margin11 { margin-left:91.6666%; }
+.margin12 { margin-left:100.0000%; }
+
+.fillL { background-color: white; }
 /* Default rules for the body of every page */
 
+* {
+  -moz-box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+}
+
 body {
   font-family: 'Helvetica Neue',Arial,sans-serif;
-  font-size: 14px;
+  font-size: $typeheight;
   line-height: 1.6666;
   color: #222;
   background-color: #fff;
@@ -64,8 +112,8 @@ body.slim {
 }
 
 h1, h2, h3 {
-  margin-top: 10px;
-  margin-bottom: 20px;
+  margin-top: $lineheight/2;
+  margin-bottom: $lineheight;
   font-weight: bold;
   line-height: 1.2;
 }
@@ -80,20 +128,20 @@ h1, h2 {
 
 h3 {
   font-size: 21px;
-  margin-top: 10px;
-  margin-bottom: 20px;
+  margin-top: $lineheight/2;
+  margin-bottom: $lineheight;
 }
 
 h4,h5,h6 {
-  font-size: 14px;
-  margin-top: 10px;
-  margin-bottom: 20px;
+  font-size: $typeheight;
+  margin-top: $lineheight/2;
+  margin-bottom: $lineheight/2;
   font-weight: bold;
   line-height: 1.5;
 }
 
 p, ul {
-  margin-bottom: 20px;
+  margin-bottom: $lineheight;
 }
 
 p > img {
@@ -116,14 +164,46 @@ h6:first-child {
 
 .column-1 {
   width: 50%;
-  margin-bottom: 20px;
+  margin: 0 0 $lineheight/2 0;
 }
 
 .small_icon {
   vertical-align: middle;
-  margin-right: 5px;
+  margin-right: $lineheight/4;
+}
+
+/* Rules for icons */
+
+.icon {
+  display:inline-block;
+  vertical-align:top;
+  width:20px;
+  height:20px;
+  background:transparent image-url("sprite.png") no-repeat 0 0;
+  text-indent:-9999px;
+  overflow:hidden;
+  }
+
+.icon-pre-text {
+    margin-right: 5px;
 }
 
+.icon.search      { background-position: 0 0; }
+.icon.donate      { background-position: -20px 0; }
+.icon.zoomin      { background-position: -40px 0; }
+.icon.zoomout     { background-position: -60px 0; }
+.icon.geolocate   { background-position: -80px 0; }
+.active .icon.geolocate   { background-position: -80px -20px; }
+.icon.layers      { background-position: -100px 0; }
+.icon.key         { background-position: -120px 0; }
+.icon.share       { background-position: -140px 0; }
+.icon.clipboard   { background-position: -160px 0; }
+.icon.link        { background-position: -180px 0; }
+.icon.close       { background-position: -200px 0; }
+.icon.check       { background-position: -220px 0; }
+.icon.note        { background-position: -240px 0; }
+.icon.gear        { background-position: -260px 0; }
+
 /* Rules for links */
 
 a {
@@ -147,11 +227,11 @@ hr {
 
 table {
   width: 100%;
-  margin-bottom: 20px;
+  margin-bottom: $lineheight;
   th, td {
     text-align: left;
-    padding: 5px;
-    line-height: 20px;
+    padding: $lineheight/4;
+    line-height: $lineheight;
   }
   th {
     font-weight: bold;
@@ -169,7 +249,7 @@ table {
   height: 100%;
   width: 185px;
   font-size: 11px;
-  line-height: 12px;
+  line-height: 1.1;
   z-index: 100;
   border-right: 1px solid #ccc;
 }
@@ -180,42 +260,43 @@ table {
   display: block;
   width: 170px;
   min-width: 170px;
-  padding: 20px 5px;
+  padding: $lineheight $lineheight/4;
   text-align: center;
   margin: auto;
 }
 
 #logo h1 {
   font-size: 18px;
-  line-height: 20px;
+  line-height: 1;
   text-align: center;
-  margin: 0px;
+  margin: 0;
 }
 
 #logo h2 {
-  font-size: 10px;
+  font-size: $lineheight/2;
   line-height: 15px;
-  margin: 0px;
+  margin: 0;
 }
 
 /* Rules for the site name */
 
 #small-title {
   display: none;
+
+  img {
+    vertical-align: text-bottom;
+  }
 }
 
 /* Rules for the introductory text displayed in the left sidebar to new users */
 
 .sidebar-copy {
-  padding: 5px 10px;
-}
-
-.sidebar-copy p {
-  margin: 5px 0;
+  padding: $lineheight/4 $lineheight/2;
+  p {
+    margin: $lineheight/4 0;
+  }
 }
-
 .sidebar-copy.intro {
-  margin-top: -1px;
   border-top: 1px solid #ccc;
 }
 
@@ -226,15 +307,15 @@ table {
  */
 
 .sidebar-alert {
-  padding: 5px;
+  padding: $lineheight/4;
   border-top: 1px solid #ccc;
   margin-top: 4px;
-  margin-bottom: -4px;
+  margin-bottom: -5px;
   background: #e00;
   font-size: 12px;
   font-weight: bold;
   p {
-    margin: 5px;
+    margin: $lineheight/4;
   }
 }
 
@@ -245,14 +326,14 @@ table {
  */
 
 .sidebar-notice {
-  padding: 5px;
+  padding: $lineheight/4;
   border-top: 1px solid #ccc;
   margin-top: 4px;
-  margin-bottom: -4px;
+  margin-bottom: -5px;
   background: #ea0;
   font-size: 12px;
   p {
-    margin: 5px;
+    margin: $lineheight/4;
   }
 }
 
@@ -261,51 +342,32 @@ table {
 .left_menu {
   left: 0px;
   margin: 0;
-  padding: 5px 10px;
-  line-height: 15px;
+  padding: $lineheight/4 $lineheight/2 $lineheight/2 $lineheight/2;
   font-size: 12px;
+  line-height: 1.25;
   list-style-type: none;
   border-bottom: 1px solid #ccc;
   border-top: 1px solid #ccc;
-}
-
-.left_menu img {
-  margin: 10px 0px;
-}
-
-.left_menu ul {
-  padding: 0;
-  margin: 0;
-}
-
-.left_menu li {
-  list-style-type: none;
-  padding: 0;
-  margin: 0;
-}
-
-.left_menu h4 {
-  padding: 5px 0 5px 0;
-  font-size: 12px;
-  margin: 0;
-}
-
-.left_menu li:last-child h4 {
-  padding-top: 0;
-}
+  img {
+    margin: $lineheight/2 0px;
+  }
 
-/* Rules for SOTM advert */
+  ul {
+    padding: 0;
+    margin: 0;
+  }
 
-#sotm {
-  width: 165px;
-  margin: 10px;
-  padding: 0px;
-  border: 0px;
-  background: #fff;
-}
+  li {
+    list-style-type: none;
+    padding: 0;
+    margin: 0;
+  }
 
-#sotm img {
-  width: 165px;
+  h4 {
+    padding: $lineheight/4 0 $lineheight/4 0;
+    font-size: 12px;
+    margin: 0;
+  }
 }
 
 /*
@@ -316,57 +378,54 @@ table {
 
 .optionalbox {
   left: 0px;
-  padding: 5px 10px;
-  margin: 5px 0;
+  padding: $lineheight/4 $lineheight/2;
+  margin: $lineheight/4 0;
   text-align: left;
 }
 
 /* Rules for the search box */
 
-#search_field form {
-  width: 165px;
-}
-
 #search_field {
   position: relative;
-}
 
-#search_field input[type="text"] {
-  width: 165px;
-  padding: 3px;
-  font-size: 14px;
-  line-height: 15px;
-  height: 25px;
-  padding: 2px 0px 2px 5px;
-  box-shadow: inset #DDD 0px 1px 3px;
-  box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  -ms-box-sizing: border-box;
-}
+  form {
+    width: 165px;
+  }
 
-#search_field input[type="text"]:focus {
-  outline: none;
-  border: 1px solid #000;
-}
+  input[type="text"] {
+    width: 165px;
+    padding: 3px;
+    font-size: $typeheight;
+    line-height: 1.1;
+    height: 25px;
+    padding: 2px 0px 2px $lineheight/4;
+    box-shadow: inset #DDD 0px 1px 3px;
+  }
 
-#search_field input[type="submit"] {
-  border: 0;
-  margin: 0;
-  padding: 0;
-  width: 15px;
-  height: 15px;
-  text-indent: -1000px;
-  overflow: hidden;
-  background: image-url("sprite.png") 0 0 no-repeat;
-  position: absolute;
-  top: 5px;
-  right: 5px;
-  cursor: pointer;
+  input[type="text"]:focus {
+    outline: none;
+    border: 1px solid #000;
+  }
+
+  input[type="submit"] {
+    border: 0;
+    margin: 0;
+    padding: 0;
+    width: 15px;
+    height: 15px;
+    min-width: 0;
+    text-indent: -1000px;
+    overflow: hidden;
+    background: image-url("sprite.png") -2px -2px no-repeat;
+    position: absolute;
+    top: $lineheight/4;
+    right: $lineheight/4;
+    cursor: pointer;
+  }
 }
 
 .search_help {
-  margin: 5px 0 0 0;
+  margin: $lineheight/4 0 0 0;
 }
 
 /* Utility for de-emphasizing content */
@@ -374,52 +433,35 @@ table {
 .deemphasize {
   color: #999;
   a {
-    color: #7092FF;
+    color: $blue;
   }
 }
 
 /* Rules for donation request box */
 
-.donate {
+a.donate {
   display: block;
-  position: relative;
-  width: 153px;
-  padding: 5px;
+  width: 163px;
+  padding: $lineheight/4;
   border: 1px solid #AED1A0;
   background: #cbeea7;
-  line-height: 20px;
+  font-size: $typeheight;
+  line-height: 1.4;
   text-align: center;
-  font-size: 14px;
   border-radius: 2px;
-  -moz-border-radius: 2px;
   color: #222;
-  margin: 10px 10px 0px 10px;
-}
-
-.donate:hover {
-  background: #9ed485;
-  text-decoration: none;
-}
-
-.donate p {
-  text-indent: 20px;
-  margin: 0;
-}
+  margin: $lineheight/2 $lineheight/2 0px $lineheight/2;
 
-.donate .donate-icon {
-  width: 15px;
-  height: 15px;
-  border: 0px;
-  background: image-url("sprite.png") 0 -30px no-repeat;
-  position: absolute;
-  top: 8px;
-  left: 17px;
+  &:hover {
+    background: #9ed485;
+    text-decoration: none;
+  }
 }
 
 /* Rules for Creative Commons logo button */
 
 #cclogo {
-  margin: 10px 0;
+  margin: $lineheight/2 0;
   float: right;
 }
 
@@ -428,78 +470,83 @@ table {
 #top-bar {
   position: relative;
   margin-left: 185px;
-  height: 29px;
+  height: 30px;
   border-bottom: 1px solid #ccc;
   background: white;
-  z-index: 100;
+  z-index: 1001;
+
+  .caret {
+    margin-top: 10px;
+  }
 }
 
 .site-edit #top-bar,
 .site-index #top-bar,
 .site-export #top-bar {
   position: fixed;
+  top: 0;
   left: 0;
   right: 0;
 }
 
 #tabnav {
   height: 29px;
-  margin-bottom:0;
-  overflow: hidden;
-}
+  margin-bottom: 0;
 
-#tabnav li {
-  display: inline;
-}
+  > li {
+    float: left;
 
-#tabnav a, #tabnav a:link, #tabnav a:visited {
-  float: left;
-  background: #fff;
-  font-weight: bold;
-  padding: 3px 10px;
-  text-decoration: none;
-  color: #333;
-  float: left;
-  margin-right: 1px;
-  -webkit-transition: color 200ms ease-in;
-     -moz-transition: color 200ms ease-in;
-       -o-transition: color 200ms ease-in;
-          transition: color 200ms ease-in;
-}
-
-.site-index #tabnav a#viewanchor,
-.site-edit #tabnav a#editanchor,
-.changeset-list #tabnav a#historyanchor,
-.site-export #tabnav a#exportanchor {
-  border-bottom: 1px solid #aaa;
-  background: #9ed485;
-  color: #000;
-}
+    > * {
+      padding: 3px $lineheight/2;
+    }
+  }
 
-#tabnav a:link:hover, #tabnav a:visited:hover {
-  text-decoration: underline;
-}
+  a.tab {
+    display: inline-block;
+    font-weight: bold;
+    text-decoration: none;
+    color: #333;
 
-#tabnav a:link.disabled,
-#tabnav a:visited.disabled,
-#tabnav a:link:hover.disabled,
-#tabnav a:visited:hover.disabled {
-  color: #ccc;
-  cursor: default;
+    -webkit-transition: color 200ms ease-in;
+       -moz-transition: color 200ms ease-in;
+         -o-transition: color 200ms ease-in;
+            transition: color 200ms ease-in;
+
+    &:hover {
+      text-decoration: underline;
+    }
+  }
+
+  .disabled a {
+    color: #ccc;
+    cursor: default;
+
+    &:hover {
+      text-decoration: none;
+    }
+
+    .caret {
+      border-top-color: #ccc;
+    }
+  }
+
+  .dropdown {
+    height: 29px;
+  }
 }
 
-#tabnav a:link.disabled:hover,
-#tabnav a:visited.disabled:hover,
-#tabnav a:link:hover.disabled:hover,
-#tabnav a:visited:hover.disabled:hover {
-  text-decoration: none;
+.site-index #view_tab,
+.site-edit #edit_tab,
+.changeset-list #history_tab {
+  background: #9ed485;
+  color: #000;
 }
 
 /* Utility for styling notification numbers */
 
 .count-number {
-  padding: 2px 5px;
-  border-radius: 3px;
+  padding: 2px $lineheight/4;
+  border-radius: 2px;
   background: #d7d7ff;
   margin: 0 2px;
   font-size: 11px;
@@ -510,11 +557,52 @@ table {
 
 #greeting {
   float: right;
-  padding-top: 3px;
-}
+  height: 100%;
 
-.greeting-bar-unread {
-  font-weight: bold;
+  &.secondary-actions {
+    padding: 3px $lineheight/2;
+  }
+
+  &.dropdown {
+    background-color: #EEE;
+    &:hover {
+      background-color: #CCC;
+    }
+  }
+
+  img {
+    vertical-align: top;
+    border-radius: 2px 0 0 2px;
+    margin-right: 5px;
+  }
+
+  #inboxanchor {
+    display: inline-block;
+    position: relative;
+    height: 20px;
+    top: -2px;
+    margin: 0 2px 0 0;
+    padding: 0 5px 0 0;
+    border-radius: 2px;
+  }
+
+  .dropdown-toggle {
+    display: block;
+    padding: 3px 7px;
+    color: #000;
+    text-decoration: none;
+  }
+
+  .dropdown-menu {
+    left: auto;
+    right: 0;
+
+    .count-number {
+      float: right;
+      padding: 0 5px;
+      margin: 0;
+    }
+  }
 }
 
 /* Rules for the message shown in place of the map when javascript is disabled */
@@ -526,100 +614,341 @@ table {
   left: 15px;
 }
 
-/* Rules for Leaflet maps */
+/* Rules for bootstrap tooltips */
 
-#permalink {
-  z-index: 10000;
+.tooltip {
   position: absolute;
-  bottom: 0px;
-  right: 0px;
-  padding: 5px;
-  background:#fff;
+  display: none;
+  color: #333;
+  text-align: left;
+  font-size: 12px;
+  max-width: 250px;
 }
 
-.site-index .leaflet-top,
-.site-export .leaflet-top {
-  top: 10px !important;
-  .leaflet-control {
-    margin-top: 0px !important;
-  }
+.tooltip.in {
+  opacity: 0.8;
+  z-index: 1030;
+  height: auto;
+  display: block;
 }
 
-.site-index #map .olControlScaleLine,
-.site-export #map .olControlScaleLine {
-  left: 10px !important;
+.tooltip.top {
+  margin-top: -10px;
+  text-align: center;
 }
 
-/* Rules for edit menu */
+.tooltip.right {
+  margin-left: 10px;
+}
 
-.menuicon {
-  padding: 0 5px;
-  font-weight: normal;
-  display: inline-block;
-  &:hover {
-    text-decoration: none !important;
-  }
+.tooltip.bottom {
+  margin-top: 10px;
+  text-align: center;
 }
 
-.menu {
-  display: none;
-  z-index: 10000;
-  position: absolute;
-  background-color: #ffffff;
-  border: 1px solid #cccccc;
-  border-top: 0px;
+.tooltip.left {
+  margin-left: -10px;
+  text-align: right;
 }
 
-.menu ul {
-  margin: 0px;
+.tooltip-inner {
+  display: inline-block;
+  padding: 10px;
+  font-weight: normal;
+  background-color: white;
 }
 
-.menu li {
-  padding: 2px 5px;
-  border-top: 1px solid #eee;
-  white-space: nowrap;
+.tooltip-arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
 }
 
-/* Rules for attribution text under the main map shown on printouts */
+.tooltip.top .tooltip-arrow {
+  bottom: -5px;
+  left: 50%;
+  margin-left: -5px;
+  border-top-color: white;
+  border-width: 5px 5px 0;
+}
 
-#attribution {
-  display: none;
+.tooltip.right .tooltip-arrow {
+  top: 50%;
+  left: -5px;
+  margin-top: -5px;
+  border-right-color: white;
+  border-width: 5px 5px 5px 0;
 }
 
-.attribution_license,
-.attribution_project {
-  text-align: left;
+.tooltip.left .tooltip-arrow {
+  top: 50%;
+  right: -5px;
+  margin-top: -5px;
+  border-left-color: white;
+  border-width: 5px 0 5px 5px;
 }
 
-.attribution_notice {
-  text-align: center;
+.tooltip.bottom .tooltip-arrow {
+  top: -5px;
+  left: 50%;
+  margin-left: -5px;
+  border-bottom-color: white;
+  border-width: 0 5px 5px;
 }
 
-/* Rules for the popout map sidebar */
+/* Rules for Leaflet maps */
 
-#sidebar {
-  display: none;
-  position: absolute;
-  overflow: auto;
-  top: 0px;
-  bottom: 0px;
-  left: 0px;
-  border-right: 1px solid #ccc;
-  width: 33.3333%;
-  .sidebar_heading {
-    position: relative;
-    padding: 10px 20px;
-    z-index: 9999;
-    background: #F4F4FF;
-    border-bottom: 1px solid #ccc;
+.leaflet-control .control-button {
+  display: block;
+  height: 40px;
+  width: 40px;
+  background-color: #333;
+  background-color: rgba(0,0,0,.6);
+  -bottom: 1px solid #333; 
+  border-radius: 4px 0 0 4px;
+  margin-bottom: 10px;
+  outline: none;
+
+  &:hover {
+    background-color: black;
   }
-  h4 {
-    margin: 0;
+
+  &.active {
+    background-color: #9ed485;
   }
-  ul {
-    margin-bottom: 0;
+
+  &.disabled {
+    background-color: #333;
+    background-color: rgba(0,0,0,.5);
+    cursor: default;
+  }
+
+  .icon {
+    margin: 10px;
+  }
+}
+
+.leaflet-control .zoomin,
+.control-layers .control-button {
+  margin-bottom: 0px;
+  border-radius: 4px 0 0 0;
+}
+
+.site .leaflet-control .zoomout,
+.control-key .control-button {
+  margin-bottom: 0;
+  border-radius: 0;
+}
+
+.leaflet-control .zoomout, // For non-main page maps
+.control-locate .control-button,
+.control-share .control-button {
+  border-radius: 0 0 0 4px;
+}
+
+/* Rules for the home page */
+
+.site-export #map,
+.site-index #map,
+.site-edit #map {
+  height: 100%;
+  overflow: hidden;
+}
+
+#map-ui {
+  display: none;
+  position: relative;
+  float: right;
+  width: 250px;
+  height: 100%;
+  background: white;
+  border-left: 1px solid #CCC;
+  overflow: auto;
+
+  .section {
+    border-bottom: 1px solid #DDD;
+    padding: 15px;
+  }
+
+  a.close-button {
+    float: right;
+    padding:5px;
+    font-size:20px;
+    line-height:10px;
+    color:#222;
+    border:1px solid #ddd;
+  }
+}
+
+.layers-ui,
+.share-ui {
+  ul, li:last-child, p:last-child {
+    margin-bottom: 0;
+  }
+}
+
+.layers-ui {
+  li {
+    border-radius: 4px;
+    overflow: hidden;
+    margin-bottom: 10px;
+  }
+
+  label {
+    display: block;
+    padding: 5px 5px 5px 7px;
+    background-color: #eee;
+    cursor: pointer;
+  }
+
+  li.active label {
+    background-color: #ccc;
+  }
+
+  .base-layers {
+    .leaflet-container {
+      width: 100%;
+      height: 50px;
+      cursor: pointer;
+    }
+  }
+}
+
+.share-ui {
+  .share-tabs {
+    margin-bottom: 10px;
+
+    a {
+      color: #fff;
+      text-decoration: none;
+      background-color: $lightblue;
+      padding: 5px 10px;
+    }
+
+    a:first-child {
+      border-right: 1px solid #fff;
+      border-radius: 4px 0 0 4px;
+    }
+
+    a:last-child {
+      border-left: 1px solid #fff;
+      border-radius: 0 4px 4px 0;
+    }
+
+    a.active {
+      background-color: $blue;
+    }
+  }
+
+  .share-tab {
+    display: none;
+  }
+
+  .share-link {
+    input[type=text],
+    textarea {
+      width: 100%;
+      font-family: monospace;
+      font-size: small;
+      line-height: 1.3;
+    }
+  }
+
+  .share-image {
+    label {
+      margin-right: 10px;
+    }
+  }
+
+  #embed_html {
+    resize: vertical;
+  }
+
+  #mapnik_scale {
+    width: 100px;
+  }
+}
+
+.leaflet-top.leaflet-right {
+  top: $lineheight/2 !important;
+  .leaflet-control {
+    margin-right: 0px !important;
+    margin-top: 0px !important;
+  }
+}
+
+.leaflet-popup-scrolled {
+  padding-right: $lineheight;
+  border-bottom: 0px !important;
+  border-top: 0px !important;
+}
+
+.leaflet-popup-content-wrapper {
+  border-radius: 4px !important;
+  -webkit-border-radius: 4px !important;
+}
+
+/* Rules for edit menu */
+
+.menuicon {
+  padding: 0 $lineheight/4;
+  font-weight: normal;
+  display: inline-block;
+  &:hover {
+    text-decoration: none !important;
+  }
+}
+
+.menu {
+  display: none;
+  z-index: 10000;
+  position: absolute;
+  background-color: #ffffff;
+  border: 1px solid $lightgrey;
+  border-top: 0px;
+  ul {
+    margin: 0px;
+  }
+  li {
+    padding: 2px $lineheight/4;
+    border-top: 1px solid #eee;
+    white-space: nowrap;
+  }
+}
+
+/* Rules for attribution text under the main map shown on printouts */
+
+#attribution {
+  display: none;
+}
+
+.attribution_license,
+.attribution_project {
+  text-align: left;
+}
+
+.attribution_notice {
+  text-align: center;
+}
+
+/* Rules for the popout map sidebar */
+
+#sidebar {
+  display: none;
+  position: relative;
+  float: left;
+  border-right: 1px solid $lightgrey;
+  width: 33.3333%;
+  height: 100%;
+  ul {
+    margin-bottom: 0;
+    &:last-child {
+        border-bottom: 1px solid #ccc;
+    }
     li {
-      margin-bottom: 5px;
+      margin-bottom: $lineheight/4;
       &:last-child {
         margin-bottom: 0;
       }
@@ -627,22 +956,34 @@ table {
   }
 }
 
-#sidebar_close {
+.sidebar_heading {
+  position: relative;
+  padding: $lineheight/2 $lineheight;
+  background: $offwhite;
+  border-bottom: 1px solid #ccc;
+  h4 {
+    margin: 0;
+  }
+}
+
+.sidebar_close {
   position: absolute;
-  height: 20px;
+  height: $lineheight;
   top: 0px;
   bottom: 0;
-  right: 20px;
+  right: $lineheight;
   margin: auto;
 }
 
 #sidebar_content {
   position: relative;
-  bottom: 0;
+  margin-bottom: 20px;
+  overflow: auto;
+  height: 100%;
   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;
   }
@@ -651,34 +992,36 @@ table {
 /* Rules for the map key which appears in the popout sidebar */
 
 #mapkey {
-  padding: 20px;
-}
-
-#mapkey .mapkey-table-key img {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-#mapkey td {
-  padding: 0 5px 5px 5px;
+ .mapkey-table-key img {
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+  }
+  td {
+    padding: 0 $lineheight/4 $lineheight/4 $lineheight/4;
+  }
 }
 
 /* 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 {
-  margin-bottom: 0 ;
+  margin-bottom: 0;
+
+  .search_details {
+    display: block;
+    text-align: right;
+  }
 }
 
 .search_results_entry .search_searching {
   text-align: center;
-  margin: 20px auto;
-  width: 20px;
+  margin: $lineheight auto;
+  width: $lineheight;
   display: block;
 }
 
@@ -694,15 +1037,15 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   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;
-    right: 20px;
+    right: $lineheight;
   }
   ul li {
     margin-bottom: 0;
@@ -724,37 +1067,22 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 }
 
 .export_area_inputs {
-  margin-bottom: 10px;
+  margin-bottom: $lineheight/2;
+  input[type="text"] {
+    width: 80px;
+    margin-bottom: 5px;
+  }
 }
 
 .export_bound {
-  margin: 5px;
-}
-
-.export_details input[type="text"]#export_html_text {
-  width: 100%;
-}
-
-#sidebar #marker_inputs li:last-child {
-  margin-bottom: 10px;
-}
-
-#export_osm,
-#export_mapnik,
-#export_osmarender {
-  display: none;
-}
-
-.export_buttons {
-  width: 100%;
-  text-align: center;
+  margin: $lineheight/4;
 }
 
 /* Rules for the main content area */
 
 #content {
-  padding: 20px;
   position: relative;
+  padding: $lineheight;
 }
 
 .site-edit #content,
@@ -763,20 +1091,79 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   position: fixed;
   padding: 0;
   top: 30px; bottom: 0;
-  left: 185px; right: 0;
+  left: 184px; right: 0;
   border-left: 1px solid #ccc;
 }
 
+/* Overrides for pages that use new layout conventions */
+.user-new,
+.user-create,
+.user-terms,
+.user-confirm,
+.site-copyright,
+.site-welcome {
+  #content {
+    max-width: 740px;
+  }
+}
+
+.user-new,
+.user-create,
+.user-terms,
+.user-confirm {
+  .content-heading {
+    height: 200px;
+  }
+}
+
+.user-new,
+.user-create,
+.user-terms {
+  #content {
+    padding: 0;
+  }
+}
+
+.header-illustration {
+  background-position: 0 0;
+  background-repeat: no-repeat;
+  position: absolute;
+  height: 200px;
+  width: 100%;
+  left: 0;
+  bottom: 0;
+
+  &.new-user-main {
+    background-image: image-url("sign-up-illustration.png");
+  }
+
+  &.confirm-main {
+    background-image: image-url("confirm-illustration.png");
+  }
+
+  &.new-user-terms {
+    background-image: image-url("terms-illustration.png");
+  }
+
+  &.new-user-arm {
+    height: 110px;
+    width: 130px;
+    left: 260px;
+    top: 160px;
+    background-image: image-url("sign-up-illustration-arm.png");
+  }
+}
+
+@media only screen and (max-width:900px) {
+  .header-illustration.new-user-arm { display: none;}
+}
+
 .wrapper {
-  margin-left: 185px;
+  margin-left: 184px;
   border-left: 1px solid #ccc;
   text-align: left;
 }
 
-.site-edit #content {
-  top: 30px;
-}
-
 #content.maximised {
   top: 0;
   left: 0;
@@ -793,7 +1180,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 #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;
@@ -801,7 +1188,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 }
 
 #slim_content {
-  margin: 10px;
+  margin: $lineheight/2;
   margin-top: 95px;
   max-width: 50em;
 
@@ -811,31 +1198,31 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 }
 
 #slim_header {
-  margin: 30px 10px;
+  margin: 30px $lineheight/2;
   position: absolute;
   top: 0px;
-  margin-right: 5px;
-}
-
-#slim_header img {
-  vertical-align: middle;
-  margin-bottom: 5px;
-  margin-right: 5px;
+  margin-right: $lineheight/4;
+  img {
+    vertical-align: middle;
+    margin-bottom: $lineheight/4;
+    margin-right: $lineheight/4;
+  }
 }
 
 .content-heading {
   position: relative;
-  padding: 20px;
-  background: #F4F4FF;
+  padding: $lineheight;
+  background: $offwhite;
+  z-index: 2;
   h1, h2 {
-    margin-bottom: 10px;
+    margin-bottom: $lineheight/2;
     line-height: 100%;
     &:last-child {
       margin-bottom: 0;
     }
   }
   p {
-    margin-top: 10px;
+    margin-top: $lineheight/2;
     margin-bottom: 0px;
   }
 }
@@ -845,38 +1232,16 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 .content_map {
   position: relative;
   width: 45%;
-  height: 398px;
+  height: 400px;
   border: 1px solid #ccc;
-  margin-bottom: 20px;
+  margin-bottom: $lineheight;
   float: right;
 }
 
 .content_map #small_map {
   height: 100%;
   width: 100%;
-  margin-bottom: 20px;
-}
-
-/* Rules for the home page */
-
-.site-export #map,
-.site-index #map {
-  position: absolute;
-  top: 0px;
-  bottom: 0px;
-  left: 0px;
-  right: 0px;
-}
-
-/* Rules for the edit page */
-
-.site-edit #map {
-  position: absolute;
-  top: 0px;
-  bottom: 0px;
-  left: 0px;
-  right: 0px;
-  overflow: hidden;
+  margin-bottom: $lineheight;
 }
 
 /* Rules for the changeset list shown by the history tab etc */
@@ -884,7 +1249,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 #changeset_list {
   width: 100%;
   ul {
-    padding: 10px 0;
+    padding: $lineheight/2 0;
     margin-bottom: 0px;
     border-top: 1px solid #ccc;
     &:last-child {
@@ -897,40 +1262,68 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   .date,
   .user {
     border-left: 1px solid #ccc;
-    padding-left: 5px;
-    margin-right: 5px;
+    padding-left: $lineheight/4;
+    margin-right: $lineheight/4;
   }
 }
 
+#changeset_list_map_wrapper {
+  position: absolute;
+  width: 50%;
+  height: 490px;
+  top: 0;
+  right: 0;
+}
+
+#changeset_list_map_wrapper.scrolled {
+  position: fixed;
+}
+
 #changeset_list_map {
   position: absolute;
-  bottom: 20px;
-  top: 20px;
-  right: 20px;
-  width: 45%;
-  min-height: 398px;
-  max-height: 598px;
+  bottom: $lineheight;
+  top: $lineheight;
+  right: $lineheight;
+  left: $lineheight;
   border: 1px solid #ccc;
 }
 
+#changeset_list_map_wrapper.scrolled #changeset_list_map {
+  margin-left: 93px;
+}
+
 /* Rules for the data browser */
 
 .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;
   }
+  .warning {
+    background-color: #ffe0cc;
+    margin: 0px;
+    padding: 4px 6px;
+    max-width: 100%;
+  }
   h4, p {
-    margin-bottom: 5px;
+    margin-bottom: $lineheight/4;
+  }
+  ul, .bbox, .geo {
+    display: inline-block;
+    vertical-align: top;
+    max-width: 65%;
   }
-  p, ul, .bbox {
-    margin-left: 33.3333%;
+  ul p {
+    margin-left: 0;
+    margin-bottom: 0;
   }
   h4 {
-    width: 33.3333%;
     float: left;
+    width: 33.3333%;
+    display: inline-block;
+    vertical-align: top;
   }
 }
 
@@ -938,7 +1331,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   div {
     width: 33.3333%;
     text-align: center;
-    padding: 5px 0;
+    padding: $lineheight/4 0;
     overflow: hidden;
     text-overflow: ellipsis;
     float: left;
@@ -951,50 +1344,48 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   }
 }
 
-#browse_map .geolink {
-  display: none;
-}
-
 #browse_map .secondary-actions {
-  margin-bottom: 10px;
+  display: none;
+  margin-bottom: $lineheight/2;
 }
 
 /* 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;
-}
 
-#trace_list .trace_summary {
-  font-size: 12px;
-  color: gray;
-}
+  .trace_summary {
+    font-size: 12px;
+    color: gray;
+  }
 
-#trace_list .trace_pending {
-  color: red;
-}
+  .trace_pending {
+    color: red;
+  }
 
-#trace_list .trace_public {
-  color: green;
-}
+  .trace_public {
+    color: green;
+  }
 
-#trace_list .trace_identifiable {
-  color: green;
-}
+  .trace_identifiable {
+    color: green;
+  }
 
-#trace_list .trace_trackable {
-  color: red;
-}
+  .trace_trackable {
+    color: red;
+  }
 
-#trace_list .trace_private {
-  color: red;
+  .trace_private {
+    color: red;
+  }
 }
 
 /* Rules for the user profile page */
 
 #userinformation {
+
   min-height: 100px;
   .userinformation-inner {
     float: left;
@@ -1012,103 +1403,86 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 }
 
 .admin-user-info small {
-  margin-bottom: 10px;
+  margin-bottom: $lineheight/2;
   display: inline;
-  margin-right: 20px;
+  margin-right: $lineheight;
 }
 
 .activity-block {
   clear: left;
   border-bottom: 1px solid #ccc;
-  padding-bottom: 20px;
+  padding-bottom: $lineheight;
   float: left;
   h3 {
-    margin-bottom: 10px;
+    margin-bottom: $lineheight/2;
   }
 }
 
 .contact-activity {
-  margin-top: 20px;
+  margin-top: $lineheight;
   width: 100%;
 }
 
 .activity-details p {
-  margin-left: 72px;
+  margin-left: 70px;
   margin-bottom: 0;
 }
 
 #friends-container .contact-activity ul {
-  margin-left: 72px;
-  }
-
-.user-view p#no_home_location {
-  margin: 20px;
+  margin-left: 70px;
 }
 
-.user-view .user_thumbnail {
-  margin-top: 5px;
-  float: left;
+.user-view {
+  p#no_home_location {
+    margin: $lineheight;
+  }
+  .user_thumbnail {
+    margin-top: $lineheight/4;
+    float: left;
+  }
 }
 
 /* Rules for the user map */
 
 .content_map .leaflet-popup-content {
-  margin: 10px 15px;
-  min-height: 62px;
-}
-
-.content_map .leaflet-popup-content-wrapper {
--webkit-border-radius: 4px;
-  border-radius: 4px;
+  margin: $lineheight/2;
+  min-height: 50px;
 }
 
 /* Rules for user popups on maps */
 
 .user_popup {
   min-width: 200px;
-}
-
-.user_popup p {
-  padding-top: 3px;
-  padding-bottom: 3px;
-  margin-top: 0px;
-  margin-bottom: 0px;
-  margin-left: 55px;
-  margin-right: 2px;
-}
-
-.user_popup img.user_thumbnail {
-  float: left;
-  margin-right: 10px;
-}
-
-/* Rules for user popups on maps */
-
-.user_popup p {
-  margin-bottom: 0;
-  margin-left: 60px;
-  font-size: 12px;
+  p {
+    padding: 0 0 5px 0;
+    margin-top: 0 0 0 60px;
+    font-size: 12px;
+  }
+  img.user_thumbnail {
+    float: left;
+    margin: 0 $lineheight/2 0 0;
+  }
 }
 
 /* Rules for the user list */
 
 #user_list {
-  font-size: 10px;
+  font-size: $lineheight/2;
   width: 100%;
-}
 
-#user_list tr {
-  vertical-align: middle;
-}
+  tr {
+    vertical-align: middle;
+  }
 
-#user_list p {
-  margin-top: 0px;
-  margin-bottom: 0px;
+  p {
+    margin-top: 0px;
+    margin-bottom: 0px;
+  }
 }
 
 #user_list_actions {
   float: right;
-  margin-top: 10px;
+  margin-top: $lineheight/2;
 }
 
 /* Rules for the diary list page */
@@ -1120,8 +1494,8 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 .diary_post {
   max-width: 740px;
   position: relative;
-  margin-top: 20px;
-  padding-top: 20px;
+  margin-top: $lineheight/2;
+  padding-top: $lineheight;
   border-top: 1px solid #ccc;
 
   &:first-child {
@@ -1131,7 +1505,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   }
   h1, h2 {
     font-size: 21px;
-    line-height: 21px;
+    line-height: 1em;
   }
   small.deemphasize {
     float: left;
@@ -1145,10 +1519,10 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 }
 
 #content  .post_heading {
-  margin-bottom: 20px;
+  margin-bottom: $lineheight;
   h2 {
     margin-top: 0;
-    margin-bottom: 10px;
+    margin-bottom: $lineheight/2;
     font-size: 24px;
   }
 }
@@ -1159,30 +1533,30 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   #map {
     position: relative;
     width: 90%;
-    height: 398px;
+    height: 400px;
     border: 1px solid #ccc;
     display: none;
-    margin-bottom: 20px;
+    margin-bottom: $lineheight;
   }
   #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 {
-    margin-top: 10px;
+    margin-top: $lineheight/2;
     border-top: 1px dashed #ccc;
-    padding-top: 10px;
+    padding-top: $lineheight/2;
     &:first-child {
-      margin-top: 20px;
-      padding-top: 20px;
+      margin-top: $lineheight;
+      padding-top: $lineheight;
       border-top: 1px solid #ccc;
     }
     p {
-      margin-bottom: 10px;
+      margin-bottom: $lineheight/2;
     }
     .comment-heading {
       margin-bottom: 0;
@@ -1195,76 +1569,73 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   float: left;
 }
 
-/* Rules for the login page */
+/* Rules for the log in page */
+
+#login_openid_buttons {
+  margin-bottom: 0;
+}
 
 #login_openid_buttons li {
   float: left;
-  padding: 5px 10px;
+  padding: $lineheight/4 $lineheight/2;
 }
 
 /* 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;
-}
+.user-terms {
+  .legale {
+    border: 1px solid #ccc;
+    padding: $lineheight;
+    margin-bottom: $lineheight;
+    overflow: auto;
+    height: 10em;
 
-div#contributorTerms img {
-  display: block;
-  margin: 20px auto inherit auto;
-}
+    &:p#last {
+      margin-bottom: 0px;
+    }
 
-form#termsForm div#buttons {
-  float: right;
-}
+    &:ol {
+      margin-bottom: 0px;
+    }
 
-form#termsForm input#agree {
-  margin-left: 40px;
-}
+    &:img {
+      display: block;
+      margin: $lineheight auto inherit auto;
+    }
+  }
 
-div#slim_content form#termsForm {
-  width: auto;
-}
+  #decline {
+    background: $lightblue;
+    &:hover {
+      background: darken($lightblue, $hovercolor);
+    }
+  }
 
-p#contributorGuidance {
-  background-color: #f4f4ff;
-  border-radius: 3px;
-  -moz-border-radius: 3px;
-  margin-top: 20px;
-  padding: 10px;
+  .form-row {
+    margin: auto;
+    max-width: 370px;
+  }
 }
 
 /* Rules for the account settings page */
 
-#accountForm {
-  margin-top: 20px;
+#accountForm .user_map {
+  position: relative;
+  width: 500px;
+  height: 400px;
+  border: 1px solid #ccc;
 }
 
-#accountForm td {
-  padding-bottom: 10px;
+#accountForm .user_image {
+  margin-bottom: 0;
 }
 
-#accountForm .user_map {
-  position: relative;
-  width: 498px;
-  height: 398px;
-  border: 1px solid #ccc;
+#accountForm #user_image {
+  margin-left: 20px;
 }
 
-.accountImage-options {
-  width: 50%;
-  display: inline-block;
+#accountForm ul.accountImage-options {
+  margin-left: 120px;
 }
 
 .nohome .location {
@@ -1279,41 +1650,61 @@ p#contributorGuidance {
   display: inline !important;
 }
 
-#accountForm input[type=submit] {
-  margin-top: 15px;
-}
-
 .content_map.settings_map {
-  float: none;
   width: 50%;
+  float: none;
 }
 
-/* Rules for message in/out box page */
+/* Rules for the oauth settings page */
+
+.oauth_clients .buttons .oauth-edit {
+  border-radius: 2px 0 0 2px;
+}
+
+.oauth_clients .buttons .oauth-delete {
+  border-radius: 0 2px 2px 0;
+}
+
+/* Rules for messages pages */
 
 .messages {
   width: 100%;
   border: 1px solid #ddd;
-}
 
-.messages tbody tr {
-  border-top: 1px solid #ccc;
-}
+  input[type="submit"] {
+    margin: auto;
+  }
+  tbody tr {
+    border-top: 1px solid #ccc;
+  }
 
-.messages .inbox-row {
-  background: #f8f8ff;
-}
+  .inbox-row {
+    background: #f8f8ff;
+  }
 
-.messages .inbox-row-unread {
-  background:#CBEEA7;
-}
+  .inbox-row-unread {
+    background:#CBEEA7;
+  }
 
-.right {
-  float: right;
-}
+  .right {
+    float: right;
+  }
 
-.messages tr td,
-.messages tr th {
-  padding: 5px;
+  tr td,
+  tr th {
+    padding: $lineheight/4;
+  }
+  p:last-child,
+  h2:last-child,
+  h3:last-child,
+  ol:last-child,
+  ul:last-child {
+    margin-bottom:0;
+  }
+  tr td {
+    height: 30px;
+    border-right: 1px solid $lightgrey;
+  }
 }
 
 .inbox-row .inbox-mark-read {
@@ -1321,33 +1712,48 @@ p#contributorGuidance {
 }
 
 .info-line {
-  margin-bottom: 20px;
-  padding: 5px 0px 4px 0px;
+  margin-bottom: $lineheight;
+  padding: $lineheight/4 0px 4px 0px;
   border-bottom: 1px solid #ccc;
-}
 
-.info-line form,
-.info-line form div {
-  display: inline;
+  form, form div {
+    display: inline;
+  }
 }
 
 .info-line .user_thumbnail_tiny {
   vertical-align: middle;
 }
 
+.inbox-mark-unread,
+.inbox-mark-read,
+.inbox-delete {
+  width: 1%;
+}
+
 .inbox-row-unread .inbox-mark-unread {
   display: none;
 }
 
+.message-read .message-buttons {
+  margin-top: $lineheight;
+  padding-top: $lineheight;
+  border-top: 1px solid $lightgrey;
+}
+
+.message-read .buttons .mark-unread-button {
+  border-radius: 0;
+}
+
 /* Rules for "flash" notice boxes shown at the top of the content area */
 
 .flash {
-    padding: 20px;
+    padding: $lineheight;
   &#error {
     background-color: #ff7070;
   }
   &#warning {
-    background-color: #fff6f0;
+    background-color: #ffe0cc;
   }
   &#notice {
     background-color: #CBEEA7;
@@ -1359,7 +1765,17 @@ p#contributorGuidance {
 .field_with_errors {
   padding: 2px;
   background-color: #ff7070;
-  display: table;
+  display: inline-block;
+}
+
+.formError {
+  display: inline-block;
+  padding: 5px 10px;
+  margin-top: 5px;
+  border-radius: 4px;
+  font-size: 12px;
+  color: #fff;
+  background-color: #ff7070;
 }
 
 /* Rules for rails validation error boxes */
@@ -1367,52 +1783,92 @@ p#contributorGuidance {
 #errorExplanation {
   width: 400px;
   border: 2px solid #ff7070;
-  padding: 10px;
-  margin-bottom: 20px;
+  padding: 0 $lineheight/2;
+  margin-bottom: $lineheight;
   background-color: #f0f0f0;
-}
 
-#errorExplanation h2 {
-  margin: -10px;
-  padding: 5px 5px 5px 15px;
-  font-weight: bold;
-  font-size: 12px;
-  background-color: #c00;
-  color: #fff;
-  text-align: left;
-}
+  h2 {
+    margin: 0 -10px 10px -10px;
+    padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;
+    font-weight: bold;
+    font-size: 12px;
+    background-color: #c00;
+    color: #fff;
+    text-align: left;
+  }
 
-#errorExplanation p {
-  color: #333;
-  margin-bottom: 0px;
-  padding: 5px;
-}
+  p {
+    color: #333;
+    margin-bottom: 0px;
+    padding: $lineheight/4;
+  }
 
-#errorExplanation ul li {
-  font-size: 12px;
-  list-style: disc;
+  ul {
+    padding-left: $lineheight;
+
+    li {
+      font-size: 12px;
+      list-style: disc;
+    }
+  }
 }
 
 /* Rules for forms */
 
-.submitButton {
-  text-align: center;
-}
-
-.fieldName {
-  vertical-align: top;
-  font-weight: bold;
-  font-size: 12px;
-  line-height: 20px;
-  text-align: right;
+.standard-form {
+  fieldset {
+    margin-bottom: $lineheight;
+  }
+  label.standard-label {
+    display: block;
+    margin-bottom: $lineheight/4;
+    font-size: $typeheight;
+    font-weight: bold;
+    line-height: 1.5;
+  }
+  label.standard-label.secondary {
+    display: inline-block;
+    font-weight: normal;
+  }
+  .form-help {
+    font-weight: normal;
+  }
+  .form-column {
+    float: left;
+    margin-right: 20px;
+  }
+  .form-divider {
+    margin-top: $lineheight;
+    padding-top: $lineheight;
+    border-top: 1px solid $lightgrey;
+  }
+  .horizontal-list .form-row { 
+    float: left;
+    padding-right: 10px;
+  }
+  .form-row {
+    margin-bottom: $lineheight/2;
+  }
+  .form-list {
+    margin-bottom: 0;
+  }
+  .form-list li {
+    margin-bottom: 5px;
+   }
+  input[type="checkbox"],
+  input[type="radio"] {
+    float: left;
+    margin-top: 5px;
+  }
 }
 
-.submitButton {
-  text-align: right;
+#remember_me_openid {
+  display: block;
 }
 
-.minorNote {
-  font-size: 12px;
+input[type="checkbox"],
+input[type="radio"] {
+    margin-right: 5px;
 }
 
 input[type="text"],
@@ -1421,6 +1877,14 @@ input[type="url"],
 input[type="password"],
 textarea {
   border: 1px solid #ccc;
+  padding: 2px 5px;
+  margin: 0;
+  width: 200px;
+}
+
+textarea {
+  padding: 5px;
+  width: 100%;
 }
 
 /* Rules for user images */
@@ -1429,21 +1893,21 @@ img.user_image {
   max-width: 100px;
   max-height: 100px;
   border: 1px solid #ccc;
-  margin-bottom: 20px;
+  margin-bottom: $lineheight;
   float: left;
-  margin-right: 20px;
+  margin-right: $lineheight;
 }
 
 img.user_thumbnail {
   max-width: 50px;
   max-height: 50px;
   border: 1px solid #ccc;
-  margin-right: 20px;
+  margin-right: $lineheight;
 }
 
 img.user_thumbnail_tiny {
-  max-width: 24px;
-  max-height: 24px;
+  max-width: 25px;
+  max-height: 25px;
   border: 1px solid #ccc;
 }
 
@@ -1463,7 +1927,7 @@ abbr.geo {
 
 .rsssmall {
   position: relative;
-  top: 4px;
+  top: 5px;
 }
 
 /* General styles for action lists / subnavs / pager navs */
@@ -1474,56 +1938,125 @@ ul.secondary-actions {
   margin-left: 0;
   &.pager {
     display: inline-block;
-    margin-bottom: 20px;
     margin-right: 60px;
   }
-  li {
+  > li {
     display: block;
     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;
     }
+    &:last-child {
+      margin-right: 0px;
+    }
+  }
+  .dropdown-menu {
+    left: auto;
+    right: 0;
   }
 }
 
 /* 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;}
+.inner11 { padding: $lineheight/2;}
+
+.inner20 { padding: $lineheight 0;}
+
+.inner02 { padding: 0 $lineheight;}
 
 /* Utility for general button styles */
 
+input[type="button"],
+input[type="submit"],
+input[type="reset"],
 a.button {
-  display: block;
-  padding: 5px;
+  cursor: pointer;
+  border: 0;
+  display: inline-block;
+  line-height: 20px;
+  padding: $lineheight/4 $lineheight/2;
+  min-height: 20px + $lineheight/2;
   min-width: 120px;
-  margin-bottom: 10px;
+  margin: 0 0 $lineheight/2 0;
   color: white;
-  background: #7092FF;
+  background: $blue;
   text-align: center;
   border-radius: 2px;
   -moz-border-radius: 2px;
   &:hover {
-    background: blue;
+    background: darken($blue, $hovercolor);
     text-decoration: none;
   }
+  &.deemphasize {
+    background: $lightblue;
+    &:hover {
+      background: darken($lightblue, $hovercolor);
+    }
+  }
+  &:disabled {
+    background: $lightgrey;
+    &:hover {
+      background: $lightgrey;
+    }
+  }
   &:last-child {
     margin-bottom: 0;
   }
 }
 
-a.button.submit {
-  background-color: #cbeea7;
-  &:hover {
-    background-color: #9ed485;
+.buttons {
+  min-width: 200px;
+  input[type="submit"],
+  input[type="button"],
+  input[type="reset"],
+  .button {
+    box-sizing: border-box;
+    float: left;
+    border-radius: 0;
+    margin:0;
+    min-width: 100px;
+    max-width: 180px;
+    border-right:1px solid white;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+  }
+  input:first-child,
+  .button:first-child {
+    border-radius:2px 0 0 2px;
+  }
+  input:last-child,
+  .button:last-child {
+    border-radius:0 2px 2px 0;
+    border-right-width: 0;
+  }
+  input:only-child,
+  .button:only-child,
+  *[value="Hide"] + input:last-child,
+  *[value="Hide"] + .button:last-child {
+    border-radius:2px;
+    border-right-width: 0;
+  }
+    /* if a 3-button set has a hidden middle button */
+  *[value="Hide"] + input:nth-child(3),
+  *[value="Hide"] + .button:nth-child(3) {
+    border-radius:0 2px 2px 0;
+    border-right-width: 0;
+  }
+  /* if a 3-button set starts with a hidden button */
+  *[value="Hide"] + input:nth-child(2):not(:last-child),
+  *[value="Hide"] + .button:nth-child(2):not(:last-child) {
+    border-radius:2px 0 0 2px;
+    border-right-width: 1px solid white;
   }
 }
 
@@ -1531,7 +2064,7 @@ a.button.submit {
 
 .table0,
 .item0 {
-  background: #F4F4FF;
+  background: $offwhite;
 }
 
 .table1,
@@ -1548,11 +2081,12 @@ a.button.submit {
 
 /* Rules for rich text */
 
-.richtext {
+.richtext,
+.prose {
   h1, h2 {
-    padding-bottom: 10px;
+    padding-bottom: $lineheight/2;
     border-bottom: 1px dashed #cccccc;
-    margin-bottom: 10px;
+    margin-bottom: $lineheight/2;
   }
 
   h1 {
@@ -1564,31 +2098,44 @@ a.button.submit {
   }
 
   h3 {
-    font-size: 14px;
+    font-size: $typeheight;
+  }
+
+  code {
+    font-size: 13px;
+    background: #e8e8e8;
+    padding: 2px 3px;
+  }
+
+  pre {
+    font-size: 13px;
+    background: #e8e8e8;
+    padding: 2px 3px;
+
+    code {
+      padding: 0;
+    }
   }
 
   img {
-    padding: 20px;
-    background-color: #f4f4ff;
+    padding: $lineheight;
+    background-color: $offwhite;
     display: block;
     max-width: 100%;
     margin: auto;
-    box-sizing: border-box;
-    -moz-box-sizing: border-box;
   }
 
   blockquote {
-    border-left: 20px solid #f4f4ff;
-    padding-left: 20px;
+    border-left: $lineheight solid $offwhite;
+    padding-left: $lineheight;
     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 {
@@ -1601,7 +2148,7 @@ a.button.submit {
 }
 
 .diary_post .richtext {
-    margin-top: 20px;
+    margin-top: $lineheight;
   }
 
 .comments .richtext {
@@ -1612,17 +2159,18 @@ a.button.submit {
 /* Rules for rich text editors */
 
 .richtext_container {
-  white-space: nowrap;
+  margin-bottom: $lineheight;
 
   .richtext_content {
+    width: 50%;
     display: inline-block;
     vertical-align: top;
-    white-space: normal;
 
     .richtext_preview {
       display: inline-block;
-      padding: 20px;
-      background-color: #f4f4ff;
+      padding: $lineheight;
+      background-color: $offwhite;
+      overflow-x: auto;
 
       &.loading {
         background-image: image-url("loading.gif");
@@ -1641,8 +2189,8 @@ a.button.submit {
     vertical-align: top;
     margin-left: 15px;
     background-color: #f8f8ff;
-    padding: 10px;
-    width: 200px;
+    padding: $lineheight/2;
+    width: 220px;
 
     ul {
       margin-bottom: 0;
@@ -1650,29 +2198,357 @@ a.button.submit {
 
     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 {
-      display: block;
+    li h4, li span, li p {
+      display: inline-block;
+      vertical-align: top;
       font-size: 11px;
     }
 
     li h4 {
+      width: 40%;
       margin: 0;
-      float: left;
     }
 
-    li span {
-      float: right;
+    li span, li p {
       width: 50%;
-      margin-left: 10px;
+      margin-left: $lineheight/2;
+      margin-bottom: $lineheight/4;
+      white-space: nowrap;
     }
+  }
+}
 
-    input.richtext_doedit,
-    input.richtext_dopreview {
-      margin-right: 10px;
+/* Rules for the user notes list */
+
+.note_list {
+  tr.creator {
+    background-color: #eeeeee;
+  }
+
+  td {
+    padding: 3px;
+  }
+
+  p {
+    margin-bottom: 0px;
+  }
+}
+
+/* Rules for the notes interface */
+
+.leaflet-popup-content .note {
+  padding-top: $lineheight/2;
+}
+
+.leaflet-popup-content .note {
+  h2 {
+    margin-bottom: $lineheight/2;
+  }
+
+  div {
+    margin-top: $lineheight/2;
+  }
+
+  .permalink {
+    position: absolute;
+    top: $lineheight/4;
+    left: $lineheight/4;
+    min-width: 15px;
+    min-height: 15px;
+  }
+
+  .permalink span {
+    display: none;
+    padding-left: $lineheight;
+  }
+
+  .permalink:hover span {
+    display: block;
+  }
+
+  .warning {
+    display: block;
+    background-color: #ffe0cc;
+    padding: 4px 6px;
+    margin-bottom: $lineheight/2;
+  }
+
+  .comment_body {
+    margin-top: 2px;
+    margin-bottom: 2px;
+
+    p {
+      margin-top: 0px;
+      margin-bottom: 0px;
+    }
+  }
+
+  .comment {
+    width: 100%;
+    height: 100px;
+  }
+
+  .buttons {
+    margin-top: $lineheight/4;
+    text-align: right;
+  }
+}
+
+/*
+ * Rules for the iD editor
+ */
+
+.site-edit-id {
+  #left,
+  #large-title {
+    display: none;
+  }
+
+  #small-title {
+    display: inline-block;
+    width: 185px;
+    height: 30px;
+    font-size: 14px;
+    margin: 0;
+    background-color: #eee;
+    border-bottom: 1px solid #ccc;
+    text-align: center;
+    padding-top: 7px;
+  }
+
+  #content {
+    left: 0;
+  }
+}
+
+.id-embed {
+  width: 100%;
+  height: 100%;
+}
+
+/* Rules for rotating sidebar ads */
+.ad-container {
+  display: block;
+  height: 120px;
+  overflow: hidden;
+  position: relative;
+  border-bottom: 1px solid #ccc;
+}
+
+.ad {
+  height: 100px;
+  border: 0;
+  background: #fff;
+}
+
+/* Rules for dropdown menus */
+
+.dropdown {
+  position: relative;
+}
+
+.dropdown-toggle {
+  *margin-bottom: -3px;
+}
+
+.dropdown-toggle:active,
+.open .dropdown-toggle {
+  outline: 0;
+}
+
+.caret {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  vertical-align: top;
+  border-top: 4px solid #000000;
+  border-right: 4px solid transparent;
+  border-left: 4px solid transparent;
+  content: "";
+}
+
+.dropdown .caret {
+  margin-top: 8px;
+  margin-left: 2px;
+}
+
+.dropdown-menu {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  z-index: 1000;
+  display: none;
+  float: left;
+  min-width: 160px;
+  padding: 5px 0;
+  margin: 0;
+  list-style: none;
+  background-color: #ffffff;
+  border: 1px solid #ccc;
+  *border-right-width: 2px;
+  *border-bottom-width: 2px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding;
+          background-clip: padding-box;
+}
+
+.dropdown-menu.pull-right {
+  right: 0;
+  left: auto;
+}
+
+.dropdown-menu .divider {
+  *width: 100%;
+  height: 1px;
+  margin: 9px 1px;
+  *margin: -5px 0 5px;
+  overflow: hidden;
+  background-color: #e5e5e5;
+  border-bottom: 1px solid #ffffff;
+}
+
+.dropdown-menu > li > a {
+  display: block;
+  padding: 3px 10px;
+  clear: both;
+  font-weight: normal;
+  line-height: 20px;
+  color: #333333;
+  white-space: nowrap;
+}
+
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus,
+.dropdown-submenu:hover > a,
+.dropdown-submenu:focus > a {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: #0081c2;
+}
+
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: #0081c2;
+  outline: 0;
+}
+
+.dropdown-menu > .disabled > a,
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  color: #999999;
+}
+
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  text-decoration: none;
+  cursor: default;
+  background-color: transparent;
+  background-image: none;
+}
+
+.open {
+  *z-index: 1000;
+}
+
+.open > .dropdown-menu {
+  display: block;
+}
+
+.dropdown-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 990;
+}
+
+/* Rules for the "Welcome" page */
+.site-welcome {
+  .center {
+    text-align: center;
+    .sprite { 
+      float: none;
+      margin: auto;
+    }
+  }
+
+  .sprite {
+    background-image: image-url("welcome-sprite.png");
+    background-size: 500px 250px;
+    display: block;
+    float: left;
+  }
+
+  .icon-list { 
+    padding-bottom: 20px;
+    div {
+      margin-bottom: 10px;
+      p {
+        padding-top: 10px;
+      }
     }
   }
+  .sprite.small {
+    width: 50px;
+    height: 50px;
+  }
+
+  .sprite.x {
+    background-position: -50px 0;
+  }
+
+  .sprite.term {
+    margin-right: 10px;
+    vertical-align: middle;
+  }
+
+  .sprite.node {
+    background-position: -100px 0;
+  }
+
+  .sprite.way {
+    background-position: -150px 0;
+  }
+
+  .sprite.tag {
+    background-position: -200px 0;
+  }
+
+  .sprite.editor {
+    background-position: -250px 0;
+  }
+
+  .sprite.question {
+    background-position: -300px 0;
+  }
+
+  .start-mapping {
+    margin: auto;
+    cursor: pointer;
+    border: none;
+    padding: 20px 40px;
+    font-size: 30px;
+    text-decoration: none;
+  }
+
+  .note-box {
+    margin-top: 20px;
+    background-color: $offwhite;
+  }
+
+  .icon.note {
+    background-color: #333;
+    border-radius: 4px;
+  }
 }