From->To->Go order as per @samanpwbb's comment

[rails.git] / app / assets / stylesheets / common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index 0680a2fcbe4664cf287d9579302888959d22940b..5a26d12f3329d7520e71e61205a0e04c063b67db 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1,13 +1,4 @@
-/* Parameters */
-$lineheight: 20px;
-$typeheight: 14px;
-
-$offwhite: #f4f4ff;
-$blue: #7092FF;
-$lightblue: #B8C5F0;
-$grey: #AAA;
-$lightgrey: #CCC;
-$hovercolor: 20%;
+@import "parameters";

 
 /* Styles common to large and small screens */
 
 
 /* Styles common to large and small screens */
 


@@ -45,6 +36,10 @@ abbr, acronym {
   cursor: help;
 }
 
   cursor: help;
 }
 

+strong {
+  font-weight: bold;
+}
+

 /* Micro Clearfix | Details: http://nicolasgallagher.com/micro-clearfix-hack/ */
 
 .clearfix:before,
 /* Micro Clearfix | Details: http://nicolasgallagher.com/micro-clearfix-hack/ */
 
 .clearfix:before,


@@ -73,12 +68,28 @@ abbr, acronym {
 .col11   { float:left; width:91.6666%; }
 .col12   { width:100%; }
 
 .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 */
 
 * {
 /* Default rules for the body of every page */
 
 * {

-  -moz-box-sizing: border-box;

   -webkit-box-sizing: border-box;
   -webkit-box-sizing: border-box;

-  box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;

 }
 
 body {
 }
 
 body {


@@ -90,43 +101,24 @@ body {
   margin: 0px;
   padding: 0px;
   text-align: left;
   margin: 0px;
   padding: 0px;
   text-align: left;

-}
-
-body.slim {
-  background-color: #f0f0f0;
+  height: 100%;

 }
 
 h1, h2, h3 {
 }
 
 h1, h2, h3 {

-  margin-top: $lineheight/2;
-  margin-bottom: $lineheight;
-  font-weight: bold;
+  font-weight: 600;

   line-height: 1.2;
 }
 
   line-height: 1.2;
 }
 

-h1, h2 {
-  font-size: 32px;
-}
-
-#content h2 {
-  font-size: 21px;
-}
-
-h3 {
-  font-size: 21px;
-  margin-top: $lineheight/2;
-  margin-bottom: $lineheight;
+h4, h5 {
+  font-weight: 500;

 }
 
 }
 

-h4,h5,h6 {
-  font-size: $typeheight;
-  margin-top: $lineheight/2;
-  margin-bottom: $lineheight/2;
-  font-weight: bold;
-  line-height: 1.5;
+h1 {
+  font-size: 18px;

 }
 
 }
 

-p, ul {
-  margin-bottom: $lineheight;
+h2, h3 {
+  font-size: 16px;

 }
 
 p > img {
 }
 
 p > img {


@@ -138,14 +130,7 @@ small, aside {
   font-size: 12px;
 }
 
   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%;
 
 .column-1 {
   width: 50%;


@@ -157,6 +142,8 @@ h6:first-child {
   margin-right: $lineheight/4;
 }
 
   margin-right: $lineheight/4;
 }
 

+.red { color: $red; }
+

 /* Rules for icons */
 
 .icon {
 /* Rules for icons */
 
 .icon {


@@ -167,10 +154,6 @@ h6:first-child {
   background:transparent image-url("sprite.png") no-repeat 0 0;
   text-indent:-9999px;
   overflow:hidden;
   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.search      { background-position: 0 0; }


@@ -185,14 +168,18 @@ h6:first-child {
 .icon.clipboard   { background-position: -160px 0; }
 .icon.link        { background-position: -180px 0; }
 .icon.close       { background-position: -200px 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.check       { background-position: -220px 0; }
 .icon.note        { background-position: -240px 0; }

+.icon.gear        { background-position: -260px 0; }

 
 /* Rules for links */
 
 a {
 
 /* Rules for links */
 
 a {

-  color: #00f;
+  color: #24d;

   text-decoration: none;
   text-decoration: none;

+  -webkit-appearance: none;
+  outline: 0;

   &:hover {
     text-decoration: underline;
   }
   &:hover {
     text-decoration: underline;
   }


@@ -218,7 +205,7 @@ table {
     line-height: $lineheight;
   }
   th {
     line-height: $lineheight;
   }
   th {

-    font-weight: bold;
+    font-weight: 600;

     vertical-align: top;
   }
   td {
     vertical-align: top;
   }
   td {


@@ -226,291 +213,239 @@ 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;
   display: block;

-  width: 170px;
-  min-width: 170px;
-  padding: $lineheight $lineheight/4;
-  text-align: center;
-  margin: auto;
-}
-
-#logo h1 {
-  font-size: 18px;
-  line-height: 1;
-  text-align: center;
-  margin: 0;
-}
-
-#logo h2 {
-  font-size: $lineheight/2;
-  line-height: 15px;
-  margin: 0;
+  width: 30px;
+  height: 30px;
+  margin: 14px 10px 0 0;
+  opacity: 0.6;

 }
 
 }
 

-/* Rules for the site name */
-
-#small-title {
-  display: none;
+header {
+  height: $headerHeight;
+  position: relative;
+  z-index: 1001;
+  font-size: 14px;

 
 

-  img {
-    vertical-align: text-bottom;
+  h1, nav, nav > ul, nav > ul > li, .dropdown {
+    display: inline-block;

   }
   }

-}

 
 

-/* Rules for the introductory text displayed in the left sidebar to new users */
+  > * {
+    height: 100%;
+    padding: $lineheight/2;
+  }

 
 

-.sidebar-copy {
-  padding: $lineheight/4 $lineheight/2;
-  p {
-    margin: $lineheight/4 0;
+  h1, nav.primary {
+    float: left;

   }
   }

-}
-.sidebar-copy.intro {
-  border-top: 1px solid #ccc;
-}

 
 

-/*
- * Rules for alert boxes shown in the left sidebar when important
- * information needs to be conveyed such as when the site is
- * undergoing maintenance.
- */
+  a, a:hover {
+    text-decoration: none;
+  }

 
 

-.sidebar-alert {
-  padding: $lineheight/4;
-  border-top: 1px solid #ccc;
-  margin-top: 4px;
-  margin-bottom: -5px;
-  background: #e00;
-  font-size: 12px;
-  font-weight: bold;
-  p {
-    margin: $lineheight/4;
+  img.logo {
+    width: 30px;
+    height: 30px;
+    margin-top: -2px;
+    vertical-align: middle;

   }
   }

-}

 
 

-/*
- * 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.
- */
+  h1 {
+    margin: 0;
+    padding-top: 15px;

 
 

-.sidebar-notice {
-  padding: $lineheight/4;
-  border-top: 1px solid #ccc;
-  margin-top: 4px;
-  margin-bottom: -5px;
-  background: #ea0;
-  font-size: 12px;
-  p {
-    margin: $lineheight/4;
+    a {
+      color: #000;
+    }

   }
 }
 
   }
 }
 

-/* Rules for the menu displayed in the left sidebar */
+nav.primary {
+  > ul {
+    $border: 1px solid $green;

 
 

-.left_menu {
-  left: 0px;
-  margin: 0;
-  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;
-  img {
-    margin: $lineheight/2 0px;
+    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%); }
+      }
+    }

   }
 
   }
 

-  ul {
-    padding: 0;
-    margin: 0;
+  a.tab,
+  .dropdown-toggle {
+    display: inline-block;
+    font-weight: 500;
+    color: $green;
+    padding: 5px 15px;

   }
 
   }
 

-  li {
-    list-style-type: none;
-    padding: 0;
-    margin: 0;
+  .dropdown-toggle {
+    padding: 5px 6px;

   }
 
   }
 

-  h4 {
-    padding: $lineheight/4 0 $lineheight/4 0;
-    font-size: 12px;
-    margin: 0;
+  .caret {
+    border-top-color: $green;
+    margin-top: 10px;

   }
   }

-}

 
 

-/*
- * 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.
- */
+  .disabled a {
+    color: #ccc;
+    cursor: default;

 
 

-.optionalbox {
-  left: 0px;
-  padding: $lineheight/4 $lineheight/2;
-  margin: $lineheight/4 0;
-  text-align: left;
-}
+    .caret {
+      border-top-color: #ccc;
+    }
+  }

 
 

-/* Rules for the search box */
+  > ul li.current {
+    background-color: $green;

 
 

-#search_field {
-  position: relative;
+    .tab {
+      color: #fff;
+    }

 
 

-  form {
-    width: 165px;
+    .caret {
+      border-top-color: #fff;
+    }

   }
   }

+}

 
 

-  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;
-  }
+nav.secondary {
+  position: absolute;
+  right: 0;

 
 

-  input[type="text"]:focus {
-    outline: none;
-    border: 1px solid #000;
+  > ul {
+    vertical-align: middle;
+    a, .dropdown-toggle {
+      display: inline-block;
+      text-decoration: none;
+      color: $darkgrey;
+      padding: 5px;
+
+      &:hover { color: darken($darkgrey, 25%); }
+    }

   }
 
   }
 

-  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;
+  > ul li.current a {
+    color: darken($darkgrey, 25%);

   }
   }

-}

 
 

-.search_help {
-  margin: $lineheight/4 0 0 0;
-}
+  .user-menu {
+    $border: 1px solid $grey;
+    border: $border;
+    border-radius: $border-radius;
+    margin-left: 10px;

 
 

-/* Utility for de-emphasizing content */
+    > li {
+      border-right: $border;
+      float: left;
+      &:last-child { 
+        border-right: 0;

 
 

-.deemphasize {
-  color: #999;
-  a {
-    color: $blue;
-  }
-}
+        > 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%); }
+    }

 
 

-/* Rules for donation request box */
+    a {
+      padding: 5px 15px;

 
 

-a.donate {
-  display: block;
-  width: 163px;
-  padding: $lineheight/4;
-  border: 1px solid #AED1A0;
-  background: #cbeea7;
-  font-size: $typeheight;
-  line-height: 1.4;
-  text-align: center;
-  border-radius: 2px;
-  color: #222;
-  margin: $lineheight/2 $lineheight/2 0px $lineheight/2;
+    }

 
 

-  &:hover {
-    background: #9ed485;
-    text-decoration: none;
+    &.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%); }
+    }

   }
   }

-}

 
 

-/* Rules for Creative Commons logo button */
+  .caret {
+    border-top-color: $grey;
+    margin-top: 9px;
+  }

 
 

-#cclogo {
-  margin: $lineheight/2 0;
-  float: right;
-}
+  img.user_thumbnail_tiny {
+    border: 0;
+    vertical-align: top;
+    margin-top: 0px;
+    margin: 4px 0 0 4px;
+    border-radius: 2px;
+  }

 
 

-/* Rules for tabbed navigation bar */
+  #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;
+  }

 
 

-#top-bar {
-  position: relative;
-  margin-left: 185px;
-  height: 30px;
-  border-bottom: 1px solid #ccc;
-  background: white;
-  z-index: 100;
-}
+  .dropdown-menu {
+    left: auto;
+    right: -1px;
+    border-radius: 3px 0 3px 3px;

 
 

-.site-edit #top-bar,
-.site-index #top-bar,
-.site-export #top-bar {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
+    .count-number {
+      float: right;
+      padding: 0 5px;
+      margin: 0;
+    }
+  }

 }
 
 }
 

-#tabnav {
-  height: 29px;
-  margin-bottom:0;
-  overflow: hidden;
-  li {
-    display: inline;
-  }
-  a, a:link, a:visited {
-    float: left;
-    font-weight: bold;
-    padding: 3px $lineheight/2;
-    text-decoration: none;
+#compact-secondary-nav {
+  display: none;
+  ul li a {
+    width: 100%;

     color: #333;
     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;
+    &:hover { color: #fff; }

   }
 }
 
   }
 }
 

-.site-index #tabnav a#viewanchor,
-.site-edit #tabnav a#editanchor,
-.changeset-list #tabnav a#historyanchor {
-  border-bottom: 1px solid #aaa;
-  background: #9ed485;
-  color: #000;
-}
-
-#tabnav a:link:hover, #tabnav a:visited:hover {
-  text-decoration: underline;
-}
-
-#tabnav a:link.disabled,
-#tabnav a:visited.disabled,
-#tabnav a:link:hover.disabled,
-#tabnav a:visited:hover.disabled {
-  color: #ccc;
-  cursor: default;
-  &:hover {
-    text-decoration: none;
+@media only screen and (max-width:960px) {
+  #compact-secondary-nav {
+    display: inline-block;
+  }
+  .compact-hide {
+    display: none;

   }
 }
 
   }
 }
 


@@ -519,24 +454,12 @@ a.donate {
 .count-number {
   padding: 2px $lineheight/4;
   border-radius: 2px;
 .count-number {
   padding: 2px $lineheight/4;
   border-radius: 2px;

-  background: #d7d7ff;
+  background: lighten($green, 30%);

   margin: 0 2px;
   font-size: 11px;
   color: #333;
 }
 
   margin: 0 2px;
   font-size: 11px;
   color: #333;
 }
 

-/* Rules for greeting bar in the top right corner */
-
-#greeting {
-  float: right;
-  padding-top: 3px;
-  margin-right: $lineheight/4;
-}
-
-.greeting-bar-unread {
-  font-weight: bold;
-}
-

 /* Rules for the message shown in place of the map when javascript is disabled */
 
 #noscript {
 /* Rules for the message shown in place of the map when javascript is disabled */
 
 #noscript {


@@ -638,7 +561,6 @@ a.donate {
   width: 40px;
   background-color: #333;
   background-color: rgba(0,0,0,.6);
   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;
   border-radius: 4px 0 0 4px;
   margin-bottom: 10px;
   outline: none;


@@ -668,83 +590,188 @@ a.donate {
   border-radius: 4px 0 0 0;
 }
 
   border-radius: 4px 0 0 0;
 }
 

-.site .leaflet-control .zoomout,
+.leaflet-control .zoomout,

 .control-key .control-button {
   margin-bottom: 0;
   border-radius: 0;
 }
 
 .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;
 }
 
 .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;
+/* Rules for the sidebar and main map area */

 
 

-  .section {
-    border-bottom: 1px solid #DDD;
-    padding: 15px;
+.map-layout {
+  #content {
+    overflow: hidden;
+    position: absolute;
+    top: $headerHeight;
+    bottom: 0;
+    width: 100%;

   }
 
   }
 

-  a.close-button {
-    float: right;
-    padding:5px;
-    font-size:20px;
-    line-height:10px;
-    color:#222;
-    border:1px solid #ddd;
+  #sidebar, #map {
+    position: relative;
+    height: 100%;
+    overflow-x: hidden;
+    overflow-y: auto;

   }
   }

-}

 
 

-.layers-ui,
-.share-ui {
-  ul, li:last-child, p:last-child {
-    margin-bottom: 0;
-  }
-}
+  #sidebar {
+    float: left;
+    width: $sidebarWidth;
+    background: #fff;
+    font-size: 12px;

 
 

-.layers-ui {
-  li {
-    border-radius: 4px;
-    overflow: hidden;
-    margin-bottom: 10px;
-  }
+    h2 {
+      padding: $lineheight $lineheight $lineheight/2;
+    }

 
 

-  label {
-    display: block;
-    padding: 5px 5px 5px 7px;
-    background-color: #eee;
-    cursor: pointer;
+    h3, h4 {
+      margin-top: $lineheight;
+      margin-bottom: $lineheight/2;
+      font-size: 13px;
+    }
+
+    .icon.close {
+      float: right;
+      cursor: pointer;
+    }

   }
 
   }
 

-  li.active label {
-    background-color: #ccc;
+  .welcome {
+    display: none;

   }
 
   }
 

-  .base-layers {
-    .leaflet-container {
+  .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;
+  }
+
+  #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;
+      }
+    }
+  }
+}
+
+.layers-ui,
+.share-ui {
+  li:last-child {
+    margin-bottom: 0;
+  }
+}
+
+.layers-ui {
+  .base-layers {
+    .leaflet-container {

       width: 100%;
       height: 50px;
       cursor: pointer;
     }
       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; }

   }
 }
 
   }
 }
 


@@ -803,7 +830,7 @@ a.donate {
   }
 }
 
   }
 }
 

-.leaflet-top.leaflet-right {
+.leaflet-top {

   top: $lineheight/2 !important;
   .leaflet-control {
     margin-right: 0px !important;
   top: $lineheight/2 !important;
   .leaflet-control {
     margin-right: 0px !important;


@@ -822,34 +849,6 @@ a.donate {
   -webkit-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 {
 /* Rules for attribution text under the main map shown on printouts */
 
 #attribution {


@@ -865,60 +864,93 @@ a.donate {
   text-align: center;
 }
 
   text-align: center;
 }
 

-/* Rules for the popout map sidebar */
+.donate-attr { color: darken($green, 10%) !important; }

 
 

-#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: $lineheight/4;
-      &:last-child {
-        margin-bottom: 0;
-      }
-    }
-  }
-}
+/* Rules for the sidebar */

 
 .sidebar_heading {
   position: relative;
   padding: $lineheight/2 $lineheight;
 
 .sidebar_heading {
   position: relative;
   padding: $lineheight/2 $lineheight;

-  z-index: 9999;
-  background: $offwhite;
-  border-bottom: 1px solid #ccc;
-  h4 {
-    margin: 0;
+  // background: $offwhite;
+  // border-bottom: 1px solid #ccc;
+  > .close { 
+    float: right;
+    margin-top: 2px;
+    cursor: pointer; 

   }
 }
 
   }
 }
 

-.sidebar_close {
-  position: absolute;
-  height: $lineheight;
-  top: 0px;
-  bottom: 0;
-  right: $lineheight;
-  margin: auto;
+#browse_status {
+  p {
+    padding: $lineheight;
+  }
+
+  input {
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+  }

 }
 
 }
 

-#sidebar_content {
+#sidebar {
+  #sidebar_loader,
+  .loader,
+  .load_more {
+    text-align: center;
+    margin: $lineheight auto;
+    width: 40px;
+    display: block;
+  }
+}
+
+/* Rules for the search box */
+
+header .search_form {
+  display: none;
+}
+
+.search_form {

   position: relative;
   position: relative;

-  margin-bottom: 20px;
-  overflow: auto;
-  height: 100%;
-  width: 100%;
-  h4 {
-    padding: 0 $lineheight $lineheight/2 $lineheight;
-    margin-top: $lineheight/2;
-    margin-bottom: 0;
-    border-bottom: 1px solid #ddd;
+  padding: $lineheight/2;
+  padding-top: 1px;
+  background-color: $lightgrey;
+
+  .query_wrapper {
+    position: relative;
+    overflow: hidden;
+    border-radius: 2px 0 0 2px;
+  }
+
+  input[type=text] {
+    width: 100%;
+    height: 30px;
+    border-right: none;
+
+    transition: 300ms linear;
+    -webkit-transition: 300ms linear;
+    -moz-transition: 300ms linear;
+  }
+
+  input:focus {
+    outline: none;
+    box-shadow: 0px 0px 7px #9ED485;
+  }
+
+  input[type=submit] {
+    float: right;
+    width: auto;
+    min-width: 0;
+    border-radius: 0 2px 2px 0;
+  }
+
+  .query_options {
+    text-align: right;
+    font-size: 10px;
+    color: $blue;
+  }
+
+  .routing {
+    display: none;

   }
 }
 
   }
 }
 


@@ -935,302 +967,378 @@ a.donate {
   }
 }
 
   }
 }
 

-/* Rules for search results which appear in the popout sidebar */
-
-.search_searching {
-  margin-top: $lineheight/4;
-  margin-bottom: $lineheight/4;
-}
+/* Rules for search sidebar */

 
 .search_results_entry {
 
 .search_results_entry {

-  margin-bottom: 0;
+  ul li {
+    border-bottom: $keyline;
+    &:first-child { border-top: $keyline; }
+  }

 
   .search_details {
     display: block;
 
   .search_details {
     display: block;

+    float: right;

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

+    margin-top: 0.2em;
+    margin-left: 0.5em;

   }
 }
 
   }
 }
 

-.search_results_entry .search_searching {
-  text-align: center;
-  margin: $lineheight auto;
-  width: $lineheight;
-  display: block;
-}
-
-ul.results-list li { border-bottom: 1px solid #ccc; }
-

 .search_results_error {
   color: #f00;
 }
 
 .search_results_error {
   color: #f00;
 }
 

-/* Rules for data browser information which appears in the popout sidebar */
+/* Rules for routing */

 
 

-#browse_content {
-  position: relative;
-  .browse_show_list.button {
-    position: absolute;
-    left: $lineheight;
-    right: $lineheight;
-    bottom: -40px;
-    margin-bottom: 0;
-  }
-  a.more-details {
-    position: absolute;
-    top: 0;
-    right: $lineheight;
-  }
-  ul li {
-    margin-bottom: 0;
-  }
+#sidebar_content>table {
+    padding: 5px 20px 10px 15px;
+    width: 100%;
+    border-collapse: separate;

 }
 
 }
 

-.browse_details {
-  position: relative;
+td.direction {
+    background-image: image-url('routing-sprite.png'); 
+    width: 20px; height: 20px; 
+    background-repeat: no-repeat;
+}
+@for $i from 1 through 17 {
+td.direction.i#{$i}  { background-position: #{($i)*-20+20}px 0px; }

 }
 
 }
 

-.browse_status {
-  display: none;
+.routing_submit {
+    margin-top: 30px !important;

 }
 
 }
 

-/* Rules for export information which appears in the popout sidebar */
+p#routing_summary {
+    padding: 0 $lineheight $lineheight/4;
+}

 
 

-.export_bounds {
-  text-align: center;
+td.instruction, td.distance {
+    padding-top: 0;
+    border-bottom: 1px solid #DDD;

 }
 }

+td.distance {
+    color: #BBB;
+    text-align: right;
+    font-size: x-small;
+}
+tr.turn {
+    cursor: pointer;
+}
+tr.turn:hover {
+    background: lighten($green, 30%); 
+}
+.routing_engines, #route_from, #route_to { margin-left: 25px; }
+.routing_marker { width: 15px; position: absolute; }

 
 

-.export_area_inputs {
-  margin-bottom: $lineheight/2;
-  input[type="text"] {
-    width: 80px;
-    margin-bottom: 5px;
+/* Rules for entity history */
+
+#sidebar_content {
+  .browse_details {
+    position: relative;
+    border-bottom: $keyline;

   }
 }
 
   }
 }
 

-.export_bound {
-  margin: $lineheight/4;
+.browse_status {
+  display: none;

 }
 
 }
 

-/* Rules for the main content area */
+/* Rules for the history sidebar */

 
 

-#content {
-  padding: $lineheight;
-  position: relative;
-}
+#sidebar .changesets {
+  li {
+    padding: 15px 20px;
+    border-bottom: 1px solid #ddd;
+    cursor: pointer;

 
 

-.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;
+    &.selected { background: #FFFFE6; }
+    /* color is derived from changeset bbox fillColor in history.js */
+  }
+
+  h4 {
+    margin: 0;
+    a {
+      color: #000;
+    }
+  }

 }
 
 }
 

-.site-copyright,
-.site-welcome {
-  .content-heading {
-    text-align: center;
+/* Rules for the browse sidebar */
+
+#sidebar_content {
+  .browse-section {
+    padding: $lineheight/2 $lineheight;
+    border-bottom: 1px solid #ddd;
+
+    h4:first-child {
+      margin-top: 0;
+      word-wrap: break-word;
+    }

   }
 
   }
 

-  #content {
-    max-width: 700px;
-    margin: auto;
+  .browse-section:last-of-type {
+    border-bottom: none;

   }
   }

-}

 
 

-.wrapper {
-  margin-left: 184px;
-  border-left: 1px solid #ccc;
-  text-align: left;
-}
+  .paginate {
+    float: right;
+    padding: 1px 6px;
+    border: 1px solid #eee;
+    border-radius: 3px;
+  }

 
 

-#content.maximised {
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  border: 0;
-  z-index: 1000;
-}
+  .paginate ul {
+    padding-left: 20px;
+  }

 
 

-#slim_container {
-  width: 100%;
-}
+  .browse-field {
+    margin-bottom: 10px;

 
 

-#slim_container_content {
-  max-width: 50em;
-  background-color: #FFFFFF;
-  margin: $lineheight/2 auto;
-  padding: 3px;
-  border-radius: 25px;
-  -moz-border-radius: 25px;
-  border: 1px solid #e6e6e6;
-}
+    h4 {
+      padding: 5px 0 5px 10px;
+      font-size: 12px;
+      border: 1px solid #CCC;
+      border-radius: 4px 4px 0 0;
+      background-color: #F6F6F6;
+    }

 
 

-#slim_content {
-  margin: $lineheight/2;
-  margin-top: 95px;
-  max-width: 50em;
+    p {
+      padding: 7px 10px;
+      font-size: 12px;
+      background-color: #FFF;
+      border: 1px solid #CCC;
+      border-top: 0;
+      border-radius: 0 0 4px 4px;
+    }
+  }
+
+  .browse-tag-list {
+    background-color: #F6F6F6;
+    border: 1px solid #ddd;
+    border-radius: 3px;
+    font-size: 12px;
+    table-layout: fixed;
+    border-collapse: separate;

 
 

-  .content-heading {
-    margin-bottom: 15px;
+    th, td {
+      border-bottom: 1px solid #ddd;
+    }
+
+    tr:last-child th, tr:last-child td {
+      border-bottom: 0;
+    }
+
+    .browse-tag-k,
+    .browse-tag-v {
+      width: 50%;
+      padding: 6px 10px;
+      word-wrap: break-word;
+    }
+
+    .browse-tag-k {
+      font-weight: 500;
+      background-color: #F6F6F6;
+    }
+
+    .browse-tag-v {
+      border-left: 1px solid #ddd;
+      background-color: #fff;
+    }

   }
   }

-}

 
 

-#slim_header {
-  margin: 30px $lineheight/2;
-  position: absolute;
-  top: 0px;
-  margin-right: $lineheight/4;
-  img {
-    vertical-align: middle;
-    margin-bottom: $lineheight/4;
-    margin-right: $lineheight/4;
+  .warning {
+    margin: $lineheight/2 0;
+    padding: $lineheight/2;
+    font-size: 90%;
+  }
+
+  .note-comments li {
+    margin: $lineheight/2 0;
+
+    p {
+      margin-left: 10px;
+    }
+  }
+
+  .note-description {
+    overflow: hidden;
+    margin: 0 0 10px 10px;

   }
 }
 
   }
 }
 

-.content-heading {
-  position: relative;
+/* Rules for export sidebar */
+
+.export_form {

   padding: $lineheight;
   padding: $lineheight;

-  background: $offwhite;
-  h1, h2 {
+
+  .export_area_inputs,
+  .export_button {
+    text-align: center;
+  }
+
+  .export_area_inputs {

     margin-bottom: $lineheight/2;
     margin-bottom: $lineheight/2;

-    line-height: 100%;
-    &:last-child {
-      margin-bottom: 0;
+    input[type="text"] {
+      width: 80px;
+      text-align: center;
+      margin-bottom: 5px;

     }
   }
     }
   }

-  p {
-    margin-top: $lineheight/2;
-    margin-bottom: 0px;
+
+  .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; }

   }
   }

-}

 
 

-/* Rules for small maps in content areas */
+  .export_bound {
+    margin: $lineheight/4;
+  }

 
 

-.content_map {
-  position: relative;
-  width: 45%;
-  height: 400px;
-  border: 1px solid #ccc;
-  margin-bottom: $lineheight;
-  float: right;
-}
+  .export_button {
+    margin-top: $lineheight;
+    margin-bottom: $lineheight;
+  }

 
 

-.content_map #small_map {
-  height: 100%;
-  width: 100%;
-  margin-bottom: $lineheight;
+  dl {
+    padding-left: $lineheight/2;
+    dd {
+      margin-left: 0;
+      margin-bottom: 10px;
+    }
+  }

 }
 
 }
 

-/* Rules for the changeset list shown by the history tab etc */
+/* Rules for the routing sidebar */

 
 

-#changeset_list {
-  width: 100%;
-  ul {
-    padding: $lineheight/2 0;
-    margin-bottom: 0px;
-    border-top: 1px solid #ccc;
-    &:last-child {
-      border-bottom: 1px solid #ccc;
-    }
+#sidebar_content {
+  #routing_credit {
+    text-align: center;
+    padding: 0.5em;

   }
   }

-  .selected {
-    background: #FFFFC0;
+}
+
+/* Rules for edit pages */
+
+.site-edit {
+  #content {
+    position: absolute;
+    top: $headerHeight;
+    bottom: 0;
+    width: 100%;

   }
   }

-  .date,
-  .user {
-    border-left: 1px solid #ccc;
-    padding-left: $lineheight/4;
-    margin-right: $lineheight/4;
+
+  #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: $lineheight;
-  top: $lineheight;
-  right: $lineheight;
-  left: $lineheight;
-  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: $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: $lineheight/4;
+.user-new,
+.user-create,
+.user-terms {
+  .content-body .content-inner {
+    padding: 0;

   }
   }

-  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 {
-    float: left;
-    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: $lineheight/4 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: $lineheight/2;
+/* 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 */
 }
 
 /* Rules for the trace list shown by the traces tab etc */


@@ -1317,6 +1425,10 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 }
 
 .user-view {
 }
 
 .user-view {

+  // Silly exception; remove when user page is redesigned.
+  .content-inner {
+    max-width: none;
+  }

   p#no_home_location {
     margin: $lineheight;
   }
   p#no_home_location {
     margin: $lineheight;
   }


@@ -1371,46 +1483,40 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 /* Rules for the diary list page */
 
 
 /* Rules for the diary list page */
 

-.diary_entry-list img.user_thumbnail {
-  float: left;
-}
-

 .diary_post {
 .diary_post {

-  max-width: 740px;

   position: relative;
   margin-top: $lineheight/2;
   padding-top: $lineheight;
   border-top: 1px solid #ccc;
 
   position: relative;
   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: 1em;
+
+  img.user_thumbnail {
+    float: left;

   }
   }

+

   small.deemphasize {
     float: left;
     display: block;
   }
   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-heading .hide_unless_logged_in { // hacky selector, better to just add a new class to this div
   display: inline;
 }
 

-#content  .post_heading {
-  margin-bottom: $lineheight;
-  h2 {
-    margin-top: 0;
-    margin-bottom: $lineheight/2;
-    font-size: 24px;
-  }
-}
-

 /* Rules for the diary entry page */
 
 .diary_entry {
 /* Rules for the diary entry page */
 
 .diary_entry {


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

-/* Rules for the login page */
+/* Rules for the log in page */

 
 #login_openid_buttons {
   margin-bottom: 0;
 
 #login_openid_buttons {
   margin-bottom: 0;


@@ -1466,50 +1572,21 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 /* Rules for the account confirmation page */
 
 
 /* Rules for the account confirmation page */
 

-#terms {
+.user-terms {

   .legale {
     border: 1px solid #ccc;
     padding: $lineheight;
     margin-bottom: $lineheight;
     overflow: auto;
   .legale {
     border: 1px solid #ccc;
     padding: $lineheight;
     margin-bottom: $lineheight;
     overflow: auto;

-    height: 10em;
-
-    &:p#last {
-      margin-bottom: 0px;
-    }
-
-    &:ol {
-      margin-bottom: 0px;
-    }
-
-    &:img {
-      display: block;
-      margin: $lineheight auto inherit auto;
-    }
+    height: 20em;

   }
 
   }
 

-  form.sign {
-    input[type=submit] {
-      float: left;
-    }
-    #decline {
-      background: $grey;
-      &:hover {
-        background: darken($grey, $hovercolor);
-      }
+  #decline {
+    background: $lightblue;
+    &:hover {
+      background: darken($lightblue, $hovercolor);

     }
   }
     }
   }

-  fieldset {
-    margin-bottom: $lineheight;
-  }
-  #contributorGuidance {
-    background-color: $offwhite;
-    border-radius: 4px;
-    -moz-border-radius: 4px;
-  }
-  .signing-buttons {
-    height: 50px;
-  }

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


@@ -1620,6 +1697,10 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   vertical-align: middle;
 }
 
   vertical-align: middle;
 }
 

+.inbox-sent {
+  white-space: nowrap;
+}
+

 .inbox-mark-unread,
 .inbox-mark-read,
 .inbox-delete {
 .inbox-mark-unread,
 .inbox-mark-read,
 .inbox-delete {


@@ -1632,6 +1713,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 .message-read .message-buttons {
   margin-top: $lineheight;
 
 .message-read .message-buttons {
   margin-top: $lineheight;

+  margin-bottom: $lineheight * 1.5;

   padding-top: $lineheight;
   border-top: 1px solid $lightgrey;
 }
   padding-top: $lineheight;
   border-top: 1px solid $lightgrey;
 }


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

-.flash {
-    padding: $lineheight;
-  &#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 */
 
 }
 
 /* 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;
   background-color: #ff7070;

-  display: table;

 }
 
 /* Rules for rails validation error boxes */
 }
 
 /* Rules for rails validation error boxes */


@@ -1727,6 +1815,10 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     padding-top: $lineheight;
     border-top: 1px solid $lightgrey;
   }
     padding-top: $lineheight;
     border-top: 1px solid $lightgrey;
   }

+  .horizontal-list .form-row { 
+    float: left;
+    padding-right: 10px;
+  }

   .form-row {
     margin-bottom: $lineheight/2;
   }
   .form-row {
     margin-bottom: $lineheight/2;
   }


@@ -1761,6 +1853,10 @@ textarea {
   padding: 2px 5px;
   margin: 0;
   width: 200px;
   padding: 2px 5px;
   margin: 0;
   width: 200px;

+
+  &.field_with_errors {
+    border: 2px solid #ff7070;
+  }

 }
 
 textarea {
 }
 
 textarea {


@@ -1787,17 +1883,13 @@ img.user_thumbnail {
 }
 
 img.user_thumbnail_tiny {
 }
 
 img.user_thumbnail_tiny {

+  width: auto;
+  height: auto;

   max-width: 25px;
   max-height: 25px;
   border: 1px solid #ccc;
 }
 
   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 {
 /* Rules for geo microformats */
 
 abbr.geo {


@@ -1808,7 +1900,7 @@ abbr.geo {
 
 .rsssmall {
   position: relative;
 
 .rsssmall {
   position: relative;

-  top: 5px;
+  top: 3px;

 }
 
 /* General styles for action lists / subnavs / pager navs */
 }
 
 /* General styles for action lists / subnavs / pager navs */


@@ -1821,13 +1913,13 @@ ul.secondary-actions {
     display: inline-block;
     margin-right: 60px;
   }
     display: inline-block;
     margin-right: 60px;
   }

-  li {
+  > li {

     display: block;
     float: left;
     list-style: none;
     border-left: 1px solid #ccc;
     display: block;
     float: left;
     list-style: none;
     border-left: 1px solid #ccc;

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

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


@@ -1838,6 +1930,11 @@ ul.secondary-actions {
   }
 }
 
   }
 }
 

+div.secondary-actions {
+  padding: 10px;
+  text-align: center;
+}
+

 /* Utility for managing inner content areas */
 
 .inner22 { padding: $lineheight;}
 /* Utility for managing inner content areas */
 
 .inner22 { padding: $lineheight;}


@@ -1846,6 +1943,8 @@ ul.secondary-actions {
 
 .inner11 { padding: $lineheight/2;}
 
 
 .inner11 { padding: $lineheight/2;}
 

+.inner20 { padding: $lineheight 0;}
+

 .inner02 { padding: 0 $lineheight;}
 
 /* Utility for general button styles */
 .inner02 { padding: 0 $lineheight;}
 
 /* Utility for general button styles */


@@ -1898,7 +1997,7 @@ a.button {
     float: left;
     border-radius: 0;
     margin:0;
     float: left;
     border-radius: 0;
     margin:0;

-    min-width: 100px;
+    min-width: 75px;

     max-width: 180px;
     border-right:1px solid white;
     text-overflow: ellipsis;
     max-width: 180px;
     border-right:1px solid white;
     text-overflow: ellipsis;


@@ -1931,7 +2030,7 @@ a.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;
   *[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;
+    border-right-width: 1px;

   }
 }
 
   }
 }
 


@@ -2033,14 +2132,32 @@ a.button {
 
 /* Rules for rich text editors */
 
 
 /* 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%;
 .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;
 
     display: inline-block;
     vertical-align: top;
 

+    @media only screen and (max-width:768px) {
+      width: 100%;
+    }
+

     .richtext_preview {
       display: inline-block;
       padding: $lineheight;
     .richtext_preview {
       display: inline-block;
       padding: $lineheight;


@@ -2113,129 +2230,168 @@ a.button {
   }
 }
 
   }
 }
 

-/* Rules for the notes interface */
+/* Rules for the iD editor */

 
 

-.leaflet-popup-content .note {
-  padding-top: $lineheight/2;
+.id-embed {
+  width: 100%;
+  height: 100%;

 }
 
 }
 

-.leaflet-popup-content .note {
-  h2 {
-    margin-bottom: $lineheight/2;
-  }
-
-  div {
-    margin-top: $lineheight/2;
-  }
+/* Rules for dropdown menus */

 
 

-  .permalink {
-    position: absolute;
-    top: $lineheight/4;
-    left: $lineheight/4;
-    min-width: 15px;
-    min-height: 15px;
-  }
+.dropdown {
+  position: relative;
+}

 
 

-  .permalink span {
-    display: none;
-    padding-left: $lineheight;
-  }
+.dropdown-toggle {
+  *margin-bottom: -3px;
+}

 
 

-  .permalink:hover span {
-    display: block;
-  }
+.dropdown-toggle:active,
+.open .dropdown-toggle {
+  outline: 0;
+}

 
 

-  .warning {
-    display: block;
-    background-color: #ffe0cc;
-    padding: 4px 6px;
-    margin-bottom: $lineheight/2;
-  }
+.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: "";
+}

 
 

-  .comment_body {
-    margin-top: 2px;
-    margin-bottom: 2px;
+.dropdown .caret {
+  margin-top: 8px;
+  margin-left: 2px;
+}

 
 

-    p {
-      margin-top: 0px;
-      margin-bottom: 0px;
-    }
-  }
+.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;
+}

 
 

-  .comment {
-    width: 100%;
-    height: 100px;
-  }
+.dropdown-menu .divider {
+  *width: 100%;
+  height: 1px;
+  margin: 9px 1px;
+  *margin: -5px 0 5px;
+  overflow: hidden;
+  background-color: #e5e5e5;
+  border-bottom: 1px solid #ffffff;
+}

 
 

-  .buttons {
-    margin-top: $lineheight/4;
-    text-align: right;
-  }
+.dropdown-menu > li > a {
+  display: block;
+  padding: 3px 10px;
+  clear: both;
+  font-weight: normal;
+  line-height: 20px;
+  color: #333333;
+  white-space: nowrap;

 }
 
 }
 

-/*
- * Rules for the iD editor
- */
+.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;
+}

 
 

-.site-edit-id {
-  #left,
-  #large-title {
-    display: none;
-  }
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: $green;
+  outline: 0;
+}

 
 

-  #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;
-  }
+.dropdown-menu > .disabled > a,
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  color: #999999;
+}

 
 

-  #content {
-    left: 0;
-  }
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  text-decoration: none;
+  cursor: default;
+  background-color: transparent;
+  background-image: none;

 }
 
 }
 

-.id-embed {
-  width: 100%;
-  height: 100%;
+.open {
+  *z-index: 1000;

 }
 
 }
 

-/* Rules for rotating sidebar ads */
-.ad-container {
+.open > .dropdown-menu {

   display: block;
   display: block;

-  height: 120px;
-  overflow: hidden;
-  position: relative;
-  border-bottom: 1px solid #ccc;

 }
 
 }
 

-.ad {
-  height: 100px;
-  border: 0;
-  background: #fff;
+.dropdown-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 990;

 }
 
 /* Rules for the "Welcome" page */
 }
 
 /* Rules for the "Welcome" page */

-.site-welcome {
+.site-welcome, .site-fixthemap {

   .center {
     text-align: center;
   .center {
     text-align: center;

-  }
-
-  .drop {
-    margin-top: 20px;
+    .sprite { 
+      float: none;
+      margin: auto;
+    }

   }
 
   .sprite {
     background-image: image-url("welcome-sprite.png");
     background-size: 500px 250px;
   }
 
   .sprite {
     background-image: image-url("welcome-sprite.png");
     background-size: 500px 250px;

-    display: inline-block;
+    display: block;
+    float: left;

   }
 
   }
 

+  .icon-list { 
+    padding-bottom: 20px;
+    div {
+      margin-bottom: 10px;
+      p {
+        padding-top: 10px;
+      }
+    }
+  }

   .sprite.small {
     width: 50px;
     height: 50px;
   .sprite.small {
     width: 50px;
     height: 50px;


@@ -2245,15 +2401,6 @@ a.button {
     background-position: -50px 0;
   }
 
     background-position: -50px 0;
   }
 

-  .sprite.large {
-    width: 350px;
-    height: 200px;
-  }
-
-  .sprite.one-map {
-    background-position: 0 -50px;
-  }
-

   .sprite.term {
     margin-right: 10px;
     vertical-align: middle;
   .sprite.term {
     margin-right: 10px;
     vertical-align: middle;


@@ -2267,7 +2414,7 @@ a.button {
     background-position: -150px 0;
   }
 
     background-position: -150px 0;
   }
 

-  .sprite.changeset {
+  .sprite.tag {

     background-position: -200px 0;
   }
 
     background-position: -200px 0;
   }
 


@@ -2279,94 +2426,171 @@ a.button {
     background-position: -300px 0;
   }
 
     background-position: -300px 0;
   }
 

-  .pad1 {
-    padding: 10px;
+  .start-mapping {
+    margin: auto;
+    cursor: pointer;
+    border: none;
+    padding: 20px 40px;
+    font-size: 30px;
+    text-decoration: none;

   }
 
   }
 

-  .pad2 {
-    padding: 20px;
+  .note-box {
+    margin-top: 20px;
+    background-color: $offwhite;

   }
 
   }
 

-  .one-map {
-    position: relative;
+  .icon.note {
+    background-color: #333;
+    border-radius: 4px;

   }
   }

+}

 
 

-  .one-map-name {
-    position: absolute;
-    font-size: 15px;
-    font-weight: bold;
-  }
+.site-about #content {
+  //background-color: #000;
+  background-color: #eee;
+  background-position: 50% 50%;
+  background-repeat: no-repeat;
+  background-size: cover;
+  background-attachment: fixed;

 
 

-  .one-map-project-name {
-    font-size: 25px;
-    top: 70px;
-    left: 75px;
-  }
+  &.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; } }

 
 

-  .one-map-name-1,
-  .one-map-name-5,
-  .one-map-name-6 {
-    text-align: center;
-    display: inline-block;
-    width: 200px;
+  .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;

   }
 
   }
 

-  .one-map-name-1 {
-    color: #c28d86;
-    top: 30px;
-    left: -70px;
+  .caption a {
+    color: white;
+    white-space: nowrap;
+    text-decoration: none;

   }
 
   }
 

-  .one-map-name-2 {
-    color: #c28d86;
-    top: 25px;
-    left: 172px;
+  a.next {
+    display: block;
+    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);

   }
 
   }
 

-  .one-map-name-3 {
-    color: #94cacc;
-    top: 45px;
-    left: 140px;
-  }
+  .content-inner {
+    position: relative;
+    color: #333;
+    min-width: 320px;
+    max-width: 640px;
+
+    .section {
+      margin-bottom: 30px;
+    }

 
 

-  .one-map-name-4 {
-    color: #94cacc;
-    top: 48px;
-    left: 270px;
+    .section:last-child {
+      margin-bottom: 0;
+    }

   }
 
   }
 

-  .one-map-name-5 {
-    color: #85c589;
-    top: 105px;
-    left: 90px;
+  .text {
+    background: white;
+    padding: 40px;

   }
 
   }
 

-  .one-map-name-6 {
-    color: #94cacc;
-    top: 138px;
-    left: 20px;
+  .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;
+    }

   }
 
   }
 

-  .edit-located,
-  .edit-geocoded,
-  .edit-geolocated {
-    display: none;
+  h2 {
+    margin-bottom: 10px;

   }
 
   }
 

-  .start-mapping {
-    background: #EB6F67;
-    color: #FFF;
-    display: block;
-    margin: auto;
-    cursor: pointer;
-    border: none;
-    border-radius: 5px;
-    border-bottom: 1px solid #A53931;
-    padding: 20px 40px;
-    font-size: 30px;
+  .icon {
+    width: 30px;
+    height: 30px;
+    margin-right: 10px;
+    vertical-align: middle;
+    background: 40px 40px image-url('about/sprite.png') no-repeat;
+
+    &.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; }

   }
   }

+}

 
 

-  .note-box {
-    background-color: $offwhite;
+@import 'browse';
+
+@media only screen and (max-width:960px) {
+  .header-illustration.new-user-arm {
+    display: none;

   }
 }
   }
 }

+