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

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 9071fa32b..628096b9f 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1,8 +1,10 @@
+@import "parameters";
+
 /* 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,13 +29,17 @@ 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;
   cursor: help;
 }
 
+strong {
+  font-weight: bold;
+}
+
 /* Micro Clearfix | Details: http://nicolasgallagher.com/micro-clearfix-hack/ */
 
 .clearfix:before,
@@ -46,60 +52,73 @@ 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;
+     -moz-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;
   margin: 0px;
   padding: 0px;
   text-align: left;
-}
-
-body.slim {
-  background-color: #f0f0f0;
+  height: 100%;
 }
 
 h1, h2, h3 {
-  margin-top: 10px;
-  margin-bottom: 20px;
-  font-weight: bold;
+  font-weight: 600;
   line-height: 1.2;
 }
 
-h1, h2 {
-  font-size: 32px;
-}
-
-#content h2 {
-  font-size: 21px;
-}
-
-h3 {
-  font-size: 21px;
-  margin-top: 10px;
-  margin-bottom: 20px;
+h4, h5 {
+  font-weight: 500;
 }
 
-h4,h5,h6 {
-  font-size: 14px;
-  margin-top: 10px;
-  margin-bottom: 20px;
-  font-weight: bold;
-  line-height: 1.5;
+h1 {
+  font-size: 18px;
 }
 
-p, ul {
-  margin-bottom: 20px;
+h2, h3 {
+  font-size: 16px;
 }
 
 p > img {
@@ -111,30 +130,56 @@ small, aside {
   font-size: 12px;
 }
 
-h1:first-child,
-h2:first-child,
-h3:first-child,
-h4:first-child,
-h5:first-child,
-h6:first-child {
-  margin-top: 0;
-}
+#container { position: relative; }
 
 .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;
+}
+
+.red { color: $red; }
+
+/* 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.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.close:hover { background-position: -200px -20px; }
+.icon.check       { background-position: -220px 0; }
+.icon.note        { background-position: -240px 0; }
+.icon.query       { background-position: -260px 0; }
 
 /* Rules for links */
 
 a {
-  color: #00f;
+  color: #24d;
   text-decoration: none;
+  -webkit-appearance: none;
+  outline: 0;
   &:hover {
     text-decoration: underline;
   }
@@ -153,14 +198,14 @@ 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;
+    font-weight: 600;
     vertical-align: top;
   }
   td {
@@ -168,425 +213,644 @@ table {
   }
 }
 
-/* Rules for the whole left sidebar, including the logo */
+/* Utility for de-emphasizing content */
 
-#left {
-  position: absolute;
-  height: 100%;
-  width: 185px;
-  font-size: 11px;
-  line-height: 1.1;
-  z-index: 100;
-  border-right: 1px solid #ccc;
+.deemphasize {
+  color: #999;
+  a {
+    color: $blue;
+  }
 }
 
-/* Rules for the OpenStreetMap logo in the top left corner */
+/* Rules for the header */
 
-#logo {
+#menu-icon { 
+  display: none !important;
+  float: right;
+  background: image-url("menu-icon.png") no-repeat;
+  background-size: 30px 30px;
   display: block;
-  width: 170px;
-  min-width: 170px;
-  padding: 20px 5px;
-  text-align: center;
-  margin: auto;
+  width: 30px;
+  height: 30px;
+  margin: 14px 10px 0 0;
+  opacity: 0.6;
 }
 
-#logo h1 {
-  font-size: 18px;
-  line-height: 1.1;
-  text-align: center;
-  margin: 0px;
-}
+header {
+  height: $headerHeight;
+  position: relative;
+  z-index: 1001;
+  font-size: 14px;
 
-#logo h2 {
-  font-size: 10px;
-  line-height: 15px;
-  margin: 0px;
-}
+  h1, nav, nav > ul, nav > ul > li, .dropdown {
+    display: inline-block;
+  }
 
-/* Rules for the site name */
+  > * {
+    height: 100%;
+    padding: $lineheight/2;
+  }
 
-#small-title {
-  display: none;
-}
+  h1, nav.primary {
+    float: left;
+  }
 
-/* Rules for the introductory text displayed in the left sidebar to new users */
+  a, a:hover {
+    text-decoration: none;
+  }
 
-.sidebar-copy {
-  padding: 5px 10px;
-}
+  img.logo {
+    width: 30px;
+    height: 30px;
+    margin-top: -2px;
+    vertical-align: middle;
+  }
 
-.sidebar-copy p {
-  margin: 5px 0;
-}
+  h1 {
+    margin: 0;
+    padding-top: 15px;
 
-.sidebar-copy.intro {
-  margin-top: -1px;
-  border-top: 1px solid #ccc;
+    a {
+      color: #000;
+    }
+  }
 }
 
-/*
- * Rules for alert boxes shown in the left sidebar when important
- * information needs to be conveyed such as when the site is
- * undergoing maintenance.
- */
+nav.primary {
+  > ul {
+    $border: 1px solid $green;
 
-.sidebar-alert {
-  padding: 5px;
-  border-top: 1px solid #ccc;
-  margin-top: 4px;
-  margin-bottom: -4px;
-  background: #e00;
-  font-size: 12px;
-  font-weight: bold;
-  p {
-    margin: 5px;
+    border: $border;
+    border-radius: $border-radius;
+
+    > li {
+      border-right: $border;
+      float: left;
+      &:last-child { 
+        border-right: 0;
+      }
+      > a:hover { background: lighten($green, 30%); }
+      &.current > a:hover { background: $green; }
+      &.disabled > a:hover { background: lighten($green, 38%); }
+      &.dropdown {
+        > a.tab { border-right: 1px solid lighten($green, 30%); }
+        &.current > a.tab { border-right: 1px solid lighten($green, 10%); }
+      }
+    }
   }
-}
 
-/*
- * Rules for notice boxes shown in the left sidebar when important, but
- * non-critical information needs to be conveyed such as notices about
- * donation drives.
- */
+  a.tab,
+  .dropdown-toggle {
+    display: inline-block;
+    font-weight: 500;
+    color: $green;
+    padding: 5px 15px;
+  }
 
-.sidebar-notice {
-  padding: 5px;
-  border-top: 1px solid #ccc;
-  margin-top: 4px;
-  margin-bottom: -4px;
-  background: #ea0;
-  font-size: 12px;
-  p {
-    margin: 5px;
+  .dropdown-toggle {
+    padding: 5px 6px;
   }
-}
 
-/* Rules for the menu displayed in the left sidebar */
+  .caret {
+    border-top-color: $green;
+    margin-top: 10px;
+  }
 
-.left_menu {
-  left: 0px;
-  margin: 0;
-  padding: 5px 10px;
-  font-size: 12px;
-  line-height: 1.25;
-  list-style-type: none;
-  border-bottom: 1px solid #ccc;
-  border-top: 1px solid #ccc;
-}
+  .disabled a {
+    color: #ccc;
+    cursor: default;
 
-.left_menu img {
-  margin: 10px 0px;
-}
+    .caret {
+      border-top-color: #ccc;
+    }
+  }
 
-.left_menu ul {
-  padding: 0;
-  margin: 0;
-}
+  > ul li.current {
+    background-color: $green;
 
-.left_menu li {
-  list-style-type: none;
-  padding: 0;
-  margin: 0;
-}
+    .tab {
+      color: #fff;
+    }
 
-.left_menu h4 {
-  padding: 5px 0 5px 0;
-  font-size: 12px;
-  margin: 0;
+    .caret {
+      border-top-color: #fff;
+    }
+  }
 }
 
-.left_menu li:last-child h4 {
-  padding-top: 0;
-}
+nav.secondary {
+  position: absolute;
+  right: 0;
 
-/* Rules for SOTM advert */
+  > ul {
+    vertical-align: middle;
+    a, .dropdown-toggle {
+      display: inline-block;
+      text-decoration: none;
+      color: $darkgrey;
+      padding: 5px;
 
-#sotm {
-  width: 165px;
-  margin: 10px;
-  padding: 0px;
-  border: 0px;
-  background: #fff;
-}
+      &:hover { color: darken($darkgrey, 25%); }
+    }
+  }
 
-#sotm img {
-  width: 165px;
-}
+  > ul li.current a {
+    color: darken($darkgrey, 25%);
+  }
 
-/*
- * Rules for "optional boxes" which appear in the left sidebar on
- * certain pages. Current users are the seach box on the main page
- * and the tag cloud on the traces pages.
- */
+  .user-menu {
+    $border: 1px solid $grey;
+    border: $border;
+    border-radius: $border-radius;
+    margin-left: 10px;
 
-.optionalbox {
-  left: 0px;
-  padding: 5px 10px;
-  margin: 5px 0;
-  text-align: left;
-}
+    > li {
+      border-right: $border;
+      float: left;
+      &:last-child { 
+        border-right: 0;
 
-/* Rules for the search box */
+        > a {
+          border-radius: 0 $border-radius $border-radius 0;
+        } 
+      }
+      &:first-child > a { border-radius: $border-radius 0 0 $border-radius; }
+      &:hover a { background: lighten($darkgrey, 30%); }
+    }
 
-#search_field form {
-  width: 165px;
-}
+    a {
+      padding: 5px 15px;
 
-#search_field {
-  position: relative;
-}
+    }
 
-#search_field input[type="text"] {
-  width: 165px;
-  padding: 3px;
-  font-size: 14px;
-  line-height: 1.1;
-  height: 25px;
-  padding: 2px 0px 2px 5px;
-  box-shadow: inset #DDD 0px 1px 3px;
-}
+    &.logged-in > a {
+      padding: 0;
+      > .user-button {
+        line-height: 1.8;
+        padding: 5px 10px 3px 6px;
+        display: inline-block;
+        color: $darkgrey;
+      }
+      &:hover > .user-button { color: darken($darkgrey, 5%); }
+    }
+  }
 
-#search_field input[type="text"]:focus {
-  outline: none;
-  border: 1px solid #000;
-}
+  .caret {
+    border-top-color: $grey;
+    margin-top: 9px;
+  }
 
-#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;
-}
+  img.user_thumbnail_tiny {
+    border: 0;
+    vertical-align: top;
+    margin-top: 0px;
+    margin: 4px 0 0 4px;
+    border-radius: 2px;
+  }
 
-.search_help {
-  margin: 5px 0 0 0;
-}
+  #inboxanchor {
+    display: inline-block;
+    vertical-align: top;
+    height: 25px;
+    margin: 3px 0 3px 3px;
+    background-color: lighten($grey, 10%);
+    line-height: 20px;
+    border-radius: 2;
+  }
 
-/* Utility for de-emphasizing content */
+  .dropdown-menu {
+    left: auto;
+    right: -1px;
+    border-radius: 3px 0 3px 3px;
 
-.deemphasize {
-  color: #999;
-  a {
-    color: #7092FF;
+    .count-number {
+      float: right;
+      padding: 0 5px;
+      margin: 0;
+    }
   }
 }
 
-/* Rules for donation request box */
-
-.donate {
-  display: block;
-  width: 164px;
-  padding: 5px;
-  border: 1px solid #AED1A0;
-  background: #cbeea7;
-  font-size: 14px;
-  line-height: 1.4;
-  text-align: center;
-  border-radius: 2px;
-  color: #222;
-  margin: 10px 10px 0px 10px;
+#compact-secondary-nav {
+  display: none;
+  ul li a {
+    width: 100%;
+    color: #333;
+    &:hover { color: #fff; }
+  }
+}
 
-  &:hover {
-    background: #9ed485;
-    text-decoration: none;
+@media only screen and (max-width:960px) {
+  #compact-secondary-nav {
+    display: inline-block;
   }
-  span {
-    margin: 0;
-    padding-left: 18px;
-    background: image-url("sprite.png") 0 -29px no-repeat;
+  .compact-hide {
+    display: none;
   }
 }
 
-/* Rules for Creative Commons logo button */
+/* Utility for styling notification numbers */
 
-#cclogo {
-  margin: 10px 0;
-  float: right;
+.count-number {
+  padding: 2px $lineheight/4;
+  border-radius: 2px;
+  background: lighten($green, 30%);
+  margin: 0 2px;
+  font-size: 11px;
+  color: #333;
 }
 
-/* Rules for tabbed navigation bar */
+/* Rules for the message shown in place of the map when javascript is disabled */
 
-#top-bar {
-  position: relative;
-  margin-left: 185px;
-  height: 30px;
-  border-bottom: 1px solid #ccc;
-  background: white;
-  z-index: 100;
+#noscript {
+  z-index: 20000000;
+  position: absolute;
+  top: 15px;
+  left: 15px;
 }
 
-.site-edit #top-bar,
-.site-index #top-bar,
-.site-export #top-bar {
-  position: fixed;
-  left: 0;
-  right: 0;
-}
+/* Rules for bootstrap tooltips */
 
-#tabnav {
-  height: 30px;
-  margin-bottom:0;
-  overflow: hidden;
+.tooltip {
+  position: absolute;
+  display: none;
+  color: #333;
+  text-align: left;
+  font-size: 12px;
+  max-width: 250px;
 }
 
-#tabnav li {
-  display: inline;
+.tooltip.in {
+  opacity: 0.8;
+  z-index: 1030;
+  height: auto;
+  display: block;
 }
 
-#tabnav a, #tabnav a:link, #tabnav a:visited {
-  float: left;
-  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;
+.tooltip.top {
+  margin-top: -10px;
+  text-align: center;
 }
 
-.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;
+.tooltip.right {
+  margin-left: 10px;
 }
 
-#tabnav a:link:hover, #tabnav a:visited:hover {
-  text-decoration: underline;
+.tooltip.bottom {
+  margin-top: 10px;
+  text-align: center;
 }
 
-#tabnav a:link.disabled,
-#tabnav a:visited.disabled,
-#tabnav a:link:hover.disabled,
-#tabnav a:visited:hover.disabled {
-  color: #ccc;
-  cursor: default;
+.tooltip.left {
+  margin-left: -10px;
+  text-align: right;
 }
 
-#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;
+.tooltip-inner {
+  display: inline-block;
+  padding: 10px;
+  font-weight: normal;
+  background-color: white;
 }
 
-/* Utility for styling notification numbers */
-
-.count-number {
-  padding: 2px 5px;
-  border-radius: 3px;
-  background: #d7d7ff;
-  margin: 0 2px;
-  font-size: 11px;
-  color: #333;
+.tooltip-arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
 }
 
-/* Rules for greeting bar in the top right corner */
-
-#greeting {
-  float: right;
-  padding-top: 3px;
-  margin-right: 5px;
+.tooltip.top .tooltip-arrow {
+  bottom: -5px;
+  left: 50%;
+  margin-left: -5px;
+  border-top-color: white;
+  border-width: 5px 5px 0;
 }
 
-.greeting-bar-unread {
-  font-weight: bold;
+.tooltip.right .tooltip-arrow {
+  top: 50%;
+  left: -5px;
+  margin-top: -5px;
+  border-right-color: white;
+  border-width: 5px 5px 5px 0;
 }
 
-/* Rules for the message shown in place of the map when javascript is disabled */
+.tooltip.left .tooltip-arrow {
+  top: 50%;
+  right: -5px;
+  margin-top: -5px;
+  border-left-color: white;
+  border-width: 5px 0 5px 5px;
+}
 
-#noscript {
-  z-index: 20000000;
-  position: absolute;
-  top: 15px;
-  left: 15px;
+.tooltip.bottom .tooltip-arrow {
+  top: -5px;
+  left: 50%;
+  margin-left: -5px;
+  border-bottom-color: white;
+  border-width: 0 5px 5px;
 }
 
 /* Rules for Leaflet maps */
 
-.leaflet-control-attribution {
-  a.disabled {
-    color: #99c9dc;
-    cursor: default;
-    text-decoration: none;
+.leaflet-control .control-button {
+  display: block;
+  height: 40px;
+  width: 40px;
+  background-color: #333;
+  background-color: rgba(0,0,0,.6);
+  border-radius: 4px 0 0 4px;
+  margin-bottom: 10px;
+  outline: none;
+
+  &:hover {
+    background-color: black;
   }
 
-  ul.secondary-actions {
-    float: left;
-    margin-right: 5px;
+  &.active {
+    background-color: #9ed485;
+  }
 
-    &:only-child {
-      margin-right: 0px;
-    }
+  &.disabled {
+    background-color: #333;
+    background-color: rgba(0,0,0,.5);
+    cursor: default;
   }
-}
 
-.site-index .leaflet-top,
-.site-export .leaflet-top {
-  top: 10px !important;
-  .leaflet-control {
-    margin-top: 0px !important;
+  .icon {
+    margin: 10px;
   }
 }
 
-.site-index #map .olControlScaleLine,
-.site-export #map .olControlScaleLine {
-  left: 10px !important;
+.leaflet-control .zoomin,
+.control-layers .control-button {
+  margin-bottom: 0px;
+  border-radius: 4px 0 0 0;
 }
 
-.leaflet-popup-scrolled {
-  padding-right: 20px;
-  border-bottom: 0px !important;
-  border-top: 0px !important;
+.leaflet-control .zoomout,
+.control-key .control-button {
+  margin-bottom: 0;
+  border-radius: 0;
 }
 
-.leaflet-popup-content-wrapper {
-  border-radius: 4px !important;
-  -webkit-border-radius: 4px !important;
+.control-locate .control-button,
+.control-share .control-button {
+  border-radius: 0 0 0 4px;
 }
 
-/* Rules for edit menu */
+/* Rules for the sidebar and main map area */
 
-.menuicon {
-  padding: 0 5px;
-  font-weight: normal;
-  display: inline-block;
-  &:hover {
-    text-decoration: none !important;
+.map-layout {
+  #content {
+    overflow: hidden;
+    position: absolute;
+    top: $headerHeight;
+    bottom: 0;
+    width: 100%;
+  }
+
+  #sidebar, #map {
+    position: relative;
+    height: 100%;
+    overflow-x: hidden;
+    overflow-y: auto;
+  }
+
+  #sidebar {
+    float: left;
+    width: $sidebarWidth;
+    background: #fff;
+    font-size: 12px;
+
+    h2 {
+      padding: $lineheight $lineheight $lineheight/2;
+    }
+
+    h3, h4 {
+      margin-top: $lineheight;
+      margin-bottom: $lineheight/2;
+      font-size: 13px;
+    }
+
+    .icon.close {
+      float: right;
+      cursor: pointer;
+    }
+  }
+
+  .welcome {
+    display: none;
+  }
+
+  .overlay-sidebar #sidebar {
+    position: absolute;
+    z-index: 1000;
+    height: auto;
+    border-bottom-right-radius: 5px;
+    overflow: hidden;
+    .welcome {
+      display: block;
+    }
+    #sidebar_content {
+      display: none;
+    }
+  }
+
+  .welcome {
+    p {
+      padding: $lineheight/2 $lineheight $lineheight;
+      font-size: 110%;
+      font-weight: 300;
+    }
+
+    .button {
+      width: 50%;
+      float: left;
+      margin: 0;
+      border-radius: 0;
+      font-weight: normal;
+      padding: .6em;
+
+      &.learn-more {
+        border-right: 1px solid #fff;
+      }
+    }
+  }
+
+  #map {
+    height: 100%;
+    overflow: hidden;
+
+    &.query-active {
+      cursor: help;
+    }
+  }
+
+  #map-ui {
+    display: none;
+    position: relative;
+    float: right;
+    width: 250px;
+    height: 100%;
+    background: white;
+    overflow: auto;
+
+    .section {
+      border-bottom: 1px solid #DDD;
+      padding: 10px 20px;
+    }
+
+    a.close-button {
+      float: right;
+      padding:5px;
+      font-size:20px;
+      line-height:10px;
+      color:#222;
+      border:1px solid #ddd;
+    }
+
+    .tooltip {
+      opacity: 1;
+      border: 1px solid #ccc;
+      .tooltip-arrow {
+        border-top-color: #ccc;
+      }
+    }
   }
 }
 
-.menu {
-  display: none;
-  z-index: 10000;
-  position: absolute;
-  background-color: #ffffff;
-  border: 1px solid #cccccc;
-  border-top: 0px;
+.layers-ui,
+.share-ui {
+  li:last-child {
+    margin-bottom: 0;
+  }
 }
 
-.menu ul {
-  margin: 0px;
+.layers-ui {
+  .base-layers {
+    .leaflet-container {
+      width: 100%;
+      height: 50px;
+      cursor: pointer;
+    }
+
+    li  {
+      overflow: hidden;
+      border-radius: 3px;
+      border: 2px solid #fff;
+      margin-bottom: 8px;
+      position: relative;
+      transition: border-color 0.08s ease-in;
+      
+      label {
+        position: absolute;
+        top: 0;
+        left: 0;
+        padding: 2px 6px;
+        border-bottom-right-radius: 3px;
+        cursor: pointer;
+        font-weight: 600;
+        font-size: 16px;
+        text-stroke: 2px #fff;
+        background: rgba(255,255,255,.9);
+        z-index: 2; // For IE9
+        input[type="radio"] {
+          display: none;
+        }
+      }
+
+      &.active { border-color: darken($green, 10%); }
+      &:hover {
+        border-color: $grey;
+        &.active { border-color: darken($green, 20%); }
+      }
+    }
+  }
+
+  .overlay-layers {
+    p {
+      font-size: 13px;
+      margin-bottom: 8px;
+    }
+    li.disabled { color: #999; }
+  }
 }
 
-.menu li {
-  padding: 2px 5px;
-  border-top: 1px solid #eee;
-  white-space: nowrap;
+.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 {
+  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 attribution text under the main map shown on printouts */
@@ -604,438 +868,497 @@ table {
   text-align: center;
 }
 
-/* Rules for the popout map sidebar */
+.donate-attr { color: darken($green, 10%) !important; }
 
-#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;
+/* Rules for the sidebar */
+
+.sidebar_heading {
+  position: relative;
+  padding: $lineheight/2 $lineheight;
+  // background: $offwhite;
+  // border-bottom: 1px solid #ccc;
+  > .close { 
+    float: right;
+    margin-top: 2px;
+    cursor: pointer; 
   }
-  h4 {
-    margin: 0;
+}
+
+#browse_status {
+  p {
+    padding: $lineheight;
   }
-  ul {
-    margin-bottom: 0;
-    li {
-      margin-bottom: 5px;
-      &:last-child {
-        margin-bottom: 0;
-      }
-    }
+
+  input {
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
   }
 }
 
-#sidebar_close {
-  position: absolute;
-  height: 20px;
-  top: 0px;
-  bottom: 0;
-  right: 20px;
-  margin: auto;
+#sidebar {
+  #sidebar_loader,
+  .loader,
+  .load_more {
+    text-align: center;
+    margin: $lineheight auto;
+    width: 40px;
+    display: block;
+  }
 }
 
-#sidebar_content {
+/* Rules for the search box */
+
+header .search_form {
+  display: none;
+}
+
+.search_form {
   position: relative;
-  bottom: 0;
-  width: 100%;
-  h4 {
-    padding: 0 20px 10px 20px;
-    margin-top: 10px;
-    margin-bottom: 0;
-    border-bottom: 1px solid #ddd;
+  padding: $lineheight/2;
+  background-color: $lightgrey;
+
+  .query_wrapper {
+    position: relative;
+    overflow: hidden;
+    border-radius: 2px 0 0 2px;
   }
-}
 
-/* Rules for the map key which appears in the popout sidebar */
+  input[type=text] {
+    width: 100%;
+    height: 30px;
+    border-right: none;
 
-#mapkey {
-  padding: 20px;
-}
+    transition: 300ms linear;
+    -webkit-transition: 300ms linear;
+    -moz-transition: 300ms linear;
+  }
 
-#mapkey .mapkey-table-key img {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
+  input:focus {
+    outline: none;
+    box-shadow: 0px 0px 7px #9ED485;
+  }
 
-#mapkey td {
-  padding: 0 5px 5px 5px;
+  input[type=submit] {
+    float: right;
+    width: auto;
+    min-width: 0;
+    border-radius: 0 2px 2px 0;
+  }
+
+  .describe_location {
+    position: absolute;
+    top: 6px;
+    right: 6px;
+    font-size: 10px;
+    color: $blue;
+  }
 }
 
-/* Rules for search results which appear in the popout sidebar */
+/* Rules for the map key which appears in the popout sidebar */
 
-.search_searching {
-  margin-top: 5px;
-  margin-bottom: 5px;
+#mapkey {
+ .mapkey-table-key img {
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+  }
+  td {
+    padding: 0 $lineheight/4 $lineheight/4 $lineheight/4;
+  }
 }
 
+/* Rules for search sidebar */
+
 .search_results_entry {
-  margin-bottom: 0;
+  ul li {
+    border-bottom: $keyline;
+    &:first-child { border-top: $keyline; }
+  }
 
   .search_details {
     display: block;
+    float: right;
     text-align: right;
+    margin-top: 0.2em;
+    margin-left: 0.5em;
   }
 }
 
-.search_results_entry .search_searching {
-  text-align: center;
-  margin: 20px auto;
-  width: 20px;
-  display: block;
-}
-
-ul.results-list li { border-bottom: 1px solid #ccc; }
-
 .search_results_error {
   color: #f00;
 }
 
-/* Rules for data browser information which appears in the popout sidebar */
+/* Rules for entity history */
 
-#browse_content {
-  position: relative;
-  .browse_show_list.button {
-    position: absolute;
-    left: 20px;
-    right: 20px;
-    bottom: -40px;
-    margin-bottom: 0;
-  }
-  a.more-details {
-    position: absolute;
-    top: 0;
-    right: 20px;
-  }
-  ul li {
-    margin-bottom: 0;
+#sidebar_content {
+  .browse_details {
+    position: relative;
+    border-bottom: $keyline;
   }
 }
 
-.browse_details {
-  position: relative;
-}
-
 .browse_status {
   display: none;
 }
 
-/* Rules for export information which appears in the popout sidebar */
+/* Rules for the history sidebar */
 
-.export_bounds {
-  text-align: center;
-}
+#sidebar .changesets {
+  li {
+    padding: 15px 20px;
+    border-bottom: 1px solid #ddd;
+    cursor: pointer;
 
-.export_area_inputs {
-  margin-bottom: 10px;
-}
+    &.selected { background: #FFFFE6; }
+    /* color is derived from changeset bbox fillColor in history.js */
+  }
 
-.export_bound {
-  margin: 5px;
+  h4 {
+    margin: 0;
+    a {
+      color: #000;
+    }
+  }
 }
 
-.export_details input[type="text"]#export_html_text {
-  width: 100%;
-}
+/* Rules for the browse sidebar */
 
-#sidebar #marker_inputs li:last-child {
-  margin-bottom: 10px;
-}
+#sidebar_content {
+  .browse-section {
+    padding: $lineheight/2 $lineheight;
+    border-bottom: 1px solid #ddd;
 
-#export_osm,
-#export_mapnik,
-#export_osmarender {
-  display: none;
-}
+    h4:first-child {
+      margin-top: 0;
+      word-wrap: break-word;
+    }
+  }
 
-.export_buttons {
-  width: 100%;
-  text-align: center;
-}
+  .browse-section:last-of-type {
+    border-bottom: none;
+  }
 
-/* Rules for the main content area */
+  .paginate {
+    float: right;
+    padding: 1px 6px;
+    border: 1px solid #eee;
+    border-radius: 3px;
+  }
 
-#content {
-  padding: 20px;
-  position: relative;
-}
+  .paginate ul {
+    padding-left: 20px;
+  }
 
-.site-edit #content,
-.site-index #content,
-.site-export #content {
-  position: fixed;
-  padding: 0;
-  top: 30px; bottom: 0;
-  left: 184px; right: 0;
-  border-left: 1px solid #ccc;
-}
+  .browse-field {
+    margin-bottom: 10px;
 
-.wrapper {
-  margin-left: 184px;
-  border-left: 1px solid #ccc;
-  text-align: left;
-}
+    h4 {
+      padding: 5px 0 5px 10px;
+      font-size: 12px;
+      border: 1px solid #CCC;
+      border-radius: 4px 4px 0 0;
+      background-color: #F6F6F6;
+    }
 
-.site-edit #content {
-  top: 30px;
-}
+    p {
+      padding: 7px 10px;
+      font-size: 12px;
+      background-color: #FFF;
+      border: 1px solid #CCC;
+      border-top: 0;
+      border-radius: 0 0 4px 4px;
+    }
+  }
 
-#content.maximised {
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  border: 0;
-  z-index: 1000;
-}
+  .browse-tag-list {
+    background-color: #F6F6F6;
+    border: 1px solid #ddd;
+    border-radius: 3px;
+    font-size: 12px;
+    table-layout: fixed;
+    border-collapse: separate;
 
-#slim_container {
-  width: 100%;
-}
+    th, td {
+      border-bottom: 1px solid #ddd;
+    }
 
-#slim_container_content {
-  max-width: 50em;
-  background-color: #FFFFFF;
-  margin: 10px auto;
-  padding: 3px;
-  border-radius: 25px;
-  -moz-border-radius: 25px;
-  border: 1px solid #e6e6e6;
-}
+    tr:last-child th, tr:last-child td {
+      border-bottom: 0;
+    }
 
-#slim_content {
-  margin: 10px;
-  margin-top: 95px;
-  max-width: 50em;
+    .browse-tag-k,
+    .browse-tag-v {
+      width: 50%;
+      padding: 6px 10px;
+      word-wrap: break-word;
+    }
 
-  .content-heading {
-    margin-bottom: 15px;
+    .browse-tag-k {
+      font-weight: 500;
+      background-color: #F6F6F6;
+    }
+
+    .browse-tag-v {
+      border-left: 1px solid #ddd;
+      background-color: #fff;
+    }
   }
-}
 
-#slim_header {
-  margin: 30px 10px;
-  position: absolute;
-  top: 0px;
-  margin-right: 5px;
-}
+  .warning {
+    margin: $lineheight/2 0;
+    padding: $lineheight/2;
+    font-size: 90%;
+  }
 
-#slim_header img {
-  vertical-align: middle;
-  margin-bottom: 5px;
-  margin-right: 5px;
-}
+  .note-comments li {
+    margin: $lineheight/2 0;
 
-.content-heading {
-  position: relative;
-  padding: 20px;
-  background: #F4F4FF;
-  h1, h2 {
-    margin-bottom: 10px;
-    line-height: 100%;
-    &:last-child {
-      margin-bottom: 0;
+    p {
+      margin-left: 10px;
     }
   }
-  p {
-    margin-top: 10px;
-    margin-bottom: 0px;
+
+  .note-description {
+    overflow: hidden;
+    margin: 0 0 10px 10px;
   }
-}
 
-/* Rules for small maps in content areas */
+  .query-intro p {
+    padding: $lineheight $lineheight $lineheight/2;
+  }
 
-.content_map {
-  position: relative;
-  width: 45%;
-  height: 400px;
-  border: 1px solid #ccc;
-  margin-bottom: 20px;
-  float: right;
-}
+  .query-results {
+    display: none;
 
-.content_map #small_map {
-  height: 100%;
-  width: 100%;
-  margin-bottom: 20px;
-}
+    h3 {
+      padding: $lineheight $lineheight $lineheight/2;
+      margin: 0;
+    }
 
-/* Rules for the home page */
+    ul {
+      li {
+        padding: 15px 20px;
+        border-bottom: 1px solid #ddd;
 
-.site-export #map,
-.site-index #map {
-  position: absolute;
-  top: 0px;
-  bottom: 0px;
-  left: 0px;
-  right: 0px;
-}
+        &.query-result {
+          cursor: pointer;
+        }
 
-/* Rules for the edit page */
+        &.selected {
+          background: #FFFFE6;
+        }
 
-.site-edit #map {
-  position: absolute;
-  top: 0px;
-  bottom: 0px;
-  left: 0px;
-  right: 0px;
-  overflow: hidden;
+        a {
+          color: #000;
+        }
+      }
+    }
+  }
 }
 
-/* Rules for the changeset list shown by the history tab etc */
+/* Rules for export sidebar */
 
-#changeset_list {
-  width: 100%;
-  ul {
-    padding: 10px 0;
-    margin-bottom: 0px;
-    border-top: 1px solid #ccc;
-    &:last-child {
-      border-bottom: 1px solid #ccc;
+.export_form {
+  padding: $lineheight;
+
+  .export_area_inputs,
+  .export_button {
+    text-align: center;
+  }
+
+  .export_area_inputs {
+    margin-bottom: $lineheight/2;
+    input[type="text"] {
+      width: 80px;
+      text-align: center;
+      margin-bottom: 5px;
     }
   }
-  .selected {
-    background: #FFFFC0;
+
+  .export_boxy {
+    background: #eee;
+    border: 1px solid #ccc;
+    border-radius: 3px;
+
+    #maxlat { margin-top: -1px; }
+    #minlon {
+      float: left;
+      margin-left: -1px;
+    }
+    #maxlon {
+      float: right;
+      margin-right: -1px;
+    }
+    #minlat { margin-bottom: 0; }
   }
-  .date,
-  .user {
-    border-left: 1px solid #ccc;
-    padding-left: 5px;
-    margin-right: 5px;
+
+  .export_bound {
+    margin: $lineheight/4;
+  }
+
+  .export_button {
+    margin-top: $lineheight;
+    margin-bottom: $lineheight;
+  }
+
+  dl {
+    padding-left: $lineheight/2;
+    dd {
+      margin-left: 0;
+      margin-bottom: 10px;
+    }
+  }
+}
+
+/* Rules for edit pages */
+
+.site-edit {
+  #content {
+    position: absolute;
+    top: $headerHeight;
+    bottom: 0;
+    width: 100%;
+  }
+
+  #map {
+    height: 100%;
+    overflow: hidden;
   }
 }
 
-#changeset_list_map_wrapper {
-  position: absolute;
-  width: 50%;
-  height: 490px;
-  top: 0;
-  right: 0;
-}
+/* Rules for non-map content pages */
 
-#changeset_list_map_wrapper.scrolled {
-  position: fixed;
+.content-heading {
+  background: $lightgrey;
+  
+  h1 { font-size: 22px; }
 }
 
-#changeset_list_map {
-  position: absolute;
-  bottom: 20px;
-  top: 20px;
-  right: 20px;
-  left: 20px;
-  border: 1px solid #ccc;
+.content-body {
+  h1, h2, h3, p, ul, ol {
+    margin-bottom: $lineheight;
+  }
+
+  h1, h2, h3 {
+    margin-top: $lineheight/2;
+  }
 }
 
-#changeset_list_map_wrapper.scrolled #changeset_list_map {
-  margin-left: 93px;
+.content-inner {
+  position: relative;
+  max-width: 900px;
+  margin: auto;
+  padding: $lineheight;
 }
 
-/* Rules for the data browser */
+/* Overrides for pages that use new layout conventions */
 
-.browse-section {
-  border-top: 1px solid #ccc;
-  margin-top: 10px;
-  padding-top: 10px;
-  &:first-child {
-    margin-top: 0;
-  }
-  .warning {
-    background-color: #ffe0cc;
-    margin: 0px;
-    padding: 4px 6px;
-    max-width: 100%;
-  }
-  h4, p {
-    margin-bottom: 5px;
+.user-new,
+.user-create,
+.user-terms {
+  .content-body .content-inner {
+    padding: 0;
   }
-  p, ul, .bbox, .geo {
-    display: inline-block;
-    vertical-align: top;
-    max-width: 65%;
+}
+
+.user-new,
+.user-create,
+.user-terms,
+.user-confirm {
+  .content-heading .content-inner {
+    height: 200px;
   }
-  ul p {
-    margin-left: 0;
-    margin-bottom: 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");
   }
-  h4 {
-    width: 33.3333%;
-    display: inline-block;
-    vertical-align: top;
+
+  &.confirm-main {
+    background-image: image-url("confirm-illustration.png");
   }
-}
 
-.bbox {
-  div {
-    width: 33.3333%;
-    text-align: center;
-    padding: 5px 0;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    float: left;
+  &.new-user-terms {
+    background-image: image-url("terms-illustration.png");
   }
-  .max_lat,
-  .min_lat {
-    margin-left: auto;
-    margin-right: auto;
-    width: 100%;
+
+  &.new-user-arm {
+    height: 110px;
+    width: 130px;
+    left: 260px;
+    top: 160px;
+    background-image: image-url("sign-up-illustration-arm.png");
+    z-index: 100;
   }
 }
 
-#browse_map .geolink {
-  display: none;
+#content.maximised {
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  border: 0;
+  z-index: 2000;
 }
 
-#browse_map .secondary-actions {
-  margin-bottom: 10px;
+/* Rules for small maps in content areas */
+
+.content_map {
+  position: relative;
+  width: 45%;
+  height: 400px;
+  border: 1px solid #ccc;
+  margin-bottom: $lineheight;
+  float: right;
 }
 
 /* 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;
@@ -1053,142 +1376,128 @@ 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 {
+  // Silly exception; remove when user page is redesigned.
+  .content-inner {
+    max-width: none;
+  }
+  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;
+  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 */
 
-.diary_entry-list img.user_thumbnail {
-  float: left;
-}
-
 .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 {
-    margin-top: 0;
-    border-top: 0;
-    padding-top: 0;
+  .post_heading {
+    margin-bottom: $lineheight;
+
+    h2 {
+      margin-top: 0;
+      margin-bottom: $lineheight/2;
+      font-size: 24px;
+    }
   }
-  h1, h2 {
-    font-size: 21px;
-    line-height: 1;
+
+  img.user_thumbnail {
+    float: left;
   }
+
   small.deemphasize {
     float: left;
     display: block;
   }
-  ul.secondary-actions { display: inline-block;}
+
+  ul.secondary-actions {
+    display: inline-block;
+  }
 }
 
 .content-heading .hide_unless_logged_in { // hacky selector, better to just add a new class to this div
   display: inline;
 }
 
-#content  .post_heading {
-  margin-bottom: 20px;
-  h2 {
-    margin-top: 0;
-    margin-bottom: 10px;
-    font-size: 24px;
-  }
-}
-
 /* Rules for the diary entry page */
 
 .diary_entry {
@@ -1198,27 +1507,27 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     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;
@@ -1231,66 +1540,38 @@ 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;
-}
-
-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;
-}
+.user-terms {
+  .legale {
+    border: 1px solid #ccc;
+    padding: $lineheight;
+    margin-bottom: $lineheight;
+    overflow: auto;
+    height: 20em;
+  }
 
-p#contributorGuidance {
-  background-color: #f4f4ff;
-  border-radius: 4px;
-  -moz-border-radius: 4px;
-  margin-top: 20px;
-  padding: 10px;
+  #decline {
+    background: $lightblue;
+    &:hover {
+      background: darken($lightblue, $hovercolor);
+    }
+  }
 }
 
 /* Rules for the account settings page */
 
-#accountForm {
-  margin-top: 20px;
-}
-
-#accountForm td {
-  padding-bottom: 10px;
-}
-
 #accountForm .user_map {
   position: relative;
   width: 500px;
@@ -1298,9 +1579,16 @@ p#contributorGuidance {
   border: 1px solid #ccc;
 }
 
-.accountImage-options {
-  width: 50%;
-  display: inline-block;
+#accountForm .user_image {
+  margin-bottom: 0;
+}
+
+#accountForm #user_image {
+  margin-left: 20px;
+}
+
+#accountForm ul.accountImage-options {
+  margin-left: 120px;
 }
 
 .nohome .location {
@@ -1315,41 +1603,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 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 message in/out box page */
+/* 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 {
@@ -1357,45 +1665,71 @@ 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-sent {
+  white-space: nowrap;
+}
+
+.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;
+  margin-bottom: $lineheight * 1.5;
+  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;
-  &#error {
-    background-color: #ff7070;
-  }
-  &#warning {
-    background-color: #ffe0cc;
-  }
-  &#notice {
-    background-color: #CBEEA7;
-  }
+.error {
+  padding: $lineheight;
+  background-color: #ff7070;
+}
+
+.warning {
+  padding: $lineheight;
+  background-color: #ffe0cc;
+}
+
+.notice {
+  padding: $lineheight;
+  background-color: #CBEEA7;
 }
 
 /* Rules for highlighting fields with rails validation errors */
 
-.field_with_errors {
-  padding: 2px;
+.formError {
+  display: inline-block;
+  padding: 5px 10px;
+  margin-top: 5px;
+  border-radius: 4px;
+  font-size: 12px;
+  color: #fff;
   background-color: #ff7070;
-  display: table;
 }
 
 /* Rules for rails validation error boxes */
@@ -1403,52 +1737,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;
+  }
+
+  ul {
+    padding-left: $lineheight;
 
-#errorExplanation ul li {
-  font-size: 12px;
-  list-style: disc;
+    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: 1.6666;
-  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"],
@@ -1457,6 +1831,18 @@ input[type="url"],
 input[type="password"],
 textarea {
   border: 1px solid #ccc;
+  padding: 2px 5px;
+  margin: 0;
+  width: 200px;
+
+  &.field_with_errors {
+    border: 2px solid #ff7070;
+  }
+}
+
+textarea {
+  padding: 5px;
+  width: 100%;
 }
 
 /* Rules for user images */
@@ -1465,30 +1851,26 @@ 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 {
+  width: auto;
+  height: auto;
   max-width: 25px;
   max-height: 25px;
   border: 1px solid #ccc;
 }
 
-/* Rule for "nowrap" class that can be applied to anything to stop wrapping */
-
-.nowrap {
-  white-space: nowrap;
-}
-
 /* Rules for geo microformats */
 
 abbr.geo {
@@ -1499,7 +1881,7 @@ abbr.geo {
 
 .rsssmall {
   position: relative;
-  top: 5px;
+  top: 3px;
 }
 
 /* General styles for action lists / subnavs / pager navs */
@@ -1510,16 +1892,15 @@ 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/2;
+    margin-right: $lineheight/2;
     &:first-child {
       border-left: 0;
       padding-left: 0;
@@ -1530,39 +1911,107 @@ ul.secondary-actions {
   }
 }
 
+div.secondary-actions {
+  padding: 10px;
+  text-align: center;
+}
+
 /* Utility for managing inner content areas */
 
-.inner22 { padding: 20px;}
+.inner22 { padding: $lineheight;}
+
+.inner12 { padding: $lineheight/2 $lineheight;}
 
-.inner12 { padding: 10px 20px;}
+.inner11 { padding: $lineheight/2;}
 
-.inner02 { padding: 0 20px;}
+.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: 75px;
+    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;
   }
 }
 
@@ -1570,7 +2019,7 @@ a.button.submit {
 
 .table0,
 .item0 {
-  background: #F4F4FF;
+  background: $offwhite;
 }
 
 .table1,
@@ -1587,11 +2036,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 {
@@ -1603,7 +2053,7 @@ a.button.submit {
   }
 
   h3 {
-    font-size: 14px;
+    font-size: $typeheight;
   }
 
   code {
@@ -1612,26 +2062,35 @@ a.button.submit {
     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;
   }
 
   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 {
@@ -1644,7 +2103,7 @@ a.button.submit {
 }
 
 .diary_post .richtext {
-    margin-top: 20px;
+    margin-top: $lineheight;
   }
 
 .comments .richtext {
@@ -1654,15 +2113,36 @@ a.button.submit {
 
 /* Rules for rich text editors */
 
+input.richtext_title[type="text"] {
+  width: 50%;
+  width: -moz-calc(100% - 235px);
+  width: -webkit-calc(100% - 235px);
+  width: calc(100% - 235px);
+
+  @media only screen and (max-width:768px) {
+    width: 100%;
+  }
+}
+
 .richtext_container {
+  margin-bottom: $lineheight;
+
   .richtext_content {
+    width: 50%;
+    width: -moz-calc(100% - 235px);
+    width: -webkit-calc(100% - 235px);
+    width: calc(100% - 235px);
     display: inline-block;
     vertical-align: top;
 
+    @media only screen and (max-width:768px) {
+      width: 100%;
+    }
+
     .richtext_preview {
       display: inline-block;
-      padding: 20px;
-      background-color: #f4f4ff;
+      padding: $lineheight;
+      background-color: $offwhite;
       overflow-x: auto;
 
       &.loading {
@@ -1682,8 +2162,8 @@ a.button.submit {
     vertical-align: top;
     margin-left: 15px;
     background-color: #f8f8ff;
-    padding: 10px;
-    max-width: 450px;
+    padding: $lineheight/2;
+    width: 220px;
 
     ul {
       margin-bottom: 0;
@@ -1691,8 +2171,8 @@ 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, li p {
@@ -1702,21 +2182,16 @@ a.button.submit {
     }
 
     li h4 {
-      width: 35%;
+      width: 40%;
       margin: 0;
     }
 
     li span, li p {
-      width: 60%;
-      margin-left: 10px;
-      margin-bottom: 5px;
+      width: 50%;
+      margin-left: $lineheight/2;
+      margin-bottom: $lineheight/4;
       white-space: nowrap;
     }
-
-    input.richtext_doedit,
-    input.richtext_dopreview {
-      margin-right: 10px;
-    }
   }
 }
 
@@ -1736,94 +2211,367 @@ a.button.submit {
   }
 }
 
-/* Rules for the notes interface */
+/* Rules for the iD editor */
 
-.note {
-  padding-top: 10px;
+.id-embed {
+  width: 100%;
+  height: 100%;
 }
 
-.note {
-  h2 {
-    margin-bottom: 10px;
+/* 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: -1px;
+  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-radius: 0 3px 3px;
+  *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: $green;
+}
+
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: $green;
+  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, .site-fixthemap {
+  .center {
+    text-align: center;
+    .sprite { 
+      float: none;
+      margin: auto;
+    }
   }
 
-  div {
-    margin-top: 10px;
+  .sprite {
+    background-image: image-url("welcome-sprite.png");
+    background-size: 500px 250px;
+    display: block;
+    float: left;
   }
 
-  .permalink {
-    position: absolute;
-    top: 5px;
-    left: 5px;
-    min-width: 15px;
-    min-height: 15px;
-    background: image-url("sprite.png") 0 -45px no-repeat;
+  .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;
   }
 
-  .permalink span {
+  .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;
+  }
+}
+
+.site-about #content {
+  //background-color: #000;
+  background-color: #eee;
+  background-position: 50% 50%;
+  background-repeat: no-repeat;
+  background-size: cover;
+  background-attachment: fixed;
+
+  &.photo-0 { background-image: image-url('about/0.jpg'); .photo-0 { display: block; } }
+  &.photo-1 { background-image: image-url('about/1.jpg'); .photo-1 { display: block; } }
+  &.photo-2 { background-image: image-url('about/2.jpg'); .photo-2 { display: block; } }
+  &.photo-3 { background-image: image-url('about/4.jpg'); .photo-3 { display: block; } }
+  &.photo-4 { background-image: image-url('about/4.jpg'); .photo-4 { display: block; } }
+  &.photo-5 { background-image: image-url('about/5.jpg'); .photo-5 { display: block; } }
+
+  .caption {
+    max-width: 200px;
+    font: 13px/20px Helvetica, Arial, sans-serif;
+    position: fixed;
+    text-align: right;
+    right: 20px;
+    bottom: 60px;
+    text-shadow: #000 0px 1px 5px;
+    color: #eee;
+    opacity: 0.8;
     display: none;
-    padding-left: 20px;
   }
 
-  .permalink:hover span {
-    display: block;
+  .caption a {
+    color: white;
+    white-space: nowrap;
+    text-decoration: none;
   }
 
-  .warning {
+  a.next {
     display: block;
-    background-color: #ffe0cc;
-    padding: 4px 6px;
-    margin-bottom: 10px;
+    position: fixed;
+    right: 10px;
+    bottom: 10px;
+    width: 40px;
+    height: 40px;
+    border-radius: 5px;
+    text-indent: -9999px;
+    overflow: hidden;
+    background: image-url('about/sprite.png') -120px 0px no-repeat;
+    background-color: #000;
+    background-color: rgba(0, 0, 0, 0.5);
   }
 
-  .comment_body {
-    margin-top: 2px;
-    margin-bottom: 2px;
+  .content-inner {
+    position: relative;
+    color: #333;
+    min-width: 320px;
+    max-width: 640px;
 
-    p {
-      margin-top: 0px;
-      margin-bottom: 0px;
+    .section {
+      margin-bottom: 30px;
+    }
+
+    .section:last-child {
+      margin-bottom: 0;
     }
   }
 
-  .comment {
-    width: 100%;
-    height: 100px;
+  .text {
+    background: white;
+    padding: 40px;
   }
 
-  .buttons {
-    margin-top: 5px;
-    text-align: right;
+  .attr {
+    position: relative;
+    padding: 170px 40px 20px;
+    background: #333;
+    background: rgba(0, 0, 0, .8);
+    margin-bottom: 0;
+    margin-top: -20px;
+
+    h1 {
+      display: block;
+      color: white;
+      font-weight: 300;
+      font-size: 34px;
+      span {
+        color: #76c551;
+      }
+    }
+
+    .user-image {
+      position: absolute;
+      top: 0px;
+      right: 240px;
+      left: 0px;
+      height: 150px;
+      background-position: 0 50%;
+      background-repeat: no-repeat;
+      background-image: image-url('about/osm.png');
+      background-size: cover;
+      background-color: #76c551;
+    }
+
+    .byosm {
+      position: absolute;
+      top: 0px;
+      right: 0px;
+      z-index: 1;
+      width: 240px;
+      height: 150px;
+      padding: 20px 20px 20px 40px;
+      font: 500 20px/24px Helvetica, Arial, sans-serif;
+      white-space: nowrap;
+      color: #fff;
+      background: #76c551;
+    }
+
+    .byosm span {
+      display: inline-block;
+      width: 20px;
+      margin-left: -20px;
+    }
   }
-}
 
-/*
- * Rules for the iD editor
- */
-.id-embed {
-  width: 100%;
-  height: 100%;
-}
+  h2 {
+    margin-bottom: 10px;
+  }
 
-/* Rules for rotating sidebar ads */
-.ad-container {
-  display: block;
-  height: 120px;
-  overflow: hidden;
-  position: relative;
-  border-bottom: 1px solid #ccc;
-}
+  .icon {
+    width: 30px;
+    height: 30px;
+    margin-right: 10px;
+    vertical-align: middle;
+    background: 40px 40px image-url('about/sprite.png') no-repeat;
 
-.ads {
-  width: 370px;
-  position: absolute;
-  left: 0%;
+    &.local        { background-position: 0px    0px; }
+    &.community    { background-position: 0px  -40px; }
+    &.open         { background-position: 0px  -80px; }
+    &.partners     { background-position: 0px -120px; }
+    &.infringement { background-position: 0px -160px; }
+  }
 }
 
-.ad {
-  float: left;
-  height: 120px;
-  padding: 10px;
-  border: 0px;
-  background: #fff;
+@import 'browse';
+
+@media only screen and (max-width:960px) {
+  .header-illustration.new-user-arm {
+    display: none;
+  }
 }
+