Add cascade font-weights

[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 35a5ced5f2606ebd4a83a58de72ff7568cf861e5..9f6be1979a0c26cc98dc9a768288374cd4aed159 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1,18 +1,4 @@
-/* Parameters */
-$lineheight: 20px;
-$typeheight: 14px;
-
-$offwhite: #f4f4ff;
-$blue: #7092FF;
-$lightblue: #B8C5F0;
-$green: #7ebc6f;
-$grey: #CCC;
-$lightgrey: #EEE;
-$darkgrey: #AAA;
-$hovercolor: 20%;
-$headerHeight: 75px;
-$sidebarWidth: 350px;
-$keyline: 1px solid $grey;
+@import "parameters";

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


@@ -50,6 +36,11 @@ abbr, acronym {
   cursor: help;
 }
 
   cursor: help;
 }
 

+strong {
+  font-weight: bold;
+  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 +88,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 {


@@ -111,6 +102,7 @@ body {
   margin: 0px;
   padding: 0px;
   text-align: left;
   margin: 0px;
   padding: 0px;
   text-align: left;

+  height: 100%;

 }
 
 body.slim {
 }
 
 body.slim {


@@ -119,9 +111,15 @@ body.slim {
 
 h1, h2, h3 {
   font-weight: bold;
 
 h1, h2, h3 {
   font-weight: bold;

+  font-weight: 500;

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

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

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


@@ -130,10 +128,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,14 +137,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%;


@@ -162,6 +149,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 +161,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; }


@@ -190,6 +175,7 @@ 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.gear        { background-position: -260px 0; }
 .icon.check       { background-position: -220px 0; }
 .icon.note        { background-position: -240px 0; }
 .icon.gear        { background-position: -260px 0; }


@@ -197,8 +183,10 @@ h6:first-child {
 /* 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;
   }


@@ -225,6 +213,7 @@ table {
   }
   th {
     font-weight: bold;
   }
   th {
     font-weight: bold;

+    font-weight: 500;

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


@@ -232,51 +221,6 @@ table {
   }
 }
 
   }
 }
 

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

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


@@ -286,34 +230,25 @@ table {
   }
 }
 
   }
 }
 

-/* Rules for donation request box */
+/* Rules for the header */

 
 

-a.donate {
+#menu-icon { 
+  display: none !important;
+  float: right;
+  background: image-url("menu-icon.png") no-repeat;
+  background-size: 30px 30px;

   display: block;
   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;
-  }
+  width: 30px;
+  height: 30px;
+  margin: 14px 10px 0 0;
+  opacity: 0.6;

 }
 
 }
 

-/* Rules for the header */
-

 header {
   height: $headerHeight;
   position: relative;
 header {
   height: $headerHeight;
   position: relative;

-  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;


@@ -321,7 +256,7 @@ header {
 
   > * {
     height: 100%;
 
   > * {
     height: 100%;

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

   }
 
   h1, nav.primary {
   }
 
   h1, nav.primary {


@@ -333,14 +268,15 @@ header {
   }
 
   img.logo {
   }
 
   img.logo {

-    width: 40px;
-    height: 40px;
+    width: 30px;
+    height: 30px;
+    margin-top: -4px;

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

-    border-right: $keyline;
+    padding-top: 15px;

 
     a {
       color: #000;
 
     a {
       color: #000;


@@ -350,14 +286,24 @@ header {
 
 nav.primary {
   > ul {
 
 nav.primary {
   > ul {

-    $border: 1px solid darken($green, 20%);
+    $border: 1px solid $green;

 
     border: $border;
 
     border: $border;

-    border-radius: 4px;
+    border-radius: $border-radius;

 
     > li {
       border-right: $border;
 
     > li {
       border-right: $border;

-      &:last-child { border-right: 0; }
+      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%); }
+      }

     }
   }
 
     }
   }
 


@@ -365,48 +311,39 @@ nav.primary {
   .dropdown-toggle {
     display: inline-block;
     font-weight: bold;
   .dropdown-toggle {
     display: inline-block;
     font-weight: bold;

+    font-weight: 500;

     color: $green;
     padding: 5px 15px;
   }
 
   .dropdown-toggle {
     color: $green;
     padding: 5px 15px;
   }
 
   .dropdown-toggle {

-    padding: 5px 10px;
-  }
-
-  #edit_tab a.tab {
-    border-right: 1px solid lighten($green, 20%);
+    padding: 5px 6px;

   }
 
   .caret {
     border-top-color: $green;
   }
 
   .caret {
     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;
+    }

   }
 }
 
   }
 }
 


@@ -414,56 +351,87 @@ nav.secondary {
   position: absolute;
   right: 0;
 
   position: absolute;
   right: 0;
 

-  > ul a,
-  .dropdown-toggle {
-    display: inline-block;
-    font-weight: bold;
-    text-decoration: none;
-    color: $darkgrey;
-    padding: 5px 5px;
+  > ul {
+    vertical-align: middle;
+    a, .dropdown-toggle {
+      display: inline-block;
+      text-decoration: none;
+      color: $darkgrey;
+      padding: 5px;
+
+      &:hover { color: darken($darkgrey, 10%); }
+    }
+  }
+
+  > ul li.current a {
+    color: darken($darkgrey, 25%);

   }
 
   .user-menu {
     $border: 1px solid $grey;
   }
 
   .user-menu {
     $border: 1px solid $grey;

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

     border: $border;
     border: $border;

-    border-radius: 4px;
+    border-radius: $border-radius;

     margin-left: 10px;
 
     > li {
       border-right: $border;
     margin-left: 10px;
 
     > li {
       border-right: $border;

-      &:last-child { border-right: 0; }
+      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; }
+      &:hover a { background: lighten($darkgrey, 30%); }

     }
 
     a {
       padding: 5px 15px;
     }
 
     a {
       padding: 5px 15px;

+
+    }
+
+    &.logged-in > a {
+      padding: 0;
+      > .user-button {
+        padding: 5px 10px 5px 6px;
+        display: inline-block;
+        color: $darkgrey;
+      }
+      &:hover > .user-button { color: darken($darkgrey, 5%); }

     }
   }
 
   .caret {
     border-top-color: $grey;
     }
   }
 
   .caret {
     border-top-color: $grey;

-    margin-top: 10px;
+    margin-top: 9px;

   }
 
   img.user_thumbnail_tiny {
     border: 0;
     vertical-align: top;
   }
 
   img.user_thumbnail_tiny {
     border: 0;
     vertical-align: top;

-    margin-top: 2px;
-    border-radius: 2px 0 0 2px;
+    margin-top: 0px;
+    margin: 3px 0 0 3px;
+    border-radius: 2px;

   }
 
   #inboxanchor {
     display: inline-block;
     vertical-align: top;
   }
 
   #inboxanchor {
     display: inline-block;
     vertical-align: top;

-    height: 20px;
-    margin: 2px 7px 0 0;
-    background-color: $grey;
-    border-radius: 0 2px 2px 0;
+    height: 25px;
+    margin: 3px 0 3px 3px;
+    background-color: lighten($grey, 10%);
+    line-height: 20px;
+    border-radius: 2;

   }
 
   .dropdown-menu {
     left: auto;
   }
 
   .dropdown-menu {
     left: auto;

-    right: 0;
+    right: -1px;
+    border-radius: 3px 0 3px 3px;

 
     .count-number {
       float: right;
 
     .count-number {
       float: right;


@@ -473,12 +441,30 @@ nav.secondary {
   }
 }
 
   }
 }
 

+#compact-secondary-nav {
+  display: none;
+  ul li a {
+    width: 100%;
+    color: #333;
+    &:hover { color: #fff; }
+  }
+}
+
+@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;
 /* Utility for styling notification numbers */
 
 .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;


@@ -585,7 +571,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;


@@ -626,68 +611,158 @@ 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 {
+    overflow: hidden;
+    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;
+  }

 
 

-  .section {
-    border-bottom: 1px solid #DDD;
-    padding: 15px;
+  #sidebar {
+    float: left;
+    width: $sidebarWidth;
+    background: #fff;
+    font-size: 13px;
+
+    h2 {
+      padding: $lineheight $lineheight $lineheight/2;
+    }
+
+    h3, h4 {
+      margin-top: $lineheight;
+      margin-bottom: $lineheight/2;
+    }
+
+    .icon.close {
+      float: right;
+      cursor: pointer;
+    }

   }
 
   }
 

-  a.close-button {
-    float: right;
-    padding:5px;
-    font-size:20px;
-    line-height:10px;
-    color:#222;
-    border:1px solid #ddd;
+  .overlay-sidebar #sidebar {
+    position: absolute;
+    z-index: 1000;
+    height: auto;
+    border-bottom-right-radius: 5px;
+    overflow: hidden;

   }
   }

-}

 
 

-.layers-ui,
-.share-ui {
-  ul, li:last-child, p:last-child {
-    margin-bottom: 0;
+  .welcome {
+    p {
+      padding: $lineheight/2 $lineheight $lineheight;
+      font-size: 110%;
+      font-weight: normal;
+      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;
+      }
+    }

   }
   }

-}

 
 

-.layers-ui {
-  li {
-    border-radius: 4px;
+  #map {
+    height: 100%;

     overflow: hidden;
     overflow: hidden;

-    margin-bottom: 10px;

   }
 
   }
 

-  label {
-    display: block;
-    padding: 5px 5px 5px 7px;
-    background-color: #eee;
-    cursor: pointer;
+  #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;
+    }

   }
   }

+}

 
 

-  li.active label {
-    background-color: #ccc;
+.layers-ui,
+.share-ui {
+  li:last-child {
+    margin-bottom: 0;

   }
   }

+}

 
 

+.layers-ui {

   .base-layers {
     .leaflet-container {
       width: 100%;
       height: 50px;
       cursor: pointer;
     }
   .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: bold;
+        font-weight: 500;
+        font-size: 16px;
+        text-stroke: 2px #fff;
+        background: rgba(255,255,255,.9);
+        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;
+    }

   }
 }
 
   }
 }
 


@@ -746,8 +821,8 @@ nav.secondary {
   }
 }
 
   }
 }
 

-.leaflet-top.leaflet-right {
-  top: $lineheight !important;
+.leaflet-top {
+  top: $lineheight/2 !important;

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


@@ -765,25 +840,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 {


@@ -799,73 +855,85 @@ nav.secondary {
   text-align: center;
 }
 
   text-align: center;
 }
 

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

 
 

-#sidebar {
-  border-right: $keyline;
+/* Rules for the sidebar */

 
 

-  .alert {
-    background: #e00;
+.sidebar_heading {
+  position: relative;
+  padding: $lineheight/2 $lineheight;
+  // background: $offwhite;
+  // border-bottom: 1px solid #ccc;
+  > .close { 
+    float: right;
+    margin-top: 2px;
+    cursor: pointer; 

   }
   }

+}

 
 

-  h2, h3, h4 {
+#browse_status {
+  p {

     padding: $lineheight;
     padding: $lineheight;

-    border-bottom: $keyline;

   }
   }

+}

 
 

-  h4 {
-    font-weight: normal;
+#sidebar {
+  #sidebar_loader,
+  .loader,
+  .load_more {
+    text-align: center;
+    margin: $lineheight auto;
+    width: $lineheight;
+    display: block;

   }
   }

+}

 
 

-  .icon.close {
-    position: absolute;
-    right: $lineheight;
-  }
+/* Rules for the search box */

 
 

-  p {
-    margin: 0;
-  }
+header .search_form {
+  display: none;
+}

 
 

-  .footer {
-    position: absolute;
-    bottom: 0;
+.search_form {
+  position: relative;
+  padding: $lineheight/2;
+  background-color: $lightgrey;
+
+  .query_wrapper {
+    position: relative;
+    overflow: hidden;
+    border-radius: 2px 0 0 2px;

   }
 
   }
 

-  p.credits {
-    font-size: 11px;
-    color: #999;
+  input[type=text] {
+    width: 100%;
+    height: 30px;
+    border-right: none;

 
 

-    a {
-      color: #666;
-    }
+    transition: 300ms linear;
+    -webkit-transition: 300ms linear;
+    -moz-transition: 300ms linear;

   }
   }

-}

 
 

-.sidebar_heading {
-  position: relative;
-  padding: $lineheight/2 $lineheight;
-  background: $offwhite;
-  border-bottom: 1px solid #ccc;
-  h4 {
-    margin: 0;
+  input:focus {
+    outline: none;
+    box-shadow: 0px 0px 7px #9ED485;

   }
   }

-}

 
 

-.sidebar_close {
-  position: absolute;
-  height: $lineheight;
-  top: 0px;
-  bottom: 0;
-  right: $lineheight;
-  margin: auto;
-}
+  input[type=submit] {
+    float: right;
+    width: auto;
+    min-width: 0;
+    border-radius: 0 2px 2px 0;
+  }

 
 

-#sidebar_content {
-  position: absolute;
-  top: 72px;
-  bottom: 0;
-  width: 100%;
-  overflow-y: auto;
+  .describe_location {
+    position: absolute;
+    top: 6px;
+    right: 6px;
+    font-size: 10px;
+    color: $blue;
+  }

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


@@ -881,23 +949,12 @@ nav.secondary {
   }
 }
 
   }
 }
 

-/* 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 {

-  .search_searching {
-    text-align: center;
-    margin: $lineheight auto;
-    width: $lineheight;
-    display: block;
-  }
-

   ul li {
   ul li {

-    border-bottom: 1px solid #ccc;
+    border-bottom: $keyline;
+    &:first-child { border-top: $keyline; }

   }
 
   .search_details {
   }
 
   .search_details {


@@ -913,60 +970,165 @@ nav.secondary {
   color: #f00;
 }
 
   color: #f00;
 }
 

-/* Rules for data browser information which appears in the popout sidebar */
+/* Rules for entity history */
+
+#sidebar_content {
+  .browse_details {
+    position: relative;
+    border-bottom: $keyline;
+  }
+}
+
+.browse_status {
+  display: none;
+}
+
+/* Rules for the history sidebar */
+
+#sidebar .changesets {
+  li {
+    padding: $lineheight;
+    border-bottom: $keyline;
+    cursor: pointer;
+
+    &.selected { background: #FFFFE6; }
+    /* color is derived from changeset bbox fillColor in history.js */
+  }
+
+  h4 {
+    margin-top: 0;
+    a {
+      color: #000;
+    }
+  }
+}
+
+/* Rules for the browse sidebar */
+
+#sidebar_content {
+  .browse-section {
+    padding: $lineheight/2 $lineheight;
+
+    h4:first-child {
+      margin-top: 0;
+    }
+  }
+
+  .paginate {
+    float: right;
+    padding: 1px 6px;
+    border: 1px solid #eee;
+    border-radius: 3px;
+  }
+
+  .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 {
+    background-color: #F6F6F6;
+    border: 1px solid #ddd;
+    border-radius: 3px;
+    font-size: 12px;
+
+    li {
+      border-bottom: 1px solid #ddd;
+    }
+
+    li:last-child {
+      border-bottom: 0;
+    }
+
+    .browse-tag-k,
+    .browse-tag-v {
+      display: inline-block;
+      width: 50%;
+      float: left;
+      padding: 6px 10px;
+    }
+
+    .browse-tag-k {
+      font-weight: bold;
+      font-weight: 500;
+      background-color: #F6F6F6;
+    }

 
 

-#browse_content {
-  position: relative;
-  .browse_show_list.button {
-    position: absolute;
-    left: $lineheight;
-    right: $lineheight;
-    bottom: -40px;
-    margin-bottom: 0;
+    .browse-tag-v {
+      border-left: 1px solid #ddd;
+      background-color: #fff;
+    }

   }
   }

-  a.more-details {
-    position: absolute;
-    top: 0;
-    right: $lineheight;
+
+  .warning {
+    margin: $lineheight/2 0;
+    padding: $lineheight/2;
+    font-size: 90%;

   }
   }

-  ul li {
-    margin-bottom: 0;
+
+  .note-comments li {
+    margin: $lineheight/2 0;

   }
 }
 
   }
 }
 

-.browse_details {
-  position: relative;
-}
+/* Rules for export sidebar */

 
 

-.browse_status {
-  display: none;
-}
+.export_form {
+  padding: $lineheight;

 
 

-/* Rules for export information which appears in the popout sidebar */
+  .export_area_inputs,
+  .export_button {
+    text-align: center;
+  }

 
 

-.export_bounds {
-  text-align: center;
-}
+  .export_area_inputs {
+    margin-bottom: $lineheight/2;
+    input[type="text"] {
+      width: 80px;
+      margin-bottom: 5px;
+    }
+  }

 
 

-.export_area_inputs {
-  margin-bottom: $lineheight/2;
-  input[type="text"] {
-    width: 80px;
-    margin-bottom: 5px;
+  .export_bound {
+    margin: $lineheight/4;
+  }
+
+  .export_button {
+    margin-top: $lineheight;

   }
   }

-}

 
 

-.export_bound {
-  margin: $lineheight/4;
+  dl {
+    padding-left: $lineheight/2;
+    dd {
+      margin-left: 0;
+      margin-bottom: 10px;
+    }
+  }

 }
 
 }
 

-/* Rules for the sidebar and main content area */
+/* 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;


@@ -974,27 +1136,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;
 }
 


@@ -1002,18 +1170,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;

   }
 }
 
   }
 }
 


@@ -1044,18 +1212,10 @@ 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) {
-  .header-illustration.new-user-arm { display: none;}
-.wrapper {
-  margin-left: $sidebarWidth;
-  text-align: left;
-}
-
-}
-

 #content.maximised {
   top: 0;
   left: 0;
 #content.maximised {
   top: 0;
   left: 0;


@@ -1112,88 +1272,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 {


@@ -1332,46 +1410,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 {


@@ -1579,17 +1651,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 */


@@ -1623,6 +1697,7 @@ body.browse #sidebar_content {
     margin: 0 -10px 10px -10px;
     padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;
     font-weight: bold;
     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;


@@ -1656,6 +1731,7 @@ body.browse #sidebar_content {
     margin-bottom: $lineheight/4;
     font-size: $typeheight;
     font-weight: bold;
     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 {


@@ -1753,7 +1829,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 */


@@ -1771,8 +1847,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;


@@ -1783,6 +1859,12 @@ ul.secondary-actions {
   }
 }
 
   }
 }
 

+div.secondary-actions {
+  padding: 10px;
+  border-top: 1px solid #ccc;
+  text-align: center;
+}
+

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


@@ -1845,7 +1927,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;


@@ -1878,7 +1960,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;

   }
 }
 
   }
 }
 


@@ -2060,97 +2142,13 @@ a.button {
   }
 }
 
   }
 }
 

-/* Rules for the notes interface */
-
-.leaflet-popup-content .note {
-  padding-top: $lineheight/2;
-}
-
-.leaflet-popup-content .note {
-  h2 {
-    margin-bottom: $lineheight/2;
-  }
-
-  div {
-    margin-top: $lineheight/2;
-  }
-
-  .permalink {
-    position: absolute;
-    top: $lineheight/4;
-    left: $lineheight/4;
-    min-width: 15px;
-    min-height: 15px;
-  }
-
-  .permalink span {
-    display: none;
-    padding-left: $lineheight;
-  }
-
-  .permalink:hover span {
-    display: block;
-  }
-
-  .warning {
-    display: block;
-    background-color: #ffe0cc;
-    padding: 4px 6px;
-    margin-bottom: $lineheight/2;
-  }
-
-  .comment_body {
-    margin-top: 2px;
-    margin-bottom: 2px;
-
-    p {
-      margin-top: 0px;
-      margin-bottom: 0px;
-    }
-  }
-
-  .comment {
-    width: 100%;
-    height: 100px;
-  }
-
-  .buttons {
-    margin-top: $lineheight/4;
-    text-align: right;
-  }
-}
-
-/*
- * Rules for the iD editor
- */
+/* 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 {


@@ -2185,7 +2183,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;


@@ -2195,6 +2193,7 @@ a.button {
   list-style: none;
   background-color: #ffffff;
   border: 1px solid #ccc;
   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);
   *border-right-width: 2px;
   *border-bottom-width: 2px;
   -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);


@@ -2360,7 +2359,8 @@ a.button {
 }
 
 .site-about #content {
 }
 
 .site-about #content {

-  background-color: #000;
+  //background-color: #000;
+  background-color: #eee;

   background-position: 50% 50%;
   background-repeat: no-repeat;
   background-size: cover;
   background-position: 50% 50%;
   background-repeat: no-repeat;
   background-size: cover;


@@ -2375,13 +2375,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;
   }
 


@@ -2406,12 +2407,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;
 


@@ -2431,15 +2429,18 @@ 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: normal;
+      font-weight: 300;
+      font-size: 34px;

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


@@ -2466,16 +2467,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;

     }
   }
 
     }
   }
 


@@ -2493,7 +2494,16 @@ a.button {
     &.local        { background-position: 0px    0px; }
     &.community    { background-position: 0px  -40px; }
     &.open         { background-position: 0px  -80px; }
     &.local        { background-position: 0px    0px; }
     &.community    { background-position: 0px  -40px; }
     &.open         { background-position: 0px  -80px; }

-    &.contributors { background-position: 0px -120px; }
+    &.partners     { background-position: 0px -120px; }

     &.infringement { background-position: 0px -160px; }
   }
 }
     &.infringement { background-position: 0px -160px; }
   }
 }

+
+@import 'browse';
+
+@media only screen and (max-width:960px) {
+  .header-illustration.new-user-arm {
+    display: none;
+  }
+}
+