Content style adjustments

[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 d1983fb8aa1996e52d6bffc04666d540a556de0b..6a80453c68a9bde1e3af5a6dd8a4714c7b7f8ba1 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -5,9 +5,14 @@ $typeheight: 14px;
 $offwhite: #f4f4ff;
 $blue: #7092FF;
 $lightblue: #B8C5F0;
 $offwhite: #f4f4ff;
 $blue: #7092FF;
 $lightblue: #B8C5F0;

-$grey: #AAA;
-$lightgrey: #CCC;
+$green: #7ebc6f;
+$grey: #CCC;
+$lightgrey: #EEE;
+$darkgrey: #AAA;

 $hovercolor: 20%;
 $hovercolor: 20%;

+$headerHeight: 75px;
+$sidebarWidth: 350px;
+$keyline: 1px solid $grey;

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


@@ -88,6 +93,7 @@ abbr, acronym {
 .margin12 { margin-left:100.0000%; }
 
 .fillL { background-color: white; }
 .margin12 { margin-left:100.0000%; }
 
 .fillL { background-color: white; }

+

 /* Default rules for the body of every page */
 
 * {
 /* Default rules for the body of every page */
 
 * {


@@ -112,36 +118,16 @@ body.slim {
 }
 
 h1, h2, h3 {
 }
 
 h1, h2, h3 {

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

   font-weight: bold;
   line-height: 1.2;
 }
 
   font-weight: bold;
   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,h6 {
-  font-size: $typeheight;
-  margin-top: $lineheight/2;
-  margin-bottom: $lineheight/2;
-  font-weight: bold;
-  line-height: 1.5;
+h1 {
+  font-size: 18px;

 }
 
 }
 

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

 }
 
 p > img {
 }
 
 p > img {


@@ -202,6 +188,7 @@ h6:first-child {
 .icon.close       { background-position: -200px 0; }
 .icon.check       { background-position: -220px 0; }
 .icon.note        { background-position: -240px 0; }
 .icon.close       { background-position: -200px 0; }
 .icon.check       { background-position: -220px 0; }
 .icon.note        { background-position: -240px 0; }

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

 
 /* Rules for links */
 
 
 /* Rules for links */
 


@@ -241,291 +228,245 @@ table {
   }
 }
 
   }
 }
 

-/* Rules for the whole left sidebar, including the logo */
-
-#left {
-  position: absolute;
-  height: 100%;
-  width: 185px;
-  font-size: 11px;
-  line-height: 1.1;
-  z-index: 100;
-  border-right: 1px solid #ccc;
-}
+/* Rules for the search box */

 
 

-/* Rules for the OpenStreetMap logo in the top left corner */
+#search_form {
+  position: relative;
+  padding: $lineheight;
+  background-color: $lightgrey;
+  border-bottom: $keyline;

 
 

-#logo {
-  display: block;
-  width: 170px;
-  min-width: 170px;
-  padding: $lineheight $lineheight/4;
-  text-align: center;
-  margin: auto;
-}
+  #query_wrapper {
+    position: relative;
+    overflow: hidden;
+  }

 
 

-#logo h1 {
-  font-size: 18px;
-  line-height: 1;
-  text-align: center;
-  margin: 0;
-}
+  input {
+    width: 100%;
+    height: 30px;
+    border-right: none;
+    border-radius: 2px 0 0 2px;

 
 

-#logo h2 {
-  font-size: $lineheight/2;
-  line-height: 15px;
-  margin: 0;
-}
+    transition: 300ms linear;
+    -webkit-transition: 300ms linear;
+    -moz-transition: 300ms linear;
+  }

 
 

-/* Rules for the site name */
+  input:focus {
+    outline: none;
+    box-shadow: 0px 0px 7px #9ED485;
+  }

 
 

-#small-title {
-  display: none;
+  input[type=submit] {
+    float: right;
+    width: auto;
+    min-width: 0;
+    border-radius: 0 2px 2px 0;
+  }

 
 

-  img {
-    vertical-align: text-bottom;
+  #describe_location {
+    position: absolute;
+    top: 6px;
+    right: 6px;
+    font-size: 10px;
+    color: $blue;

   }
 }
 
   }
 }
 

-/* Rules for the introductory text displayed in the left sidebar to new users */
+/* Utility for de-emphasizing content */

 
 

-.sidebar-copy {
-  padding: $lineheight/4 $lineheight/2;
-  p {
-    margin: $lineheight/4 0;
+.deemphasize {
+  color: #999;
+  a {
+    color: $blue;

   }
 }
   }
 }

-.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.
- */
+/* Rules for donation request box */

 
 

-.sidebar-alert {
+a.donate {
+  display: block;
+  width: 163px;

   padding: $lineheight/4;
   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;
+  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 notice boxes shown in the left sidebar when important, but
- * non-critical information needs to be conveyed such as notices about
- * donation drives.
- */
+/* Rules for the header */

 
 

-.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;
+header {
+  height: $headerHeight;
+  position: relative;
+  border-bottom: $keyline;
+  z-index: 1001;
+
+  h1, nav, nav > ul, nav > ul > li, .dropdown {
+    display: inline-block;

   }
   }

-}

 
 

-/* Rules for the menu displayed in the left sidebar */
+  > * {
+    height: 100%;
+    padding: $lineheight;
+  }

 
 

-.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;
+  h1, nav.primary {
+    float: left;

   }
 
   }
 

-  ul {
-    padding: 0;
-    margin: 0;
+  a, a:hover {
+    text-decoration: none;

   }
 
   }
 

-  li {
-    list-style-type: none;
-    padding: 0;
-    margin: 0;
+  img.logo {
+    width: 40px;
+    height: 40px;
+    vertical-align: middle;

   }
 
   }
 

-  h4 {
-    padding: $lineheight/4 0 $lineheight/4 0;
-    font-size: 12px;
+  h1 {

     margin: 0;
     margin: 0;

+    border-right: $keyline;
+
+    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.
- */
+nav.primary {
+  > ul {
+    $border: 1px solid darken($green, 20%);

 
 

-.optionalbox {
-  left: 0px;
-  padding: $lineheight/4 $lineheight/2;
-  margin: $lineheight/4 0;
-  text-align: left;
-}
+    border: $border;
+    border-radius: 4px;

 
 

-/* Rules for the search box */
+    > li {
+      border-right: $border;
+      &:last-child { border-right: 0; }
+    }
+  }

 
 

-#search_field {
-  position: relative;
+  a.tab,
+  .dropdown-toggle {
+    display: inline-block;
+    font-weight: bold;
+    color: $green;
+    padding: 5px 15px;
+  }

 
 

-  form {
-    width: 165px;
+  .dropdown-toggle {
+    padding: 5px 10px;

   }
 
   }
 

-  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;
+  #edit_tab a.tab {
+    border-right: 1px solid lighten($green, 20%);

   }
 
   }
 

-  input[type="text"]:focus {
-    outline: none;
-    border: 1px solid #000;
+  .caret {
+    border-top-color: $green;

   }
 
   }
 

-  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;
+  .disabled a {
+    color: #ccc;
+    cursor: default;
+
+    &:hover {
+      text-decoration: none;
+    }
+
+    .caret {
+      border-top-color: #ccc;
+    }

   }
   }

-}

 
 

-.search_help {
-  margin: $lineheight/4 0 0 0;
-}
+  > ul li.current {
+    background-color: $green;

 
 

-/* Utility for de-emphasizing content */
+    .tab {
+      color: #fff;
+    }

 
 

-.deemphasize {
-  color: #999;
-  a {
-    color: $blue;
+    .caret {
+      border-top-color: #fff;
+    }

   }
 }
 
   }
 }
 

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

 
 

-  &:hover {
-    background: #9ed485;
+  > ul a,
+  .dropdown-toggle {
+    display: inline-block;
+    font-weight: bold;

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

+    color: $darkgrey;
+    padding: 5px 5px;

   }
   }

-}

 
 

-/* Rules for Creative Commons logo button */
+  > ul li.current a {
+    color: darken($darkgrey, 25%);
+  }

 
 

-#cclogo {
-  margin: $lineheight/2 0;
-  float: right;
-}
+  .user-menu {
+    $border: 1px solid $grey;

 
 

-/* Rules for tabbed navigation bar */
+    border: $border;
+    border-radius: 4px;
+    margin-left: 10px;

 
 

-#top-bar {
-  position: relative;
-  margin-left: 185px;
-  height: 30px;
-  border-bottom: 1px solid #ccc;
-  background: white;
-  z-index: 100;
-}
+    > li {
+      border-right: $border;
+      &:last-child { border-right: 0; }
+    }

 
 

-.site-edit #top-bar,
-.site-index #top-bar,
-.site-export #top-bar {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-}
+    a {
+      padding: 5px 15px;
+    }
+  }

 
 

-#tabnav {
-  height: 29px;
-  margin-bottom:0;
-  overflow: hidden;
-  li {
-    display: inline;
+  .caret {
+    border-top-color: $grey;
+    margin-top: 10px;

   }
   }

-  a, a:link, a:visited {
-    float: left;
-    font-weight: bold;
-    padding: 3px $lineheight/2;
-    text-decoration: none;
-    color: #333;
-    float: left;
-    margin-right: 1px;
-    -webkit-transition: color 200ms ease-in;
-       -moz-transition: color 200ms ease-in;
-         -o-transition: color 200ms ease-in;
-            transition: color 200ms ease-in;
+
+  img.user_thumbnail_tiny {
+    border: 0;
+    vertical-align: top;
+    margin-top: 2px;
+    border-radius: 2px 0 0 2px;

   }
   }

-}

 
 

-.site-index #tabnav a#viewanchor,
-.site-edit #tabnav a#editanchor,
-.changeset-list #tabnav a#historyanchor {
-  border-bottom: 1px solid #aaa;
-  background: #9ed485;
-  color: #000;
-}
+  #inboxanchor {
+    display: inline-block;
+    vertical-align: top;
+    height: 20px;
+    margin: 2px 7px 0 0;
+    background-color: $grey;
+    border-radius: 0 2px 2px 0;
+  }

 
 

-#tabnav a:link:hover, #tabnav a:visited:hover {
-  text-decoration: underline;
-}
+  .dropdown-menu {
+    left: auto;
+    right: 0;

 
 

-#tabnav a:link.disabled,
-#tabnav a:visited.disabled,
-#tabnav a:link:hover.disabled,
-#tabnav a:visited:hover.disabled {
-  color: #ccc;
-  cursor: default;
-  &:hover {
-    text-decoration: none;
+    .count-number {
+      float: right;
+      padding: 0 5px;
+      margin: 0;
+    }

   }
 }
 
   }
 }
 


@@ -540,18 +481,6 @@ a.donate {
   color: #333;
 }
 
   color: #333;
 }
 

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

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


@@ -683,13 +612,12 @@ a.donate {
   border-radius: 4px 0 0 0;
 }
 
   border-radius: 4px 0 0 0;
 }
 

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

 .control-key .control-button {
   margin-bottom: 0;
   border-radius: 0;
 }
 
 .control-key .control-button {
   margin-bottom: 0;
   border-radius: 0;
 }
 

-.leaflet-control .zoomout, // For non-main page maps

 .control-locate .control-button,
 .control-share .control-button {
   border-radius: 0 0 0 4px;
 .control-locate .control-button,
 .control-share .control-button {
   border-radius: 0 0 0 4px;


@@ -697,9 +625,7 @@ a.donate {
 
 /* Rules for the home page */
 
 
 /* Rules for the home page */
 

-.site-export #map,
-.site-index #map,
-.site-edit #map {
+#map {

   height: 100%;
   overflow: hidden;
 }
   height: 100%;
   overflow: hidden;
 }


@@ -711,7 +637,6 @@ a.donate {
   width: 250px;
   height: 100%;
   background: white;
   width: 250px;
   height: 100%;
   background: white;

-  border-left: 1px solid #CCC;

   overflow: auto;
 
   .section {
   overflow: auto;
 
   .section {


@@ -731,7 +656,7 @@ a.donate {
 
 .layers-ui,
 .share-ui {
 
 .layers-ui,
 .share-ui {

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

     margin-bottom: 0;
   }
 }
     margin-bottom: 0;
   }
 }


@@ -819,7 +744,7 @@ a.donate {
 }
 
 .leaflet-top.leaflet-right {
 }
 
 .leaflet-top.leaflet-right {

-  top: $lineheight/2 !important;
+  top: $lineheight !important;

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


@@ -837,34 +762,6 @@ a.donate {
   -webkit-border-radius: 4px !important;
 }
 
   -webkit-border-radius: 4px !important;
 }
 

-/* Rules for edit menu */
-
-.menuicon {
-  padding: 0 $lineheight/4;
-  font-weight: normal;
-  display: inline-block;
-  &:hover {
-    text-decoration: none !important;
-  }
-}
-
-.menu {
-  display: none;
-  z-index: 10000;
-  position: absolute;
-  background-color: #ffffff;
-  border: 1px solid $lightgrey;
-  border-top: 0px;
-  ul {
-    margin: 0px;
-  }
-  li {
-    padding: 2px $lineheight/4;
-    border-top: 1px solid #eee;
-    white-space: nowrap;
-  }
-}
-

 /* Rules for attribution text under the main map shown on printouts */
 
 #attribution {
 /* Rules for attribution text under the main map shown on printouts */
 
 #attribution {


@@ -880,25 +777,40 @@ a.donate {
   text-align: center;
 }
 
   text-align: center;
 }
 

-/* Rules for the popout map sidebar */
+/* Rules for the sidebar */

 
 #sidebar {
 
 #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;
-      }
+  border-right: $keyline;
+
+  .alert {
+    background: #e00;
+  }
+
+  h2, h3, h4 {
+    padding: $lineheight;
+    border-bottom: $keyline;
+  }
+
+  h4 {
+    font-weight: normal;
+  }
+
+  .icon.close {
+    position: absolute;
+    right: $lineheight;
+  }
+
+  .footer {
+    position: absolute;
+    bottom: 0;
+  }
+
+  p.credits {
+    font-size: 11px;
+    color: #999;
+
+    a {
+      color: #666;

     }
   }
 }
     }
   }
 }


@@ -906,12 +818,8 @@ a.donate {
 .sidebar_heading {
   position: relative;
   padding: $lineheight/2 $lineheight;
 .sidebar_heading {
   position: relative;
   padding: $lineheight/2 $lineheight;

-  z-index: 9999;

   background: $offwhite;
   border-bottom: 1px solid #ccc;
   background: $offwhite;
   border-bottom: 1px solid #ccc;

-  h4 {
-    margin: 0;
-  }

 }
 
 .sidebar_close {
 }
 
 .sidebar_close {


@@ -924,17 +832,11 @@ a.donate {
 }
 
 #sidebar_content {
 }
 
 #sidebar_content {

-  position: relative;
-  margin-bottom: 20px;
-  overflow: auto;
-  height: 100%;
+  position: absolute;
+  top: 72px;
+  bottom: 0;

   width: 100%;
   width: 100%;

-  h4 {
-    padding: 0 $lineheight $lineheight/2 $lineheight;
-    margin-top: $lineheight/2;
-    margin-bottom: 0;
-    border-bottom: 1px solid #ddd;
-  }
+  overflow-y: auto;

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


@@ -958,23 +860,26 @@ a.donate {
 }
 
 .search_results_entry {
 }
 
 .search_results_entry {

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

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

+    float: right;

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

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

   }
 }
 
   }
 }
 

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

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


@@ -1026,32 +931,62 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   margin: $lineheight/4;
 }
 
   margin: $lineheight/4;
 }
 

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

 
 

-#content {
-  position: relative;
-  padding: $lineheight;
+.site-index,
+.site-export,
+.site-edit,
+.changeset-list,
+.browse {
+  #content {
+    position: absolute;
+    top: $headerHeight;
+    bottom: 0;
+    width: 100%;
+  }
+
+  #sidebar, #map {
+    position: relative;
+    height: 100%;
+    overflow-x: hidden;
+    overflow-y: auto;
+  }
+
+  #sidebar {
+    float: left;
+    width: $sidebarWidth;
+  }

 }
 
 }
 

-.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;
+.content-heading {
+  background: $lightgrey;
+  border-bottom: $keyline;
+}
+
+.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;

 }
 
 /* Overrides for pages that use new layout conventions */
 }
 
 /* Overrides for pages that use new layout conventions */

+

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

-.user-terms,
-.user-confirm,
-.site-copyright,
-.site-welcome {
-  #content {
-    max-width: 740px;
+.user-terms {
+  .content-body .content-inner {
+    padding: 0;

   }
 }
 
   }
 }
 


@@ -1059,19 +994,11 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 .user-create,
 .user-terms,
 .user-confirm {
 .user-create,
 .user-terms,
 .user-confirm {

-  .content-heading {
+  .content-heading .content-inner {

     height: 200px;
   }
 }
 
     height: 200px;
   }
 }
 

-.user-new,
-.user-create,
-.user-terms {
-  #content {
-    padding: 0;
-  }
-}
-

 .header-illustration {
   background-position: 0 0;
   background-repeat: no-repeat;
 .header-illustration {
   background-position: 0 0;
   background-repeat: no-repeat;


@@ -1099,17 +1026,14 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     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:770px) {
-  .header-illustration.new-user-arm { display: none;}
-}
-
-.wrapper {
-  margin-left: 184px;
-  border-left: 1px solid #ccc;
-  text-align: left;
+@media only screen and (max-width:900px) {
+  .header-illustration.new-user-arm {
+    display: none;
+  }

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


@@ -1157,147 +1081,87 @@ 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 */
 
 /* Rules for small maps in content areas */
 

-.content_map {
-  position: relative;
-  width: 45%;
-  height: 400px;
-  border: 1px solid #ccc;
-  margin-bottom: $lineheight;
-  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;
+.content_map {
+  position: relative;
+  width: 45%;
+  height: 400px;

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

+  margin-bottom: $lineheight;
+  float: right;

 }
 
 }
 

-#changeset_list_map_wrapper.scrolled #changeset_list_map {
-  margin-left: 93px;
+/* Rules for the changeset list shown by the history tab */
+
+#sidebar .changesets {
+  li {
+    padding: $lineheight;
+    border-bottom: $keyline;
+  }

 }
 
 /* Rules for the data browser */
 
 }
 
 /* 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;
+body.browse #sidebar_content {
+  .browse-section {
+    padding: 20px;
+    border-bottom: 1px solid #CCC;

   }
   }

-}

 
 

-.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-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_map .geolink {
-  display: none;
-}
+  .browse-tag-list {
+    border: 1px solid #CCC;
+    border-radius: 4px;
+    font-size: 12px;

 
 

-#browse_map .secondary-actions {
-  margin-bottom: $lineheight/2;
+    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 */
 }
 
 /* Rules for the trace list shown by the traces tab etc */


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

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

 .diary_post {
 .diary_post {

-  max-width: 740px;

   position: relative;
   margin-top: $lineheight/2;
   padding-top: $lineheight;
   border-top: 1px solid #ccc;
 
   position: relative;
   margin-top: $lineheight/2;
   padding-top: $lineheight;
   border-top: 1px solid #ccc;
 

-  &:first-child {
-    margin-top: 0;
-    border-top: 0;
-    padding-top: 0;
+  .post_heading {
+    margin-bottom: $lineheight;
+
+    h2 {
+      margin-top: 0;
+      margin-bottom: $lineheight/2;
+      font-size: 24px;
+    }

   }
   }

-  h1, h2 {
-    font-size: 21px;
-    line-height: 1em;
+
+  img.user_thumbnail {
+    float: left;

   }
   }

+

   small.deemphasize {
     float: left;
     display: block;
   }
   small.deemphasize {
     float: left;
     display: block;
   }

-  ul.secondary-actions { display: inline-block;}
+
+  ul.secondary-actions {
+    display: inline-block;
+  }

 }
 
 .content-heading .hide_unless_logged_in { // hacky selector, better to just add a new class to this div
   display: inline;
 }
 
 }
 
 .content-heading .hide_unless_logged_in { // hacky selector, better to just add a new class to this div
   display: inline;
 }
 

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

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


@@ -1540,19 +1398,6 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     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 {


@@ -1561,6 +1406,11 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
       background: darken($lightblue, $hovercolor);
     }
   }
       background: darken($lightblue, $hovercolor);
     }
   }

+
+  .form-row {
+    margin: auto;
+    max-width: 370px;
+  }

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


@@ -1857,12 +1707,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 {


@@ -1886,7 +1730,7 @@ ul.secondary-actions {
     display: inline-block;
     margin-right: 60px;
   }
     display: inline-block;
     margin-right: 60px;
   }

-  li {
+  > li {

     display: block;
     float: left;
     list-style: none;
     display: block;
     float: left;
     list-style: none;


@@ -2244,29 +2088,6 @@ a.button {
  * Rules for the iD editor
  */
 
  * 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;
-  }
-}
-

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


@@ -2276,15 +2097,150 @@ a.button {
 .ad-container {
   display: block;
   height: 120px;
 .ad-container {
   display: block;
   height: 120px;

+  margin: auto;

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

+
+  a {
+    display: block;
+    width: 165px;
+    margin: auto;
+  }
+
+  .ad {
+    height: 100px;
+    border: 0;
+    background: #fff;
+  }

 }
 
 }
 

-.ad {
-  height: 100px;
-  border: 0;
-  background: #fff;
+/* Rules for dropdown menus */
+
+.dropdown {
+  position: relative;
+}
+
+.dropdown-toggle {
+  *margin-bottom: -3px;
+}
+
+.dropdown-toggle:active,
+.open .dropdown-toggle {
+  outline: 0;
+}
+
+.caret {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  vertical-align: top;
+  border-top: 4px solid #000000;
+  border-right: 4px solid transparent;
+  border-left: 4px solid transparent;
+  content: "";
+}
+
+.dropdown .caret {
+  margin-top: 8px;
+  margin-left: 2px;
+}
+
+.dropdown-menu {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  z-index: 1000;
+  display: none;
+  float: left;
+  min-width: 160px;
+  padding: 5px 0;
+  margin: 0;
+  list-style: none;
+  background-color: #ffffff;
+  border: 1px solid #ccc;
+  *border-right-width: 2px;
+  *border-bottom-width: 2px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding;
+          background-clip: padding-box;
+}
+
+.dropdown-menu.pull-right {
+  right: 0;
+  left: auto;
+}
+
+.dropdown-menu .divider {
+  *width: 100%;
+  height: 1px;
+  margin: 9px 1px;
+  *margin: -5px 0 5px;
+  overflow: hidden;
+  background-color: #e5e5e5;
+  border-bottom: 1px solid #ffffff;
+}
+
+.dropdown-menu > li > a {
+  display: block;
+  padding: 3px 10px;
+  clear: both;
+  font-weight: normal;
+  line-height: 20px;
+  color: #333333;
+  white-space: nowrap;
+}
+
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus,
+.dropdown-submenu:hover > a,
+.dropdown-submenu:focus > a {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: $green;
+}
+
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: $green;
+  outline: 0;
+}
+
+.dropdown-menu > .disabled > a,
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  color: #999999;
+}
+
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  text-decoration: none;
+  cursor: default;
+  background-color: transparent;
+  background-image: none;
+}
+
+.open {
+  *z-index: 1000;
+}
+
+.open > .dropdown-menu {
+  display: block;
+}
+
+.dropdown-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 990;

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


@@ -2366,3 +2322,139 @@ a.button {
     border-radius: 4px;
   }
 }
     border-radius: 4px;
   }
 }

+
+.site-about #content {
+  background-color: #000;
+  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: italic 14px/20px 'Times New Roman', serif;
+    position: fixed;
+    text-align: right;
+    right: 20px;
+    bottom: 60px;
+    text-shadow: #000 0px 1px 5px;
+    color: #fff;
+    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;
+
+    .section {
+      margin-bottom: 30px;
+    }
+
+    .section:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  .text {
+    background: white;
+    padding: 40px;
+  }
+
+  .attr {
+    position: relative;
+    padding: 170px 20px 20px 20px;
+    background: #333;
+    background: rgba(0, 0, 0, .8);
+    margin-bottom: 0;
+
+    strong {
+      display: block;
+      color: white;
+      font-size: 25px;
+      span {
+        color: #76c551;
+      }
+    }
+
+    .user-image {
+      position: absolute;
+      top: 0px;
+      right: 240px;
+      left: 0px;
+      height: 150px;
+      background-position: 0 50%;
+      background-repeat: no-repeat;
+      background-image: image-url('about/osm.png');
+      background-size: cover;
+      background-color: #76c551;
+    }
+
+    .byosm {
+      position: absolute;
+      top: 0px;
+      right: 0px;
+      z-index: 1;
+      width: 240px;
+      height: 150px;
+      padding: 20px 20px 20px 40px;
+      font: bold 24px/25px Helvetica, Arial, sans-serif;
+      white-space: nowrap;
+      color: #fff;
+      background: #76c551
+    }
+
+    .byosm span {
+      display: inline-block;
+      width: 25px;
+      margin-left: -25px;
+    }
+  }
+
+  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; }
+  }
+}