X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/33a6b79bd78f1903011367f6a5adf2f91d160f74..726db77827fa71133cc9762c3bf295189269ebb5:/app/assets/stylesheets/common.css.scss?ds=sidebyside

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index c9b7046f9..d8b843000 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -5,9 +5,16 @@ $typeheight: 14px;
 $offwhite: #f4f4ff;
 $blue: #7092FF;
 $lightblue: #B8C5F0;
-$grey: #AAA;
-$lightgrey: #CCC;
+$green: #7ebc6f;
+$grey: #CCC;
+$red: red;
+$lightgrey: #EEE;
+$darkgrey: #AAA;
 $hovercolor: 20%;
+$headerHeight: 54px;
+$sidebarWidth: 300px;
+$keyline: 1px solid $lightgrey;
+$border-radius: 3px;
 
 /* Styles common to large and small screens */
 
@@ -45,6 +52,8 @@ abbr, acronym {
   cursor: help;
 }
 
+strong { font-weight: 500; }
+
 /* Micro Clearfix | Details: http://nicolasgallagher.com/micro-clearfix-hack/ */
 
 .clearfix:before,
@@ -88,12 +97,13 @@ abbr, acronym {
 .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 {
@@ -112,36 +122,18 @@ body.slim {
 }
 
 h1, h2, h3 {
-  margin-top: $lineheight/2;
-  margin-bottom: $lineheight;
-  font-weight: bold;
+  font-weight: 500;
   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 {
@@ -153,15 +145,6 @@ 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;
-}
-
 .column-1 {
   width: 50%;
   margin: 0 0 $lineheight/2 0;
@@ -172,6 +155,8 @@ h6:first-child {
   margin-right: $lineheight/4;
 }
 
+.red { color: $red; }
+
 /* Rules for icons */
 
 .icon {
@@ -182,10 +167,6 @@ h6:first-child {
   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; }
@@ -200,6 +181,7 @@ h6:first-child {
 .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.gear        { background-position: -260px 0; }
@@ -209,6 +191,8 @@ h6:first-child {
 a {
   color: #00f;
   text-decoration: none;
+  -webkit-appearance: none;
+  outline: 0;
   &:hover {
     text-decoration: underline;
   }
@@ -234,7 +218,7 @@ table {
     line-height: $lineheight;
   }
   th {
-    font-weight: bold;
+    font-weight: 500;
     vertical-align: top;
   }
   td {
@@ -242,364 +226,218 @@ 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: url("/assets/menu-icon.png") no-repeat;
+  background-size: 30px 30px;
   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;
-}
-
-/* Rules for the site name */
-
-#small-title {
-  display: none;
-
-  img {
-    vertical-align: text-bottom;
-  }
+  width: 30px;
+  height: 30px;
+  margin: 14px 10px 0 0;
+  opacity: 0.6;
 }
 
-/* Rules for the introductory text displayed in the left sidebar to new users */
+header {
+  height: $headerHeight;
+  position: relative;
+  z-index: 1001;
+  font-size: 13px;
 
-.sidebar-copy {
-  padding: $lineheight/4 $lineheight/2;
-  p {
-    margin: $lineheight/4 0;
+  h1, nav, nav > ul, nav > ul > li, .dropdown {
+    display: inline-block;
   }
-}
-.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.
- */
 
-.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;
+  > * {
+    height: 100%;
+    padding: $lineheight/2 $lineheight;
   }
-}
 
-/*
- * 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.
- */
-
-.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;
+  h1, nav.primary {
+    float: left;
   }
-}
 
-/* Rules for the menu displayed in the left sidebar */
-
-.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;
+  a, a:hover {
+    text-decoration: none;
   }
 
-  ul {
-    padding: 0;
-    margin: 0;
+  img.logo {
+    width: 30px;
+    height: 30px;
+    margin-top: -4px;
+    vertical-align: middle;
   }
 
-  li {
-    list-style-type: none;
-    padding: 0;
+  h1 {
     margin: 0;
-  }
+    padding: ($lineheight - 3) $lineheight ($lineheight + 3);
 
-  h4 {
-    padding: $lineheight/4 0 $lineheight/4 0;
-    font-size: 12px;
-    margin: 0;
+    a {
+      color: #000;
+    }
   }
 }
 
-/*
- * 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.
- */
-
-.optionalbox {
-  left: 0px;
-  padding: $lineheight/4 $lineheight/2;
-  margin: $lineheight/4 0;
-  text-align: left;
-}
-
-/* Rules for the search box */
-
-#search_field {
-  position: relative;
-
-  form {
-    width: 165px;
-  }
-
-  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;
-
-    transition: 300ms linear;
-    -webkit-transition: 300ms linear;
-    -moz-transition: 300ms linear;
-  }
+nav.primary {
+  > ul {
+    $border: 1px solid $green;
 
-  input[type="text"]:focus {
-    box-shadow: 0px 0px 7px #9ED485;
-    outline: none;
-  }
+    border: $border;
+    border-radius: $border-radius;
 
-  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;
+    > li {
+      border-right: $border;
+      float: left;
+      &:last-child { 
+        border-right: 0;
+        > a { border-radius: 0 $border-radius $border-radius 0; } 
+      }
+      &:first-child > a { border-radius: $border-radius 0 0 $border-radius; }
+      > 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%); }
+      }
+    }
   }
-}
-
-.search_help {
-  margin: $lineheight/4 0 0 0;
-}
-
-/* Utility for de-emphasizing content */
 
-.deemphasize {
-  color: #999;
-  a {
-    color: $blue;
+  a.tab,
+  .dropdown-toggle {
+    display: inline-block;
+    font-weight: 500;
+    color: $green;
+    padding: 5px 15px;
   }
-}
-
-/* Rules for donation request box */
-
-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;
+  .dropdown-toggle {
+    padding: 5px 6px;
   }
-}
-
-/* Rules for Creative Commons logo button */
-
-#cclogo {
-  margin: $lineheight/2 0;
-  float: right;
-}
-
-/* Rules for tabbed navigation bar */
-
-#top-bar {
-  position: relative;
-  margin-left: 185px;
-  height: 30px;
-  border-bottom: 1px solid #ccc;
-  background: white;
-  z-index: 1001;
 
   .caret {
+    border-top-color: $green;
     margin-top: 10px;
   }
-}
-
-.site-edit #top-bar,
-.site-index #top-bar,
-.site-export #top-bar {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-}
-
-#tabnav {
-  height: 29px;
-  margin-bottom: 0;
 
-  > li {
-    float: left;
+  .disabled a {
+    color: #ccc;
+    cursor: default;
 
-    > * {
-      padding: 3px $lineheight/2;
+    .caret {
+      border-top-color: #ccc;
     }
   }
 
-  a.tab {
-    display: inline-block;
-    font-weight: bold;
-    text-decoration: none;
-    color: #333;
+  > ul li.current {
+    background-color: $green;
 
-    -webkit-transition: color 200ms ease-in;
-       -moz-transition: color 200ms ease-in;
-         -o-transition: color 200ms ease-in;
-            transition: color 200ms ease-in;
+    .tab {
+      color: #fff;
+    }
 
-    &:hover {
-      text-decoration: underline;
+    .caret {
+      border-top-color: #fff;
     }
   }
+}
 
-  .disabled a {
-    color: #ccc;
-    cursor: default;
+nav.secondary {
+  position: absolute;
+  right: 0;
 
-    &:hover {
+  > ul {
+    vertical-align: middle;
+    a, .dropdown-toggle {
+      display: inline-block;
       text-decoration: none;
-    }
+      color: $darkgrey;
+      padding: 5px;
 
-    .caret {
-      border-top-color: #ccc;
+      &:hover { color: darken($darkgrey, 10%); }
     }
   }
 
-  .dropdown {
-    height: 29px;
+  > ul li.current a {
+    color: darken($darkgrey, 25%);
   }
-}
 
-.site-index #view_tab,
-.site-edit #edit_tab,
-.changeset-list #history_tab {
-  background: #9ed485;
-  color: #000;
-}
+  .user-menu {
+    $border: 1px solid $grey;
 
-/* Utility for styling notification numbers */
+    font-weight: 500;
+    border: $border;
+    border-radius: $border-radius;
+    margin-left: 10px;
 
-.count-number {
-  padding: 2px $lineheight/4;
-  border-radius: 2px;
-  background: #d7d7ff;
-  margin: 0 2px;
-  font-size: 11px;
-  color: #333;
-}
+    > li {
+      border-right: $border;
+      float: left;
+      &:last-child { 
+        border-right: 0;
 
-/* Rules for greeting bar in the top right corner */
+        > 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%); }
+    }
 
-#greeting {
-  float: right;
-  height: 100%;
+    a {
+      padding: 5px 15px;
 
-  &.secondary-actions {
-    padding: 3px $lineheight/2;
-  }
+    }
 
-  &.dropdown {
-    background-color: #EEE;
-    &:hover {
-      background-color: #CCC;
+    &.logged-in > a {
+      padding: 0;
+      > .user-button {
+        padding: 5px 10px 5px 6px;
+        display: inline-block;
+        color: $darkgrey;
+      }
+      &:hover > .user-button { color: darken($darkgrey, 5%); }
     }
   }
 
-  img {
-    vertical-align: top;
-    border-radius: 2px 0 0 2px;
-    margin-right: 5px;
+  .caret {
+    border-top-color: $grey;
+    margin-top: 9px;
   }
 
-  #inboxanchor {
-    display: inline-block;
-    position: relative;
-    height: 20px;
-    top: -2px;
-    margin: 0 2px 0 0;
-    padding: 0 5px 0 0;
+  img.user_thumbnail_tiny {
+    border: 0;
+    vertical-align: top;
+    margin-top: 0px;
+    margin: 3px 0 0 3px;
     border-radius: 2px;
   }
 
-  .dropdown-toggle {
-    display: block;
-    padding: 3px 7px;
-    color: #000;
-    text-decoration: none;
+  #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;
   }
 
   .dropdown-menu {
     left: auto;
-    right: 0;
+    right: -1px;
+    border-radius: 3px 0 3px 3px;
 
     .count-number {
       float: right;
@@ -609,18 +447,48 @@ a.donate {
   }
 }
 
-/* Rules for the message shown in place of the map when javascript is disabled */
-
-#noscript {
-  z-index: 20000000;
-  position: absolute;
-  top: 15px;
-  left: 15px;
+#compact-secondary-nav {
+  display: none;
+  ul li a {
+    width: 100%;
+    color: #333;
+    &:hover { color: #fff; }
+  }
 }
 
-/* Rules for bootstrap tooltips */
-
-.tooltip {
+@media only screen and (max-width:960px) {
+  #compact-secondary-nav {
+    display: inline-block;
+  }
+  .compact-hide {
+    display: none;
+  }
+}
+
+
+/* Utility for styling notification numbers */
+
+.count-number {
+  padding: 2px $lineheight/4;
+  border-radius: 2px;
+  background: lighten($green, 30%);
+  margin: 0 2px;
+  font-size: 11px;
+  color: #333;
+}
+
+/* Rules for the message shown in place of the map when javascript is disabled */
+
+#noscript {
+  z-index: 20000000;
+  position: absolute;
+  top: 15px;
+  left: 15px;
+}
+
+/* Rules for bootstrap tooltips */
+
+.tooltip {
   position: absolute;
   display: none;
   color: #333;
@@ -710,7 +578,6 @@ a.donate {
   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;
@@ -740,83 +607,178 @@ a.donate {
   border-radius: 4px 0 0 0;
 }
 
-.site .leaflet-control .zoomout,
+.leaflet-control .zoomout,
 .control-key .control-button {
   margin-bottom: 0;
   border-radius: 0;
 }
 
-.leaflet-control .zoomout, // For non-main page maps
 .control-locate .control-button,
 .control-share .control-button {
   border-radius: 0 0 0 4px;
 }
 
-/* Rules for the home page */
+/* Rules for the sidebar and main map area */
 
-.site-export #map,
-.site-index #map,
-.site-edit #map {
-  height: 100%;
-  overflow: hidden;
-}
+.map-layout {
+  #content {
+    position: absolute;
+    top: $headerHeight;
+    bottom: 0;
+    width: 100%;
+  }
 
-#map-ui {
-  display: none;
-  position: relative;
-  float: right;
-  width: 250px;
-  height: 100%;
-  background: white;
-  border-left: 1px solid #CCC;
-  overflow: auto;
+  #sidebar, #map {
+    position: relative;
+    height: 100%;
+    overflow-x: hidden;
+    overflow-y: auto;
+  }
+
+  #sidebar {
+    float: left;
+    width: $sidebarWidth;
+
+    h2, h3, h4 {
+      padding: $lineheight $lineheight $lineheight/2;
+    }
+
+    h4, span.user, span.date {
+      font-weight: normal;
+      color: #666;
+      font-size: 12px;
+    }
+
+    .icon.close {
+      position: absolute;
+      right: $lineheight;
+      cursor: pointer;
+    }
+
+    .footer {
+      position: absolute;
+      bottom: 0;
+    }
+
+    p.credits {
+      font-size: 11px;
+      color: #999;
+
+      a {
+        color: #666;
+      }
+    }
+
+    p.large-text {
+      font-size: 1.7em;
+      line-height: 1.4em;
+      font-weight: 300;
+    }
+  }
+
+  #sidebar.minimized {
+    position: absolute;
+    z-index: 1000;
+    height: auto;
+    border-right: none;
+
+    #sidebar_content {
+      display: none;
+    }
 
-  .section {
-    border-bottom: 1px solid #DDD;
-    padding: 15px;
+    #search_form {
+      background: none;
+      width: 78%;
+    }
   }
 
-  a.close-button {
+  #map {
+    height: 100%;
+    overflow: hidden;
+  }
+
+  #map-ui {
+    display: none;
+    position: relative;
     float: right;
-    padding:5px;
-    font-size:20px;
-    line-height:10px;
-    color:#222;
-    border:1px solid #ddd;
+    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;
+    }
   }
 }
 
 .layers-ui,
 .share-ui {
-  ul, li:last-child, p:last-child {
+  li:last-child {
     margin-bottom: 0;
   }
 }
 
 .layers-ui {
-  li {
-    border-radius: 4px;
-    overflow: hidden;
-    margin-bottom: 10px;
-  }
-
-  label {
-    display: block;
-    padding: 5px 5px 5px 7px;
-    background-color: #eee;
-    cursor: pointer;
-  }
-
-  li.active label {
-    background-color: #ccc;
-  }
-
   .base-layers {
     .leaflet-container {
       width: 100%;
       height: 50px;
       cursor: pointer;
     }
+
+    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: 500;
+        font-size: 16px;
+        text-stroke: 2px #fff;
+        background: rgba(255,255,255,.9);
+        text-shadow:
+         -2px -2px 1px #fff,  
+          2px -2px 1px #fff,
+          -2px 2px 1px #fff,
+           2px 2px 1px #fff;
+        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;
+    }
   }
 }
 
@@ -876,7 +838,7 @@ a.donate {
 }
 
 .leaflet-top.leaflet-right {
-  top: $lineheight/2 !important;
+  top: $lineheight !important;
   .leaflet-control {
     margin-right: 0px !important;
     margin-top: 0px !important;
@@ -894,34 +856,6 @@ a.donate {
   -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 {
@@ -937,59 +871,121 @@ a.donate {
   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;
-  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 {
+#sidebar_content {
   position: absolute;
-  height: $lineheight;
-  top: 0px;
+  top: 50px;
   bottom: 0;
-  right: $lineheight;
-  margin: auto;
+  width: 100%;
+  overflow-y: auto;
+
+  .loader,
+  .load_more {
+    text-align: center;
+    margin: $lineheight auto;
+    width: $lineheight;
+    display: block;
+  }
 }
 
-#sidebar_content {
+/* Rules for the search box */
+
+#search_form {
   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 $lineheight;
+  background-color: $lightgrey;
+
+  #query_wrapper {
+    position: relative;
+    overflow: hidden;
+  }
+
+  input {
+    width: 100%;
+    height: 30px;
+    border-right: none;
+    border-radius: 2px 0 0 2px;
+
+    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;
+  }
+
+  #describe_location {
+    position: absolute;
+    top: 6px;
+    right: 6px;
+    font-size: 10px;
+    color: $blue;
+  }
+}
+
+/* Rules for donation request box */
+
+a.donate {
+  display: block;
+  padding: $lineheight/4 $lineheight;
+  border: 1px solid $green;
+  font-size: $typeheight;
+  line-height: 1.4;
+  text-align: center;
+  border-radius: 2px;
+  color: #222;
+  margin: $lineheight/2 $lineheight;
+
+  &:hover {
+    background: $green;
+    text-decoration: none;
+  }
+}
+
+/* Rules for rotating sidebar ads */
+
+.ad-container {
+  display: block;
+  height: 120px;
+  margin: auto;
+  overflow: hidden;
+  position: relative;
+  border-bottom: 1px solid #ccc;
+
+  a {
+    display: block;
+    width: 165px;
+    margin: auto;
+  }
+
+  .ad {
+    height: 100px;
+    border: 0;
+    background: #fff;
   }
 }
 
@@ -1008,13 +1004,11 @@ a.donate {
 
 /* Rules for search results which appear in the popout sidebar */
 
-.search_searching {
-  margin-top: $lineheight/4;
-  margin-bottom: $lineheight/4;
-}
-
 .search_results_entry {
-  margin-bottom: 0;
+  ul li {
+    border-bottom: $keyline;
+    &:first-child { border-top: $keyline; }
+  }
 
   .search_details {
     display: block;
@@ -1025,15 +1019,6 @@ a.donate {
   }
 }
 
-.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;
 }
@@ -1059,14 +1044,107 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   }
 }
 
-.browse_details {
-  position: relative;
+/* Rules for entity history */
+#sidebar_content {
+  .browse_details {
+    position: relative;
+    border-bottom: $keyline;
+  }
 }
 
 .browse_status {
   display: none;
 }
 
+/* Rules for the changeset list shown by the history tab */
+
+#sidebar .changesets {
+  li {
+    padding: $lineheight;
+    border-bottom: $keyline;
+    cursor: pointer;
+
+    &.selected { background: #FFFFE6; }
+    /* color is derived from changeset bbox fillColor in history.js */
+  }
+
+  .comment a {
+    font-weight: 500;
+    color: #000;
+  }
+}
+
+/* Rules for the data browser */
+
+#sidebar_content {
+  .browse-section {
+    padding: 10px 20px;
+
+    h4 {
+      padding: 0;
+    }
+  }
+
+  .paginate ul, .note-comments ul {
+    padding-left: 20px;
+  }
+
+  .browse-field {
+    margin-bottom: 10px;
+
+    h4 {
+      padding: 5px 0 5px 10px;
+      font-size: 12px;
+      border: 1px solid #CCC;
+      border-radius: 4px 4px 0 0;
+      background-color: #F6F6F6;
+    }
+
+    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 {
+    border-top: 1px solid #ddd;
+    border-bottom: 1px solid #ddd;
+    font-size: 12px;
+    margin-left: -$lineheight;
+    margin-right: -$lineheight;
+
+    li {
+      border-bottom: 1px solid #ddd;
+    }
+
+    li:last-child {
+      border-bottom: 0;
+    }
+
+    .browse-tag-k,
+    .browse-tag-v {
+      display: inline-block;
+      width: 50%;
+      height: 30px;
+      float: left;
+      padding: 6px 10px 6px $lineheight;
+    }
+
+    .browse-tag-k {
+      font-weight: 500;
+      background-color: #F6F6F6;
+    }
+
+    .browse-tag-v {
+      border-left: 1px solid #ddd;
+    }
+  }
+}
+
 /* Rules for export information which appears in the popout sidebar */
 
 .export_bounds {
@@ -1085,33 +1163,72 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   margin: $lineheight/4;
 }
 
-/* Rules for the main content area */
+#export_osm {
+  span.small-title { 
+    font-weight: 500;
+    display: block;
+    font-size: 14px;
+    padding-bottom: 5px; 
+  }
+
+  dl {
+    padding-left: 30px;
+    font-size: 13px;
+    color: #666;
+    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%;
+  }
+}
+
+/* Rules for non-map content pages */
+
+.content-heading {
+  background: $lightgrey;
+  
+  h1 { font-size: 22px; }
+}
+
+.content-body {
+  h1, h2, h3, p {
+    margin-bottom: $lineheight;
+  }
+
+  h1, h2, h3 {
+    margin-top: $lineheight/2;
+  }
+}
 
-#content {
+.content-inner {
   position: relative;
+  max-width: 900px;
+  margin: auto;
   padding: $lineheight;
 }
 
-.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;
-}
-
 /* Overrides for pages that use new layout conventions */
+
 .user-new,
 .user-create,
-.user-terms,
-.user-confirm,
-.site-copyright,
-.site-welcome,
-.site-help {
-  #content {
-    max-width: 740px;
+.user-terms {
+  .content-body .content-inner {
+    padding: 0;
   }
 }
 
@@ -1119,19 +1236,11 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 .user-create,
 .user-terms,
 .user-confirm {
-  .content-heading {
+  .content-heading .content-inner {
     height: 200px;
   }
 }
 
-.user-new,
-.user-create,
-.user-terms {
-  #content {
-    padding: 0;
-  }
-}
-
 .header-illustration {
   background-position: 0 0;
   background-repeat: no-repeat;
@@ -1159,19 +1268,10 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     left: 260px;
     top: 160px;
     background-image: image-url("sign-up-illustration-arm.png");
+    z-index: 100;
   }
 }
 
-@media only screen and (max-width:900px) {
-  .header-illustration.new-user-arm { display: none;}
-}
-
-.wrapper {
-  margin-left: 184px;
-  border-left: 1px solid #ccc;
-  text-align: left;
-}
-
 #content.maximised {
   top: 0;
   left: 0;
@@ -1217,24 +1317,6 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   }
 }
 
-.content-heading {
-  position: relative;
-  padding: $lineheight;
-  background: $offwhite;
-  z-index: 2;
-  h1, h2 {
-    margin-bottom: $lineheight/2;
-    line-height: 100%;
-    &:last-child {
-      margin-bottom: 0;
-    }
-  }
-  p {
-    margin-top: $lineheight/2;
-    margin-bottom: 0px;
-  }
-}
-
 /* Rules for small maps in content areas */
 
 .content_map {
@@ -1246,117 +1328,6 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   float: right;
 }
 
-.content_map #small_map {
-  height: 100%;
-  width: 100%;
-  margin-bottom: $lineheight;
-}
-
-/* Rules for the changeset list shown by the history tab etc */
-
-#changeset_list {
-  width: 100%;
-  ul {
-    padding: $lineheight/2 0;
-    margin-bottom: 0px;
-    border-top: 1px solid #ccc;
-    &:last-child {
-      border-bottom: 1px solid #ccc;
-    }
-  }
-  .selected {
-    background: #FFFFC0;
-  }
-  .date,
-  .user {
-    border-left: 1px solid #ccc;
-    padding-left: $lineheight/4;
-    margin-right: $lineheight/4;
-  }
-}
-
-#changeset_list_map_wrapper {
-  position: absolute;
-  width: 50%;
-  height: 490px;
-  top: 0;
-  right: 0;
-}
-
-#changeset_list_map_wrapper.scrolled {
-  position: fixed;
-}
-
-#changeset_list_map {
-  position: absolute;
-  bottom: $lineheight;
-  top: $lineheight;
-  right: $lineheight;
-  left: $lineheight;
-  border: 1px solid #ccc;
-}
-
-#changeset_list_map_wrapper.scrolled #changeset_list_map {
-  margin-left: 93px;
-}
-
-/* Rules for the data browser */
-
-.browse-section {
-  border-top: 1px solid #ccc;
-  margin-top: $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;
-  }
-  ul, .bbox, .geo {
-    display: inline-block;
-    vertical-align: top;
-    max-width: 65%;
-  }
-  ul p {
-    margin-left: 0;
-    margin-bottom: 0;
-  }
-  h4 {
-    float: left;
-    width: 33.3333%;
-    display: inline-block;
-    vertical-align: top;
-  }
-}
-
-.bbox {
-  div {
-    width: 33.3333%;
-    text-align: center;
-    padding: $lineheight/4 0;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    float: left;
-  }
-  .max_lat,
-  .min_lat {
-    margin-left: auto;
-    margin-right: auto;
-    width: 100%;
-  }
-}
-
-#browse_map .secondary-actions {
-  display: none;
-  margin-bottom: $lineheight/2;
-}
-
 /* Rules for the trace list shown by the traces tab etc */
 
 #trace_list {
@@ -1495,46 +1466,40 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 /* Rules for the diary list page */
 
-.diary_entry-list img.user_thumbnail {
-  float: left;
-}
-
 .diary_post {
-  max-width: 740px;
   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;
   }
-  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: $lineheight;
-  h2 {
-    margin-top: 0;
-    margin-bottom: $lineheight/2;
-    font-size: 24px;
-  }
-}
-
 /* Rules for the diary entry page */
 
 .diary_entry {
@@ -1597,19 +1562,6 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     margin-bottom: $lineheight;
     overflow: auto;
     height: 10em;
-
-    &:p#last {
-      margin-bottom: 0px;
-    }
-
-    &:ol {
-      margin-bottom: 0px;
-    }
-
-    &:img {
-      display: block;
-      margin: $lineheight auto inherit auto;
-    }
   }
 
   #decline {
@@ -1755,17 +1707,19 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 /* 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 */
@@ -1798,7 +1752,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   h2 {
     margin: 0 -10px 10px -10px;
     padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;
-    font-weight: bold;
+    font-weight: 500;
     font-size: 12px;
     background-color: #c00;
     color: #fff;
@@ -1831,7 +1785,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     display: block;
     margin-bottom: $lineheight/4;
     font-size: $typeheight;
-    font-weight: bold;
+    font-weight: 500;
     line-height: 1.5;
   }
   label.standard-label.secondary {
@@ -1919,12 +1873,6 @@ img.user_thumbnail_tiny {
   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 {
@@ -1935,7 +1883,7 @@ abbr.geo {
 
 .rsssmall {
   position: relative;
-  top: 5px;
+  top: 3px;
 }
 
 /* General styles for action lists / subnavs / pager navs */
@@ -1953,8 +1901,8 @@ ul.secondary-actions {
     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;
@@ -1963,10 +1911,12 @@ ul.secondary-actions {
       margin-right: 0px;
     }
   }
-  .dropdown-menu {
-    left: auto;
-    right: 0;
-  }
+}
+
+div.secondary-actions {
+  padding: 10px;
+  border-top: 1px solid #ccc;
+  text-align: center;
 }
 
 /* Utility for managing inner content areas */
@@ -2064,7 +2014,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;
-    border-right-width: 1px solid white;
+    border-right-width: 1px;
   }
 }
 
@@ -2306,53 +2256,13 @@ a.button {
   }
 }
 
-/*
- * Rules for the iD editor
- */
-
-.site-edit-id {
-  #left,
-  #large-title {
-    display: none;
-  }
-
-  #small-title {
-    display: inline-block;
-    width: 185px;
-    height: 30px;
-    font-size: 14px;
-    margin: 0;
-    background-color: #eee;
-    border-bottom: 1px solid #ccc;
-    text-align: center;
-    padding-top: 7px;
-  }
-
-  #content {
-    left: 0;
-  }
-}
+/* Rules for the iD editor */
 
 .id-embed {
   width: 100%;
   height: 100%;
 }
 
-/* Rules for rotating sidebar ads */
-.ad-container {
-  display: block;
-  height: 120px;
-  overflow: hidden;
-  position: relative;
-  border-bottom: 1px solid #ccc;
-}
-
-.ad {
-  height: 100px;
-  border: 0;
-  background: #fff;
-}
-
 /* Rules for dropdown menus */
 
 .dropdown {
@@ -2387,7 +2297,7 @@ a.button {
 .dropdown-menu {
   position: absolute;
   top: 100%;
-  left: 0;
+  left: -1px;
   z-index: 1000;
   display: none;
   float: left;
@@ -2397,6 +2307,7 @@ a.button {
   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);
@@ -2438,7 +2349,7 @@ a.button {
 .dropdown-submenu:focus > a {
   color: #ffffff;
   text-decoration: none;
-  background-color: #0081c2;
+  background-color: $green;
 }
 
 .dropdown-menu > .active > a,
@@ -2446,7 +2357,7 @@ a.button {
 .dropdown-menu > .active > a:focus {
   color: #ffffff;
   text-decoration: none;
-  background-color: #0081c2;
+  background-color: $green;
   outline: 0;
 }
 
@@ -2561,42 +2472,151 @@ a.button {
   }
 }
 
-.site-help {
-  #content {
-    a {
-      display: inline-block;
-      width: 45%;
-      height: 200px;
-      float: left;
-      text-align: center;
-      color: #000;
-      margin: 10px;
-      padding: 10px;
-      border-radius: 10px;
-    }
+.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;
+  }
+
+  .caption a {
+    color: white;
+    white-space: nowrap;
+    text-decoration: none;
+  }
+
+  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);
+  }
+
+  .content-inner {
+    position: relative;
+    color: #333;
+    min-width: 320px;
+    max-width: 640px;
 
-    h3 {
-      margin-top: 50px;
+    .section {
+      margin-bottom: 30px;
     }
 
-    a:hover {
-      text-decoration: none;
+    .section:last-child {
+      margin-bottom: 0;
     }
+  }
+
+  .text {
+    background: white;
+    padding: 40px;
+  }
+
+  .attr {
+    position: relative;
+    padding: 170px 40px 20px;
+    background: #333;
+    background: rgba(0, 0, 0, .8);
+    margin-bottom: 0;
+    margin-top: -20px;
 
-    .welcome {
-      background-color: #D6FFB9;
+    h1 {
+      display: block;
+      color: white;
+      font-weight: 300;
+      font-size: 34px;
+      span {
+        color: #76c551;
+      }
     }
 
-    .learnosm {
-      background-color: #BAFCFF;
+    .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;
     }
 
-    .help {
-      background-color: #FCFFB9;
+    .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;
     }
 
-    .wiki {
-      background-color: #FFB9CC;
+    .byosm span {
+      display: inline-block;
+      width: 20px;
+      margin-left: -20px;
     }
   }
+
+  h2 {
+    margin-bottom: 10px;
+  }
+
+  .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; }
+    &.contributors { background-position: 0px -120px; }
+    &.infringement { background-position: 0px -160px; }
+  }
+}
+
+@import 'browse';
+
+@media only screen and (max-width:960px) {
+  .header-illustration.new-user-arm {
+    display: none;
+  }
 }
+