Merge branch 'redesign' of https://github.com/osmlab/openstreetmap-website into redesign

[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 7395afc99845579160029f4be90739cc56dd9e8d..66cbb5d2ab1f331f5b7471be30e79652bc16c524 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -7,12 +7,14 @@ $blue: #7092FF;
 $lightblue: #B8C5F0;
 $green: #7ebc6f;
 $grey: #CCC;
 $lightblue: #B8C5F0;
 $green: #7ebc6f;
 $grey: #CCC;

+$red: red;

 $lightgrey: #EEE;
 $darkgrey: #AAA;
 $hovercolor: 20%;
 $lightgrey: #EEE;
 $darkgrey: #AAA;
 $hovercolor: 20%;

-$headerHeight: 75px;
-$sidebarWidth: 350px;
-$keyline: 1px solid $grey;
+$headerHeight: 54px;
+$sidebarWidth: 300px;
+$keyline: 1px solid $lightgrey;
+$border-radius: 3px;

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


@@ -50,6 +52,8 @@ abbr, acronym {
   cursor: help;
 }
 
   cursor: help;
 }
 

+strong { font-weight: 500; }
+

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


@@ -97,9 +101,9 @@ abbr, acronym {
 /* 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 {


@@ -118,10 +122,12 @@ body.slim {
 }
 
 h1, h2, h3 {
 }
 
 h1, h2, h3 {

-  font-weight: bold;
+  font-weight: 500;

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

+h4, h5 { font-weight: 500; }
+

 h1 {
   font-size: 18px;
 }
 h1 {
   font-size: 18px;
 }


@@ -130,10 +136,6 @@ h2, h3 {
   font-size: 16px;
 }
 
   font-size: 16px;
 }
 

-p {
-  margin-bottom: $lineheight;
-}
-

 p > img {
   width: auto;
   max-width: 100%;
 p > img {
   width: auto;
   max-width: 100%;


@@ -143,15 +145,6 @@ 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;
-}
-

 .column-1 {
   width: 50%;
   margin: 0 0 $lineheight/2 0;
 .column-1 {
   width: 50%;
   margin: 0 0 $lineheight/2 0;


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

+.red { color: $red; }
+

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


@@ -172,10 +167,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; }


@@ -199,6 +190,8 @@ h6:first-child {
 a {
   color: #00f;
   text-decoration: none;
 a {
   color: #00f;
   text-decoration: none;

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

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


@@ -224,7 +217,7 @@ table {
     line-height: $lineheight;
   }
   th {
     line-height: $lineheight;
   }
   th {

-    font-weight: bold;
+    font-weight: 500;

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


@@ -232,42 +225,6 @@ table {
   }
 }
 
   }
 }
 

-/* Rules for the search box */
-
-#search_form {
-  position: relative;
-  padding: $lineheight;
-  background-color: $lightgrey;
-  border-bottom: $keyline;
-
-  #query_wrapper {
-    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;
-  }
-}
-

 /* Utility for de-emphasizing content */
 
 .deemphasize {
 /* Utility for de-emphasizing content */
 
 .deemphasize {


@@ -277,34 +234,14 @@ table {
   }
 }
 
   }
 }
 

-/* 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 auto;
-
-  &:hover {
-    background: #9ed485;
-    text-decoration: none;
-  }
-}
-

 /* Rules for the header */
 
 header {
   height: $headerHeight;
   position: relative;
 /* Rules for the header */
 
 header {
   height: $headerHeight;
   position: relative;

-  border-bottom: $keyline;
+  // border-bottom: $keyline;

   z-index: 1001;
   z-index: 1001;

+  font-size: 13px;

 
   h1, nav, nav > ul, nav > ul > li, .dropdown {
     display: inline-block;
 
   h1, nav, nav > ul, nav > ul > li, .dropdown {
     display: inline-block;


@@ -312,79 +249,94 @@ header {
 
   > * {
     height: 100%;
 
   > * {
     height: 100%;

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

   }
 
   h1, nav.primary {
     float: left;
   }
 
   }
 
   h1, nav.primary {
     float: left;
   }
 

+  a, a:hover {
+    text-decoration: none;
+  }
+

   img.logo {
     width: 30px;
     height: 30px;
   img.logo {
     width: 30px;
     height: 30px;

+    margin-top: -4px;

     vertical-align: middle;
   }
 
   h1 {
     margin: 0;
     vertical-align: middle;
   }
 
   h1 {
     margin: 0;

-    border-right: $keyline;
+    padding: ($lineheight - 3) $lineheight ($lineheight + 3);
+
+    a {
+      color: #000;
+    }

   }
 }
 
 nav.primary {
   > ul {
   }
 }
 
 nav.primary {
   > ul {

-    border: 1px solid darken($green, 20%);
-    border-radius: 4px;
+    $border: 1px solid $green;
+
+    border: $border;
+    border-radius: $border-radius;
+
+    > li {
+      border-right: $border;
+      &: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%); }
+      }
+    }

   }
 
   }
 

-  a.tab {
+  a.tab,
+  .dropdown-toggle {

     display: inline-block;
     display: inline-block;

-    font-weight: bold;
-    text-decoration: none;
+    font-weight: 500;

     color: $green;
     padding: 5px 15px;
     color: $green;
     padding: 5px 15px;

-    border-right: 1px solid darken($green, 20%);
-  }
-
-  #edit_tab a.tab {
-    border-right: 1px solid lighten($green, 20%);

   }
 
   .dropdown-toggle {
   }
 
   .dropdown-toggle {

-    padding: 5px 10px 5px 5px;
+    padding: 5px 6px;

   }
 
   .caret {
   }
 
   .caret {

-    margin-top: 15px;

     border-top-color: $green;
     border-top-color: $green;

+    margin-top: 10px;

   }
 
   .disabled a {
     color: #ccc;
     cursor: default;
 
   }
 
   .disabled a {
     color: #ccc;
     cursor: default;
 

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

     .caret {
       border-top-color: #ccc;
     }
   }
     .caret {
       border-top-color: #ccc;
     }
   }

-}

 
 

-.site-index #view_tab,
-.changeset-list #history_tab,
-.site-export #export_tab,
-.site-edit #edit_tab {
-  background-color: $green;
+  > ul li.current {
+    background-color: $green;

 
 

-  .tab {
-    color: #fff;
-  }
+    .tab {
+      color: #fff;
+    }

 
 

-  .caret {
-    border-top-color: #fff;
+    .caret {
+      border-top-color: #fff;
+    }

   }
 }
 
   }
 }
 


@@ -392,39 +344,75 @@ nav.secondary {
   position: absolute;
   right: 0;
 
   position: absolute;
   right: 0;
 

-  > ul a {
-    font-weight: bold;
+  > ul a,
+  .dropdown-toggle {
+    display: inline-block;

     text-decoration: none;
     color: $darkgrey;
     text-decoration: none;
     color: $darkgrey;

-    padding-right: 10px;
+    padding: 5px;
+
+    &:hover { color: darken($darkgrey, 10%); }

   }
 
   }
 

-  .dropdown {
-    border: 1px solid $grey;
-    border-radius: 4px;
+  > ul li.current a {
+    color: darken($darkgrey, 25%);

   }
 
   }
 

-  img {
-    vertical-align: top;
-    border-radius: 2px 0 0 2px;
-    margin-right: 5px;
+  .user-menu {
+    $border: 1px solid $grey;
+
+    font-weight: 500;
+    border: $border;
+    border-radius: $border-radius;
+    margin-left: 10px;
+
+    > li {
+      border-right: $border;
+      &: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; }
+      &:hover a { background: lighten($darkgrey, 30%); }
+    }
+
+    a {
+      padding: 5px 15px;
+    }
+
+    &.logged-in > a {
+      padding: 0;
+      > .user-button {
+        padding: 5px 10px 5px 6px;
+        display: inline-block;
+      }
+    }

   }
 
   }
 

-  #inboxanchor {
-    display: inline-block;
-    position: relative;
-    height: 20px;
-    top: -2px;
-    margin: 0 2px 0 0;
-    padding: 0 5px 0 0;
+  .caret {
+    border-top-color: $grey;
+    margin-top: 9px;
+  }
+
+  img.user_thumbnail_tiny {
+    border: 0;
+    vertical-align: top;
+    margin-top: 0px;
+    margin: 3px 0 0 3px;

     border-radius: 2px;
   }
 
     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 {
   }
 
   .dropdown-menu {


@@ -551,7 +539,6 @@ nav.secondary {
   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;


@@ -592,60 +579,149 @@ nav.secondary {
   border-radius: 0 0 0 4px;
 }
 
   border-radius: 0 0 0 4px;
 }
 

-/* Rules for the home page */
+/* Rules for the sidebar and main map area */

 
 

-#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;
-  overflow: auto;
+  #sidebar, #map {
+    position: relative;
+    height: 100%;
+    overflow-x: hidden;
+    overflow-y: auto;
+  }
+
+  #sidebar {
+    float: left;
+    width: $sidebarWidth;
+    border-right: $keyline;
+
+    h2, h3, h4 {
+      padding: $lineheight $lineheight $lineheight/2;
+    }
+
+    h4 {
+      font-weight: normal;
+      color: #666;
+      font-size: 12px;
+    }
+
+    .icon.close {
+      position: absolute;
+      right: $lineheight;
+    }
+
+    .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;
+    }
+
+    #search_form {
+      background: none;
+      width: 78%;
+    }
+  }

 
 

-  .section {
-    border-bottom: 1px solid #DDD;
-    padding: 15px;
+  #map {
+    height: 100%;
+    overflow: hidden;

   }
 
   }
 

-  a.close-button {
+  #map-ui {
+    display: none;
+    position: relative;

     float: right;
     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 {
   }
 }
 
 .layers-ui,
 .share-ui {

-  ul, li:last-child, p:last-child {
+  li:last-child {

     margin-bottom: 0;
   }
 }
 
 .layers-ui {
   li {
     margin-bottom: 0;
   }
 }
 
 .layers-ui {
   li {

-    border-radius: 4px;

     overflow: hidden;
     overflow: hidden;

-    margin-bottom: 10px;
+    border-radius: 3px;
+    border: 3px solid #fff;
+    margin-bottom: 8px;
+    position: relative;
+    transition: border-color 0.08s ease-in;

   }
 
   label {
   }
 
   label {

-    display: block;
-    padding: 5px 5px 5px 7px;
-    background-color: #eee;
+    position: absolute;
+    top: 12px;
+    left: 10px;

     cursor: pointer;
     cursor: pointer;

+    font-weight: 500;
+    font-size: 16px;
+    text-stroke: 2px #fff;
+    text-shadow:
+     -2px -2px 1px #fff,  
+      2px -2px 1px #fff,
+      -2px 2px 1px #fff,
+       2px 2px 1px #fff;
+  }
+
+  li.active {
+    border-color: darken($green, 10%);

   }
 
   }
 

-  li.active label {
-    background-color: #ccc;
+  li:hover {
+    border-color: $grey;
+    &.active { border-color: darken($green, 20%); }

   }
 
   .base-layers {
   }
 
   .base-layers {


@@ -713,7 +789,7 @@ nav.secondary {
 }
 
 .leaflet-top.leaflet-right {
 }
 
 .leaflet-top.leaflet-right {

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

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


@@ -731,25 +807,6 @@ nav.secondary {
   -webkit-border-radius: 4px !important;
 }
 
   -webkit-border-radius: 4px !important;
 }
 

-/* Rules for edit menu */
-
-.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 {


@@ -767,71 +824,120 @@ nav.secondary {
 
 /* Rules for the sidebar */
 
 
 /* Rules for the sidebar */
 

-#sidebar {
-  border-right: $keyline;
+.sidebar_heading {
+  position: relative;
+  padding: $lineheight/2 $lineheight;
+  // background: $offwhite;
+  // border-bottom: 1px solid #ccc;
+  > .close { 
+    float: right;
+    margin-top: 2px;
+    cursor: pointer; 
+  }
+}
+
+#sidebar_content {
+  position: absolute;
+  top: 50px;
+  bottom: 0;
+  width: 100%;
+  overflow-y: auto;

 
 

-  .alert {
-    background: #e00;
+  .loader,
+  .load_more {
+    text-align: center;
+    margin: $lineheight auto;
+    width: $lineheight;
+    display: block;

   }
   }

+}

 
 

-  h2, h3, h4 {
-    padding: $lineheight;
-    border-bottom: $keyline;
+/* Rules for the search box */
+
+#search_form {
+  position: relative;
+  padding: $lineheight/2 $lineheight;
+  background-color: $lightgrey;
+
+  #query_wrapper {
+    position: relative;
+    overflow: hidden;

   }
 
   }
 

-  h4 {
-    font-weight: normal;
+  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;

   }
 
   }
 

-  .icon.close {
-    position: absolute;
-    right: $lineheight;
+  input:focus {
+    outline: none;
+    box-shadow: 0px 0px 7px #9ED485;

   }
 
   }
 

-  p {
-    margin: 0;
+  input[type=submit] {
+    float: right;
+    width: auto;
+    min-width: 0;
+    border-radius: 0 2px 2px 0;

   }
 
   }
 

-  .footer {
+  #describe_location {

     position: absolute;
     position: absolute;

-    bottom: 0;
+    top: 6px;
+    right: 6px;
+    font-size: 10px;
+    color: $blue;

   }
   }

+}

 
 

-  p.credits {
-    font-size: 11px;
-    color: #999;
+/* Rules for donation request box */

 
 

-    a {
-      color: #666;
-    }
+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 auto;
+
+  &:hover {
+    background: #9ed485;
+    text-decoration: none;

   }
 }
 
   }
 }
 

-.sidebar_heading {
+/* Rules for rotating sidebar ads */
+
+.ad-container {
+  display: block;
+  height: 120px;
+  margin: auto;
+  overflow: hidden;

   position: relative;
   position: relative;

-  padding: $lineheight/2 $lineheight;
-  background: $offwhite;

   border-bottom: 1px solid #ccc;
   border-bottom: 1px solid #ccc;

-  h4 {
-    margin: 0;
-  }
-}

 
 

-.sidebar_close {
-  position: absolute;
-  height: $lineheight;
-  top: 0px;
-  bottom: 0;
-  right: $lineheight;
-  margin: auto;
-}
+  a {
+    display: block;
+    width: 165px;
+    margin: auto;
+  }

 
 

-#sidebar_content {
-  position: absolute;
-  top: 72px;
-  bottom: 0;
-  width: 100%;
-  overflow-y: auto;
+  .ad {
+    height: 100px;
+    border: 0;
+    background: #fff;
+  }

 }
 
 /* Rules for the map key which appears in the popout sidebar */
 }
 
 /* Rules for the map key which appears in the popout sidebar */


@@ -849,65 +955,156 @@ nav.secondary {
 
 /* Rules for search results which appear in the popout sidebar */
 
 
 /* Rules for search results which appear in the popout sidebar */
 

-.search_searching {
-  margin-top: $lineheight/4;
-  margin-bottom: $lineheight/4;
-}
-

 .search_results_entry {
 .search_results_entry {

-  .search_searching {
-    text-align: center;
-    margin: $lineheight auto;
-    width: $lineheight;
+  ul li {
+    border-bottom: $keyline;
+    &:first-child { border-top: $keyline; }
+  }
+
+  .search_details {

     display: block;
     display: block;

+    float: right;
+    text-align: right;
+    margin-top: 0.2em;
+    margin-left: 0.5em;

   }
   }

+}
+
+.search_results_error {
+  color: #f00;
+}
+
+/* Rules for data browser information which appears in the popout sidebar */

 
 

+#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 {
   ul li {

-    border-bottom: 1px solid #ccc;
+    margin-bottom: 0;
+  }
+}
+
+/* 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;

   }
 
   }
 

-  .search_details {
-    display: block;
-    float: right;
-    text-align: right;
-    margin-top: 0.2em;
-    margin-left: 0.5em;
+  li.selected {
+    background: #FCFEA4;
+  }
+}
+
+/* Rules for the data browser */
+
+#sidebar_content {
+  .browse-section {
+    padding: 10px 20px;
+
+    h4 {
+      padding: 0;
+    }
+  }
+
+  .paginate 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: 1px solid #CCC;
+    border-radius: 4px;
+    font-size: 12px;
+
+    li {
+      border-bottom: 1px solid #CCC;
+    }
+
+    li:last-child {
+      border-bottom: 0;
+    }
+
+    .browse-tag-k,
+    .browse-tag-v {
+      display: inline-block;
+      width: 50%;
+      height: 30px;
+      float: left;
+      padding: 6px 10px;
+    }
+
+    .browse-tag-k {
+      font-weight: 500;
+      background-color: #F6F6F6;
+      border-radius: 4px 0 0 4px;
+    }
+
+    .browse-tag-v {
+      border-left: 1px solid #CCC;
+    }

   }
 }
 
   }
 }
 

-.search_results_error {
-  color: #f00;
-}
+/* Rules for the changeset details */

 
 

-/* Rules for data browser information which appears in the popout sidebar */
+#sidebar_content {
+  .browse-section.header {
+    padding: 20px;
+    border-bottom: $keyline;

 
 

-#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;
+    h2 {
+      padding: 0 0 5px 0;
+      border-bottom: none;
+    }

   }
 }
 
   }
 }
 

-.browse_details {
-  position: relative;
-}
-
-.browse_status {
-  display: none;
-}
-

 /* Rules for export information which appears in the popout sidebar */
 
 .export_bounds {
 /* Rules for export information which appears in the popout sidebar */
 
 .export_bounds {


@@ -926,13 +1123,28 @@ nav.secondary {
   margin: $lineheight/4;
 }
 
   margin: $lineheight/4;
 }
 

-/* Rules for the sidebar and 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-index,
-.site-export,
-.site-edit,
-.changeset-list,
-.browse {
+.site-edit {

   #content {
     position: absolute;
     top: $headerHeight;
   #content {
     position: absolute;
     top: $headerHeight;


@@ -940,27 +1152,33 @@ nav.secondary {
     width: 100%;
   }
 
     width: 100%;
   }
 

-  #sidebar, #map {
-    position: relative;
+  #map {

     height: 100%;
     height: 100%;

-    overflow-x: hidden;
-    overflow-y: auto;
-  }
-
-  #sidebar {
-    float: left;
-    width: $sidebarWidth;

   }
 }
 
   }
 }
 

+/* Rules for non-map content pages */
+

 .content-heading {
 .content-heading {

-  position: relative;
-  padding: $lineheight;

   background: $lightgrey;
   background: $lightgrey;

-  border-bottom: $keyline;
+  
+  h1 { font-size: 22px; }

 }
 
 .content-body {
 }
 
 .content-body {

+  h1, h2, h3, p {
+    margin-bottom: $lineheight;
+  }
+
+  h1, h2, h3 {
+    margin-top: $lineheight/2;
+  }
+}
+
+.content-inner {
+  position: relative;
+  max-width: 900px;
+  margin: auto;

   padding: $lineheight;
 }
 
   padding: $lineheight;
 }
 


@@ -968,18 +1186,18 @@ nav.secondary {
 
 .user-new,
 .user-create,
 
 .user-new,
 .user-create,

-.user-terms,
-.user-confirm {
-  .content-heading {
-    height: 200px;
+.user-terms {
+  .content-body .content-inner {
+    padding: 0;

   }
 }
 
 .user-new,
 .user-create,
   }
 }
 
 .user-new,
 .user-create,

-.user-terms {
-  .content-body {
-    padding: 0;
+.user-terms,
+.user-confirm {
+  .content-heading .content-inner {
+    height: 200px;

   }
 }
 
   }
 }
 


@@ -1010,16 +1228,14 @@ nav.secondary {
     left: 260px;
     top: 160px;
     background-image: image-url("sign-up-illustration-arm.png");
     left: 260px;
     top: 160px;
     background-image: image-url("sign-up-illustration-arm.png");

+    z-index: 100;

   }
 }
 
 @media only screen and (max-width:900px) {
   }
 }
 
 @media only screen and (max-width:900px) {

-  .header-illustration.new-user-arm { display: none;}
-.wrapper {
-  margin-left: $sidebarWidth;
-  text-align: left;
-}
-
+  .header-illustration.new-user-arm {
+    display: none;
+  }

 }
 
 #content.maximised {
 }
 
 #content.maximised {


@@ -1078,88 +1294,6 @@ nav.secondary {
   float: right;
 }
 
   float: right;
 }
 

-/* Rules for the changeset list shown by the history tab */
-
-#sidebar .changesets {
-  li {
-    padding: $lineheight;
-    border-bottom: $keyline;
-  }
-
-  p {
-    padding: 0;
-  }
-}
-
-/* Rules for the data browser */
-
-body.browse #sidebar_content {
-  .browse-section {
-    padding: 20px;
-    border-bottom: 1px solid #CCC;
-
-    ul {
-      margin: 0;
-    }
-  }
-
-  .browse-field {
-    margin-bottom: 10px;
-
-    h4 {
-      margin: 0;
-      padding: 5px 0 5px 10px;
-      font-size: 12px;
-      border: 1px solid #CCC;
-      border-radius: 4px 4px 0 0;
-      background-color: #F6F6F6;
-    }
-
-    p {
-      margin: 0;
-      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: 1px solid #CCC;
-    border-radius: 4px;
-    font-size: 12px;
-
-    li {
-      border-bottom: 1px solid #CCC;
-    }
-
-    li:last-child {
-      border-bottom: 0;
-    }
-
-    .browse-tag-k,
-    .browse-tag-v {
-      display: inline-block;
-      width: 50%;
-      height: 30px;
-      float: left;
-      padding: 9px 10px;
-    }
-
-    .browse-tag-k {
-      font-weight: bold;
-      background-color: #F6F6F6;
-      border-radius: 4px 0 0 4px;
-    }
-
-    .browse-tag-v {
-      border-left: 1px solid #CCC;
-    }
-  }
-}
-

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


@@ -1298,46 +1432,40 @@ body.browse #sidebar_content {
 
 /* 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 {


@@ -1400,19 +1528,6 @@ body.browse #sidebar_content {
     margin-bottom: $lineheight;
     overflow: auto;
     height: 10em;
     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 {
   }
 
   #decline {


@@ -1558,17 +1673,19 @@ body.browse #sidebar_content {
 
 /* 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 */


@@ -1601,7 +1718,7 @@ body.browse #sidebar_content {
   h2 {
     margin: 0 -10px 10px -10px;
     padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;
   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;
     font-size: 12px;
     background-color: #c00;
     color: #fff;


@@ -1634,7 +1751,7 @@ body.browse #sidebar_content {
     display: block;
     margin-bottom: $lineheight/4;
     font-size: $typeheight;
     display: block;
     margin-bottom: $lineheight/4;
     font-size: $typeheight;

-    font-weight: bold;
+    font-weight: 500;

     line-height: 1.5;
   }
   label.standard-label.secondary {
     line-height: 1.5;
   }
   label.standard-label.secondary {


@@ -1722,12 +1839,6 @@ img.user_thumbnail_tiny {
   border: 1px solid #ccc;
 }
 
   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 {


@@ -1738,7 +1849,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 */


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

-    padding-left: $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;


@@ -1766,10 +1877,12 @@ ul.secondary-actions {
       margin-right: 0px;
     }
   }
       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 */
 }
 
 /* Utility for managing inner content areas */


@@ -1867,7 +1980,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;

   }
 }
 
   }
 }
 


@@ -2109,37 +2222,13 @@ a.button {
   }
 }
 
   }
 }
 

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

 
 .id-embed {
   width: 100%;
   height: 100%;
 }
 
 
 .id-embed {
   width: 100%;
   height: 100%;
 }
 

-/* 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;
-  }
-}
-

 /* Rules for dropdown menus */
 
 .dropdown {
 /* Rules for dropdown menus */
 
 .dropdown {


@@ -2174,7 +2263,7 @@ a.button {
 .dropdown-menu {
   position: absolute;
   top: 100%;
 .dropdown-menu {
   position: absolute;
   top: 100%;

-  left: 0;
+  left: -1px;

   z-index: 1000;
   display: none;
   float: left;
   z-index: 1000;
   display: none;
   float: left;


@@ -2225,7 +2314,7 @@ a.button {
 .dropdown-submenu:focus > a {
   color: #ffffff;
   text-decoration: none;
 .dropdown-submenu:focus > a {
   color: #ffffff;
   text-decoration: none;

-  background-color: #0081c2;
+  background-color: $green;

 }
 
 .dropdown-menu > .active > a,
 }
 
 .dropdown-menu > .active > a,


@@ -2233,7 +2322,7 @@ a.button {
 .dropdown-menu > .active > a:focus {
   color: #ffffff;
   text-decoration: none;
 .dropdown-menu > .active > a:focus {
   color: #ffffff;
   text-decoration: none;

-  background-color: #0081c2;
+  background-color: $green;

   outline: 0;
 }
 
   outline: 0;
 }
 


@@ -2364,13 +2453,14 @@ a.button {
 
   .caption {
     max-width: 200px;
 
   .caption {
     max-width: 200px;

-    font: italic 14px/20px 'Times New Roman', serif;
+    font: 13px/20px Helvetica, Arial, sans-serif;

     position: fixed;
     text-align: right;
     right: 20px;
     bottom: 60px;
     text-shadow: #000 0px 1px 5px;
     position: fixed;
     text-align: right;
     right: 20px;
     bottom: 60px;
     text-shadow: #000 0px 1px 5px;

-    color: #fff;
+    color: #eee;
+    opacity: 0.8;

     display: none;
   }
 
     display: none;
   }
 


@@ -2395,12 +2485,9 @@ a.button {
     background-color: rgba(0, 0, 0, 0.5);
   }
 
     background-color: rgba(0, 0, 0, 0.5);
   }
 

-  #content-body {
-    display: block;
+  .content-inner {

     position: relative;
     position: relative;

-    margin: auto;

     color: #333;
     color: #333;

-    width: 50%;

     min-width: 320px;
     max-width: 640px;
 
     min-width: 320px;
     max-width: 640px;
 


@@ -2420,15 +2507,17 @@ a.button {
 
   .attr {
     position: relative;
 
   .attr {
     position: relative;

-    padding: 170px 20px 20px 20px;
+    padding: 170px 40px 20px;

     background: #333;
     background: rgba(0, 0, 0, .8);
     margin-bottom: 0;
     background: #333;
     background: rgba(0, 0, 0, .8);
     margin-bottom: 0;

+    margin-top: -20px;

 
 

-    strong {
+    h1 {

       display: block;
       color: white;
       display: block;
       color: white;

-      font-size: 25px;
+      font-weight: 300;
+      font-size: 34px;

       span {
         color: #76c551;
       }
       span {
         color: #76c551;
       }


@@ -2455,16 +2544,16 @@ a.button {
       width: 240px;
       height: 150px;
       padding: 20px 20px 20px 40px;
       width: 240px;
       height: 150px;
       padding: 20px 20px 20px 40px;

-      font: bold 24px/25px Helvetica, Arial, sans-serif;
+      font: 500 20px/24px Helvetica, Arial, sans-serif;

       white-space: nowrap;
       color: #fff;
       white-space: nowrap;
       color: #fff;

-      background: #76c551
+      background: #76c551;

     }
 
     .byosm span {
       display: inline-block;
     }
 
     .byosm span {
       display: inline-block;

-      width: 25px;
-      margin-left: -25px;
+      width: 20px;
+      margin-left: -20px;

     }
   }
 
     }
   }
 


@@ -2486,3 +2575,5 @@ a.button {
     &.infringement { background-position: 0px -160px; }
   }
 }
     &.infringement { background-position: 0px -160px; }
   }
 }

+
+@import 'browse';