Refine map UI for small screens

[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 48112c2c6ed8244c14783ced909cefca0eec0ece..a4f816b9d2ea1fc61c38437ac991fd20b0eb9efd 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1,11 +1,74 @@
+/* Parameters */
+$lineheight: 20px;
+$typeheight: 14px;
+
+$offwhite: #f4f4ff;
+$blue: #7092FF;
+$lightblue: #B8C5F0;
+$grey: #AAA;
+$keyline: #CCC;
+$hovercolor: 20%;
+

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

+/* Minimal CSS reset */
+
+html, body, ul, ol, li, form, fieldset, legend, h1, h2, h3, h4, h5, h6, p, input {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font-size:100%;
+}
+
+fieldset,img { border: 0; }
+
+legend { color: #000; }
+
+sup { vertical-align: text-top; }
+
+sub { vertical-align: text-bottom; }
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+li { list-style: none; }
+
+input,
+select,
+textarea,
+body { font: #{$typeheight}/#{$lineheight} "Helvetica Neue",Arial,sans-serif; }
+
+abbr, acronym {
+  border-bottom: .1em dotted;
+  cursor: help;
+}
+
+/* Micro Clearfix | Details: http://nicolasgallagher.com/micro-clearfix-hack/ */
+
+.clearfix:before,
+.clearfix:after {
+    content: " ";
+    display: table;
+}
+
+.clearfix:after {
+    clear: both;
+}
+

 /* 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;
+  box-sizing: border-box;
+}
+

 body {
   font-family: 'Helvetica Neue',Arial,sans-serif;
 body {
   font-family: 'Helvetica Neue',Arial,sans-serif;

-  font-size: 14px;
-  line-height: 20px;
+  font-size: $typeheight;
+  line-height: 1.6666;

   color: #222;
   background-color: #fff;
   margin: 0px;
   color: #222;
   background-color: #fff;
   margin: 0px;


@@ -17,15 +80,106 @@ body.slim {
   background-color: #f0f0f0;
 }
 
   background-color: #f0f0f0;
 }
 

+h1, h2, h3 {
+  margin-top: $lineheight/2;
+  margin-bottom: $lineheight;
+  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;
+}
+
+p, ul {
+  margin-bottom: $lineheight;
+}
+
+p > img {
+  width: auto;
+  max-width: 100%;
+}
+
+small, aside {
+  font-size: 12px;
+}
+
+h1:first-child,
+h2:first-child,
+h3:first-child,
+h4:first-child,
+h5:first-child,
+h6:first-child {
+  margin-top: 0;
+}
+
+.column-1 {
+  width: 50%;
+  margin: 0 0 $lineheight/2 0;
+}
+
+.small_icon {
+  vertical-align: middle;
+  margin-right: $lineheight/4;
+}
+
+/* Rules for icons */
+
+.icon {
+  display:inline-block;
+  vertical-align:top;
+  width:20px;
+  height:20px;
+  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.donate      { background-position: -20px 0; }
+.icon.zoomin      { background-position: -40px 0; }
+.icon.zoomout     { background-position: -60px 0; }
+.icon.geolocate   { background-position: -80px 0; }
+.active .icon.geolocate   { background-position: -80px -20px; }
+.icon.layers      { background-position: -100px 0; }
+.icon.key         { background-position: -120px 0; }
+.icon.share       { background-position: -140px 0; }
+.icon.clipboard   { background-position: -160px 0; }
+.icon.link        { background-position: -180px 0; }
+.icon.close       { background-position: -200px 0; }
+.icon.check       { background-position: -220px 0; }
+.icon.note        { background-position: -240px 0; }
+

 /* Rules for links */
 
 a {
   color: #00f;
   text-decoration: none;
 /* Rules for links */
 
 a {
   color: #00f;
   text-decoration: none;

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

 }
 
 /* Rules for horizontal lines */
 }
 
 /* Rules for horizontal lines */


@@ -37,23 +191,34 @@ hr {
   height: 1px;
 }
 
   height: 1px;
 }
 

-/* Default rules for headings */
+/* General styles for tables */

 
 

-h2 {
-  margin: 5px 0;
-  font-size: 25px;
-  line-height: 30px;
+table {
+  width: 100%;
+  margin-bottom: $lineheight;
+  th, td {
+    text-align: left;
+    padding: $lineheight/4;
+    line-height: $lineheight;
+  }
+  th {
+    font-weight: bold;
+    vertical-align: top;
+  }
+  td {
+    vertical-align: middle;
+  }

 }
 
 /* Rules for the whole left sidebar, including the logo */
 
 #left {
   position: absolute;
 }
 
 /* Rules for the whole left sidebar, including the logo */
 
 #left {
   position: absolute;

-  top: 30px;
-  bottom: 0;
+  height: 100%;

   width: 185px;
   font-size: 11px;
   width: 185px;
   font-size: 11px;

-  line-height: 12px;
+  line-height: 1.1;
+  z-index: 100;

   border-right: 1px solid #ccc;
 }
 
   border-right: 1px solid #ccc;
 }
 


@@ -63,26 +228,22 @@ h2 {
   display: block;
   width: 170px;
   min-width: 170px;
   display: block;
   width: 170px;
   min-width: 170px;

-  padding: 5px;
+  padding: $lineheight $lineheight/4;

   text-align: center;
   margin: auto;
 }
 
   text-align: center;
   margin: auto;
 }
 

-#logo img {
-  border: 0px;
-}
-

 #logo h1 {
   font-size: 18px;
 #logo h1 {
   font-size: 18px;

-  line-height: 20px;
+  line-height: 1;

   text-align: center;
   text-align: center;

-  margin: 0px;
+  margin: 0;

 }
 
 #logo h2 {
 }
 
 #logo h2 {

-  font-size: 10px;
+  font-size: $lineheight/2;

   line-height: 15px;
   line-height: 15px;

-  margin: 0px;
+  margin: 0;

 }
 
 /* Rules for the site name */
 }
 
 /* Rules for the site name */


@@ -91,22 +252,15 @@ h2 {
   display: none;
 }
 
   display: none;
 }
 

-#small-title img {
-  border: 0px;
-}
-

 /* Rules for the introductory text displayed in the left sidebar to new users */
 
 .sidebar-copy {
 /* Rules for the introductory text displayed in the left sidebar to new users */
 
 .sidebar-copy {

-  padding: 5px 10px;
-}
-
-.sidebar-copy p {
-  margin: 5px 0;
+  padding: $lineheight/4 $lineheight/2;
+  p {
+    margin: $lineheight/4 0;
+  }

 }
 }

-

 .sidebar-copy.intro {
 .sidebar-copy.intro {

-  margin-top: -1px;

   border-top: 1px solid #ccc;
 }
 
   border-top: 1px solid #ccc;
 }
 


@@ -117,17 +271,15 @@ h2 {
  */
 
 .sidebar-alert {
  */
 
 .sidebar-alert {

-  padding: 4px 5px 4px 5px;
+  padding: $lineheight/4;

   border-top: 1px solid #ccc;
   margin-top: 4px;
   border-top: 1px solid #ccc;
   margin-top: 4px;

-  margin-bottom: -4px;
+  margin-bottom: -5px;

   background: #e00;
   background: #e00;

-  font-size: 13px;
+  font-size: 12px;

   font-weight: bold;
   font-weight: bold;

-  line-height: 17px;
-

   p {
   p {

-    margin: 5px;
+    margin: $lineheight/4;

   }
 }
 
   }
 }
 


@@ -138,16 +290,14 @@ h2 {
  */
 
 .sidebar-notice {
  */
 
 .sidebar-notice {

-  padding: 4px 5px 4px 5px;
+  padding: $lineheight/4;

   border-top: 1px solid #ccc;
   margin-top: 4px;
   border-top: 1px solid #ccc;
   margin-top: 4px;

-  margin-bottom: -4px;
+  margin-bottom: -5px;

   background: #ea0;
   background: #ea0;

-  font-size: 13px;
-  line-height: 17px;
-
+  font-size: 12px;

   p {
   p {

-    margin: 5px;
+    margin: $lineheight/4;

   }
 }
 
   }
 }
 


@@ -156,47 +306,36 @@ h2 {
 .left_menu {
   left: 0px;
   margin: 0;
 .left_menu {
   left: 0px;
   margin: 0;

-  padding: 5px 10px;
-  line-height: 15px;
+  padding: $lineheight/4 $lineheight/2;

   font-size: 12px;
   font-size: 12px;

+  line-height: 1.25;

   list-style-type: none;
   border-bottom: 1px solid #ccc;
   border-top: 1px solid #ccc;
   list-style-type: none;
   border-bottom: 1px solid #ccc;
   border-top: 1px solid #ccc;

-}
-
-.left_menu ul {
-  padding: 0;
-  margin: 0;
-}
-
-.left_menu li {
-  list-style-type: none;
-  padding: 0;
-  margin: 0;
-}
-
-.left_menu h4 {
-  padding: 5px 0 5px 0;
-  font-size: 12px;
-  margin: 0;
-}
+  img {
+    margin: $lineheight/2 0px;
+  }

 
 

-.left_menu li:last-child h4 {
-  padding-top: 0;
-}
+  ul {
+    padding: 0;
+    margin: 0;
+  }

 
 

-/* Rules for SOTM advert */
+  li {
+    list-style-type: none;
+    padding: 0;
+    margin: 0;
+  }

 
 

-#sotm {
-  width: 165px;
-  margin: 10px;
-  padding: 0px;
-  border: 0px;
-  background: #fff;
-}
+  h4 {
+    padding: $lineheight/4 0 $lineheight/4 0;
+    font-size: 12px;
+    margin: 0;
+  }

 
 

-#sotm img {
-  width: 165px;
+  li:last-child h4 {
+    padding-top: 0;
+  }

 }
 
 /*
 }
 
 /*


@@ -207,180 +346,145 @@ h2 {
 
 .optionalbox {
   left: 0px;
 
 .optionalbox {
   left: 0px;

-  padding: 5px 10px;
-  margin: 5px 0;
+  padding: $lineheight/4 $lineheight/2;
+  margin: $lineheight/4 0;

   text-align: left;
 }
 
   text-align: left;
 }
 

-.optionalbox h1 {
-  font-size: 14px;
-  font-weight: bold;
-  line-height: 20px;
-  margin: 0px;
-  vertical-align: bottom;
-}
-

 /* Rules for the search box */
 
 /* Rules for the search box */
 

-.whereami {
-}
-
-#search_field form {
-  width: 165px;
-  margin: 0px;
-  padding: 0px;
-}
-

 #search_field {
   position: relative;
 #search_field {
   position: relative;

-}

 
 

-#search_field input[type="text"] {
-  width: 165px;
-  font-size: 14px;
-  line-height: 15px;
-  height: 25px;
-  padding: 2px 0px 2px 5px;
-  box-shadow: inset #DDD 0px 1px 3px;
-  box-sizing: border-box;
-  -webkit-box-sizing: border-box;
-  -moz-box-sizing: border-box;
-  -ms-box-sizing: border-box;
-}
+  form {
+    width: 165px;
+  }

 
 

-#search_field input[type="text"]:focus {
-  outline: none;
-  border: 1px solid #000;
-}
+  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;
+  }

 
 

-#search_field input[type="submit"] {
-  width: 15px;
-  height: 15px;
-  border: 0px;
-  text-indent: -1000px;
-  overflow: hidden;
-  text-transform: capitalize;
-  padding-left: 0px;
-  padding-right: 0px;
-  background: image-url("sprite.png");
-  position: absolute;
-  top: 5px;
-  right: 4px;
-  cursor: pointer;
+  input[type="text"]:focus {
+    outline: none;
+    border: 1px solid #000;
+  }
+
+  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") 0 0 no-repeat;
+    position: absolute;
+    top: $lineheight/4;
+    right: $lineheight/4;
+    cursor: pointer;
+  }

 }
 
 .search_help {
 }
 
 .search_help {

-  margin: 5px 0 0 0;
+  margin: $lineheight/4 0 0 0;

 }
 
 }
 

+/* Utility for de-emphasizing content */
+

 .deemphasize {
   color: #999;
 .deemphasize {
   color: #999;

-}
-
-.deemphasize a {
-  color: #7092FF;
+  a {
+    color: $blue;
+  }

 }
 
 /* Rules for donation request box */
 
 }
 
 /* Rules for donation request box */
 

-.donate {
+a.donate {

   display: block;
   display: block;

-  position: relative;
-  width: 153px;
-  margin: 10px 10px 0px 10px;
-  padding: 5px;
+  width: 163px;
+  padding: $lineheight/4;

   border: 1px solid #AED1A0;
   background: #cbeea7;
   border: 1px solid #AED1A0;
   background: #cbeea7;

-  line-height: 20px;
+  font-size: $typeheight;
+  line-height: 1.4;

   text-align: center;
   text-align: center;

-  font-size: 14px;

   border-radius: 2px;
   border-radius: 2px;

-  -moz-border-radius: 2px;

   color: #222;
   color: #222;

-}
-
-.donate:hover {
-  background: #9ed485;
-  text-decoration: none;
-}
-
-.donate p {
-  text-indent: 20px;
-  margin: 0;
-}
+  margin: $lineheight/2 $lineheight/2 0px $lineheight/2;

 
 

-.donate .donate-icon {
-  width: 15px;
-  height: 15px;
-  border: 0px;
-  padding-left: 0px;
-  padding-right: 0px;
-  background: image-url("sprite.png") 0 -30px no-repeat;
-  position: absolute;
-  top: 8px;
-  left: 17px;
+  &:hover {
+    background: #9ed485;
+    text-decoration: none;
+  }

 }
 
 /* Rules for Creative Commons logo button */
 
 #cclogo {
 }
 
 /* Rules for Creative Commons logo button */
 
 #cclogo {

-  margin-top: 10px;
-  margin-bottom: 10px;
+  margin: $lineheight/2 0;
+  float: right;

 }
 
 /* Rules for tabbed navigation bar */
 
 #top-bar {
 }
 
 /* Rules for tabbed navigation bar */
 
 #top-bar {

-  position: absolute;
-  z-index: 10000;
-  top: 0;
-  left: 185px;
-  right: 0;
-  height: 29px;
+  position: relative;
+  margin-left: 185px;
+  height: 30px;

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

+  z-index: 100;

 }
 
 }
 

-#tabnav {
-  padding: 0;
-  margin: 0;
-  overflow:hidden;
-}
-
-#tabnav li {
-  margin: 0px;
-  padding: 0px;
-  display: inline;
-  list-style-type: none;
+.site-edit #top-bar,
+.site-index #top-bar,
+.site-export #top-bar {
+  position: fixed;
+  left: 0;
+  right: 0;

 }
 
 }
 

-#tabnav a, #tabnav a:link, #tabnav a:visited {
-  float: left;
-  background: #fff;
-  font-size: 14px;
-  line-height: 19px;
-  font-weight: bold;
-  padding: 5px 10px;
-  margin-right: 1px;
-  text-decoration: none;
-  color: #333;
-  -webkit-transition: color 200ms ease-in;
-  -moz-transition: color 200ms ease-in;
-  -o-transition: color 200ms ease-in;
-  transition: color 200ms ease-in;
+#tabnav {
+  height: 29px;
+  margin-bottom:0;
+  overflow: hidden;
+  li {
+    display: inline;
+  }
+  a, a:link, a:visited {
+    float: left;
+    font-weight: bold;
+    padding: 3px $lineheight/2;
+    text-decoration: none;
+    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;
+  }

 }
 
 }
 

-body.site-index #tabnav a#viewanchor,
-body.site-edit #tabnav a#editanchor,
-body.changeset-list #tabnav a#historyanchor,
-body.site-export #tabnav a#exportanchor {
+.site-index #tabnav a#viewanchor,
+.site-edit #tabnav a#editanchor,
+.changeset-list #tabnav a#historyanchor,
+.site-export #tabnav a#exportanchor {

   border-bottom: 1px solid #aaa;
   background: #9ed485;
   color: #000;
 }
 
 #tabnav a:link:hover, #tabnav a:visited:hover {
   border-bottom: 1px solid #aaa;
   background: #9ed485;
   color: #000;
 }
 
 #tabnav a:link:hover, #tabnav a:visited:hover {

-  text-decoration:underline;
+  text-decoration: underline;

 }
 
 #tabnav a:link.disabled,
 }
 
 #tabnav a:link.disabled,


@@ -389,19 +493,17 @@ body.site-export #tabnav a#exportanchor {
 #tabnav a:visited:hover.disabled {
   color: #ccc;
   cursor: default;
 #tabnav a:visited:hover.disabled {
   color: #ccc;
   cursor: default;

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

 }
 
 }
 

-#tabnav a:link.disabled:hover,
-#tabnav a:visited.disabled:hover,
-#tabnav a:link:hover.disabled:hover,
-#tabnav a:visited:hover.disabled:hover {
-  text-decoration: none;
-}
+/* Utility for styling notification numbers */

 
 .count-number {
 
 .count-number {

-  padding: 2px 5px;
-  border-radius: 3px;
-  background: #eee;
+  padding: 2px $lineheight/4;
+  border-radius: 2px;
+  background: #d7d7ff;

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


@@ -411,11 +513,8 @@ body.site-export #tabnav a#exportanchor {
 
 #greeting {
   float: right;
 
 #greeting {
   float: right;

-  height: 28px;
-  margin: 0px;
-  padding-right: 10px;
-  font-size: 13px;
-  line-height: 28px;
+  padding-top: 3px;
+  margin-right: $lineheight/4;

 }
 
 .greeting-bar-unread {
 }
 
 .greeting-bar-unread {


@@ -433,250 +532,368 @@ body.site-export #tabnav a#exportanchor {
 
 /* Rules for Leaflet maps */
 
 
 /* Rules for Leaflet maps */
 

-#map {
-  margin: 0px;
-  border: 0px;
-  padding: 0px;
+.leaflet-control .control-button {
+  display: block;
+  height: 40px;
+  width: 40px;
+  background-color: white;
+  background-color: rgba(255,255,255,.8);
+  border-radius: 4px;
+  margin-bottom: 10px;

 }
 
 }
 

-.site-index .leaflet-top,
-.site-export .leaflet-top {
-  top: 40px !important;
-
-  .leaflet-control {
-    margin-top: 0px !important;
-  }
+.leaflet-control .zoomin,
+.control-layers .control-button {
+  margin-bottom: 0px;
+  border-radius: 4px 4px 0px 0px;

 }
 
 }
 

-.site-index #map .olControlScaleLine,
-.site-export #map .olControlScaleLine {
-  left: 10px !important;
+.site .leaflet-control .zoomout,
+.control-key .control-button {
+  margin-bottom: 0px;
+  border-radius: 0px;

 }
 
 }
 

-/* Rules for edit menu */
-
-.menuicon {
-  padding: 5px;
-
-  &:hover {
-    background: #eee;
-    text-decoration: none !important;
-  }
+.leaflet-control .zoomout,
+.control-locate .control-button,
+.control-share .control-button {
+  border-radius: 0px 0px 4px 4px;

 }
 
 }
 

-.menu {
-  display: none;
-  z-index: 10000;
-  position: absolute;
-  background-color: #ffffff;
-  border: 1px solid #cccccc;
-  border-top: 0px;
+.leaflet-control .control-button:hover {
+  background-color: white;

 }
 
 }
 

-.menu ul {
-  margin: 0px;
-  padding: 0px;
+.leaflet-control .control-button .icon {
+  margin: 10px;

 }
 
 }
 

-.menu li {
-  padding: 2px 5px;
-  margin: 0px;
-  list-style-type: none;
-  border-top: 1px solid #eee;
-  white-space: nowrap;
-}
+/* Rules for the home page */

 
 

-/* Rules for attribution text under the main map shown on printouts */
+.site-export #map,
+.site-index #map,
+.site-edit #map {
+  height: 100%;
+  overflow: hidden;
+}

 
 

-#attribution {
+#map-ui {

   display: none;
   display: none;

-}
+  position: relative;
+  float: right;
+  width: 250px;
+  height: 100%;
+  background: white;
+  border-left: 1px solid #CCC;
+  overflow: auto;

 
 

-.attribution_license {
-  text-align: left;
+  .section {
+    border-bottom: 1px solid #DDD;
+    padding: 15px;
+  }
+
+  a.close-button {
+    float: right;
+    padding:5px;
+    font-size:20px;
+    line-height:10px;
+    color:#222;
+    border:1px solid #ddd;
+  }

 }
 
 }
 

-.attribution_notice {
-  text-align: center;
+.layers-ui {
+  li {
+    border-radius: 4px;
+    overflow: hidden;
+    margin-bottom: 10px;
+  }
+
+  label {
+    display: block;
+    padding: 5px 5px 5px 7px;
+    background-color: #eee;
+    cursor: pointer;
+  }
+
+  li.active label {
+    background-color: #ccc;
+  }
+
+  .base-layers {
+    .leaflet-container {
+      width: 100%;
+      height: 50px;
+      cursor: pointer;
+    }
+  }

 }
 
 }
 

-.attribution_project {
-  text-align: right;
+.share-ui {
+  .share-link {
+    li {
+      display: inline-block;
+      width: 50%;
+    }
+  }

 }
 
 }
 

-/* Rules for the popout map sidebar */
+.site-index .leaflet-top,
+.site-export .leaflet-top {
+  top: $lineheight/2 !important;
+  .leaflet-control {
+    margin-top: 0px !important;
+  }
+}

 
 

-#sidebar {
-  display: none;
-  position: absolute;
-  margin: 30px 0px 0px 0px;
-  padding: 0px;
-  border-right: 1px solid #ccc;
-  width: 30%;
-  top: 0px;
-  bottom: 0px;
-  left: 0px;
+.leaflet-popup-scrolled {
+  padding-right: $lineheight;
+  border-bottom: 0px !important;
+  border-top: 0px !important;

 }
 
 }
 

-#sidebar #sidebar_content {
-  overflow: auto;
+.leaflet-popup-content-wrapper {
+  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;
   position: absolute;

-  font-size: 13px;
-  line-height: 15px;
-  top: 29px;
-  bottom: 0px;
-  left: 0px;
-  right: 0px;
+  background-color: #ffffff;
+  border: 1px solid $keyline;
+  border-top: 0px;
+  ul {
+    margin: 0px;
+  }
+  li {
+    padding: 2px $lineheight/4;
+    border-top: 1px solid #eee;
+    white-space: nowrap;
+  }

 }
 
 }
 

-#sidebar .sidebar_title {
-  margin: 0px;
-  padding: 3px 6px 4px 6px;
-  height: 29px;
-  font-size: 14px;
-  line-height: 15px;
-  background: #ccc;
+/* Rules for attribution text under the main map shown on printouts */
+
+#attribution {
+  display: none;

 }
 
 }
 

-#sidebar #sidebar_title {
+.attribution_license,
+.attribution_project {

   text-align: left;
 }
 
   text-align: left;
 }
 

-#sidebar #sidebar_close {
-  text-align: right;
+.attribution_notice {
+  text-align: center;

 }
 
 }
 

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

 
 

-#mapkey h3 {
-  font-size: 110%;
-  font-weight: normal;
-  text-align: center;
+#sidebar {
+  display: none;
+  position: relative;
+  float: left;
+  overflow: auto;
+  border-right: 1px solid $keyline;
+  width: 33.3333%;
+  ul {
+    margin-bottom: 0;
+    &:last-child {
+        border-bottom: 1px solid #ccc;
+    }
+    li {
+      margin-bottom: $lineheight/4;
+      &:last-child {
+        margin-bottom: 0;
+      }
+    }
+  }

 }
 
 }
 

-#mapkey .mapkey-table {
-  padding-left: 5px;
-  padding-right: 5px;
+.sidebar_heading {
+  position: relative;
+  padding: $lineheight/2 $lineheight;
+  z-index: 9999;
+  background: $offwhite;
+  border-bottom: 1px solid #ccc;
+  h4 {
+    margin: 0;
+  }

 }
 
 }
 

-#mapkey .mapkey-table-key img {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
+.sidebar_close {
+  position: absolute;
+  height: $lineheight;
+  top: 0px;
+  bottom: 0;
+  right: $lineheight;
+  margin: auto;

 }
 
 }
 

-#mapkey .mapkey-table-value {
-  font-size: 90%;
+#sidebar_content {
+  position: relative;
+  margin-bottom: 20px;
+  width: 100%;
+  h4 {
+    padding: 0 $lineheight $lineheight/2 $lineheight;
+    margin-top: $lineheight/2;
+    margin-bottom: 0;
+    border-bottom: 1px solid #ddd;
+  }
+}
+
+/* Rules for the map key which appears in the popout sidebar */
+
+#mapkey {
+ .mapkey-table-key img {
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+  }
+  td {
+    padding: 0 $lineheight/4 $lineheight/4 $lineheight/4;
+  }

 }
 
 /* Rules for search results which appear in the popout sidebar */
 
 .search_searching {
 }
 
 /* Rules for search results which appear in the popout sidebar */
 
 .search_searching {

-  margin-top: 5px;
-  margin-bottom: 5px;
+  margin-top: $lineheight/4;
+  margin-bottom: $lineheight/4;

 }
 
 }
 

-.search_results_heading {
-  margin: 0px;
-  padding: 2px 5px;
-  border-bottom: 1px solid #ccc;
-  font-weight: bold;
+.search_results_entry {
+  margin-bottom: 0;
+
+  .search_details {
+    display: block;
+    text-align: right;
+  }

 }
 
 }
 

-.search_results_entry {
-  margin: 0px;
-  padding: 2px 5px;
+.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 {
 .search_results_error {

-  margin: 0px;
-  padding: 2px 6px 0px;

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

-.browse_heading {
-  margin: 0px;
-  padding: 3px 6px;
-  border: 1px solid #ccc;
-  background: #ddd;
+#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;
+  }

 }
 
 .browse_details {
 }
 
 .browse_details {

-  margin: 0px;
-  padding: 0px 6px;
+  position: relative;

 }
 
 }
 

-/* Rules for export information which appears in the popout sidebar */
-
-.export_heading {
-  margin: 0px;
-  padding: 2px 5px;
-  border-bottom: 1px solid #ccc;
-  font-weight: bold;
+.browse_status {
+  display: none;

 }
 
 }
 

+/* Rules for export information which appears in the popout sidebar */
+

 .export_bounds {
 .export_bounds {

-  width: 100%;

   text-align: center;
 }
 
   text-align: center;
 }
 

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

 }
 
 }
 

-.export_details {
-  padding: 2px 6px;
+.export_bound {
+  margin: $lineheight/4;

 }
 
 }
 

-#export_osm {
-  display: none;
+.export_details input[type="text"]#export_html_text {
+  width: 100%;

 }
 
 }
 

-#export_mapnik {
-  display: none;
+#sidebar #marker_inputs li:last-child {
+  margin-bottom: $lineheight/2;

 }
 
 }
 

+#export_osm,
+#export_mapnik,

 #export_osmarender {
   display: none;
 }
 
 #export_osmarender {
   display: none;
 }
 

-.export_hint {
-  padding: 0px 12px;
-  font-style: italic;
-}
-
-.export_buttons {
-  width: 100%;
-  text-align: center;
-}
-

 /* Rules for the main content area */
 
 #content {
 /* Rules for the main content area */
 
 #content {

-  padding: 20px;
-  margin: 30px 0px 0px 185px;
-  border-left: 1px solid #ccc;
-  text-align: left;
+  padding: $lineheight;
+  position: relative;

 }
 
 .site-edit #content,
 .site-index #content,
 .site-export #content {
   position: fixed;
 }
 
 .site-edit #content,
 .site-index #content,
 .site-export #content {
   position: fixed;

-  margin-top: 0px;
-  left: 0px;
-  right: 0px;
-  top: 0px;
-  bottom: 0px;
-  padding: 0px;
+  padding: 0;
+  top: 30px; bottom: 0;
+  left: 184px; right: 0;
+  border-left: 1px solid #ccc;
+}
+
+.wrapper {
+  margin-left: 184px;
+  border-left: 1px solid #ccc;
+  text-align: left;

 }
 
 .site-edit #content {
   top: 30px;
 }
 
 }
 
 .site-edit #content {
   top: 30px;
 }
 

+#content.maximised {
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  border: 0;
+  z-index: 1000;
+}
+

 #slim_container {
   width: 100%;
 }
 #slim_container {
   width: 100%;
 }


@@ -684,7 +901,7 @@ body.site-export #tabnav a#exportanchor {
 #slim_container_content {
   max-width: 50em;
   background-color: #FFFFFF;
 #slim_container_content {
   max-width: 50em;
   background-color: #FFFFFF;

-  margin: 10px auto;
+  margin: $lineheight/2 auto;

   padding: 3px;
   border-radius: 25px;
   -moz-border-radius: 25px;
   padding: 3px;
   border-radius: 25px;
   -moz-border-radius: 25px;


@@ -692,329 +909,448 @@ body.site-export #tabnav a#exportanchor {
 }
 
 #slim_content {
 }
 
 #slim_content {

-  margin: 10px;
-  margin-top: 90px;
+  margin: $lineheight/2;
+  margin-top: 95px;

   max-width: 50em;
   max-width: 50em;

+
+  .content-heading {
+    margin-bottom: 15px;
+  }

 }
 
 #slim_header {
 }
 
 #slim_header {

-  margin: 10px;
+  margin: 30px $lineheight/2;

   position: absolute;
   top: 0px;
   position: absolute;
   top: 0px;

+  margin-right: $lineheight/4;
+  img {
+    vertical-align: middle;
+    margin-bottom: $lineheight/4;
+    margin-right: $lineheight/4;
+  }

 }
 
 }
 

-#slim_header img {
-  vertical-align: middle;
-  margin-bottom: 5px;
-  margin-right: 5px;
-}
-
-/* Rules for text content pages */
-
-.wide-table {
-  width: 100%;
+.content-heading {
+  position: relative;
+  padding: $lineheight;
+  background: $offwhite;
+  h1, h2 {
+    margin-bottom: $lineheight/2;
+    line-height: 100%;
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+  p {
+    margin-top: $lineheight/2;
+    margin-bottom: 0px;
+  }

 }
 
 }
 

-/* Rules for the home page */
+/* Rules for small maps in content areas */

 
 

-.site-index #map {
-  position: absolute;
-  top: 0px;
-  bottom: 0px;
-  left: 0px;
-  right: 0px;
-}
-
-.site-export #map {
-  position: absolute;
-  top: 0px;
-  bottom: 0px;
-  left: 0px;
-  right: 0px;
+.content_map {
+  position: relative;
+  width: 45%;
+  height: 400px;
+  border: 1px solid #ccc;
+  margin-bottom: $lineheight;
+  float: right;

 }
 
 }
 

-/* Rules for the edit page */
-
-.site-edit #map {
-  position: absolute;
-  top: 0px;
-  bottom: 0px;
-  left: 0px;
-  right: 0px;
-  overflow: hidden;
+.content_map #small_map {
+  height: 100%;
+  width: 100%;
+  margin-bottom: $lineheight;

 }
 
 /* Rules for the changeset list shown by the history tab etc */
 
 }
 
 /* Rules for the changeset list shown by the history tab etc */
 

-#changeset_list_container {
-  position: relative;
-}
-

 #changeset_list {
 #changeset_list {

-  width: 50%;
-  font-size: small;
-  border-collapse: collapse;
-  border-width: 0px;
-  margin-top: 1px;
-  margin-bottom: 1px;
-  text-align: left;
-}
-
-#changeset_list td {
-  vertical-align: top;
-  padding: 3px;
-}
-
-#changeset_list .date {
-  white-space: nowrap;
-}
-
-#changeset_list .user {
-  white-space: nowrap;
+  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 .area {
-  white-space: nowrap;
+#changeset_list_map_wrapper {
+  position: absolute;
+  width: 50%;
+  height: 490px;
+  top: 0;
+  right: 0;

 }
 
 }
 

-#changeset_list .selected {
-  background-color: rgb(255, 255, 160);
-  background-color: rgba(255, 255, 85, 0.5);
+#changeset_list_map_wrapper.scrolled {
+  position: fixed;

 }
 
 #changeset_list_map {
   position: absolute;
 }
 
 #changeset_list_map {
   position: absolute;

-  float: right;
-  top: 0px;
-  bottom: 0px;
-  right: 0px;
-  width: 49%;
-  min-height: 400px;
-  border: solid 1px black;
+  bottom: $lineheight;
+  top: $lineheight;
+  right: $lineheight;
+  left: $lineheight;
+  border: 1px solid #ccc;

 }
 
 }
 

-/* Rules for the data browser */
-
-#browse_navigation {
-  float: right;
-  width: 250px;
-  margin-left: 10px;
-  text-align: center;
+#changeset_list_map_wrapper.scrolled #changeset_list_map {
+  margin-left: 93px;

 }
 
 }
 

-table.browse_details th {
-  white-space: nowrap;
-}
+/* Rules for the data browser */

 
 

-#browse_map {
-  float: right;
-  width: 250px;
-  text-align: right;
-  margin-left: 10px;
+.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;
+  }
+  p, ul, .bbox, .geo {
+    display: inline-block;
+    vertical-align: top;
+    max-width: 65%;
+  }
+  ul p {
+    margin-left: 0;
+    margin-bottom: 0;
+  }
+  h4 {
+    width: 33.3333%;
+    display: inline-block;
+    vertical-align: top;
+  }

 }
 
 }
 

-#browse_map #small_map {
-  width: 250px;
-  height: 300px;
-  border: solid 1px black;
+.bbox {
+  div {
+    width: 33.3333%;
+    text-align: center;
+    padding: $lineheight/4 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    float: left;
+  }
+  .max_lat,
+  .min_lat {
+    margin-left: auto;
+    margin-right: auto;
+    width: 100%;
+  }

 }
 
 #browse_map .geolink {
   display: none;
 }
 
 }
 
 #browse_map .geolink {
   display: none;
 }
 

+#browse_map .secondary-actions {
+  margin-bottom: $lineheight/2;
+}
+

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

-  font-size: small;
-  border-collapse: collapse;
+  font-size: $lineheight/2;

   border-width: 0px;
   text-align: right;
   border-width: 0px;
   text-align: right;

-}

 
 

-#trace_list .trace_summary {
-  font-size: 12px;
-  color: gray;
-}
+  .trace_summary {
+    font-size: 12px;
+    color: gray;
+  }

 
 

-#trace_list .trace_pending {
-  color: red;
-}
+  .trace_pending {
+    color: red;
+  }

 
 

-#trace_list .trace_public {
-  color: green;
-}
+  .trace_public {
+    color: green;
+  }

 
 

-#trace_list .trace_identifiable {
-  color: green;
-}
+  .trace_identifiable {
+    color: green;
+  }

 
 

-#trace_list .trace_trackable {
-  color: red;
-}
+  .trace_trackable {
+    color: red;
+  }

 
 

-#trace_list .trace_private {
-  color: red;
+  .trace_private {
+    color: red;
+  }

 }
 
 }
 

-/* Rules for the user list */
+/* Rules for the user profile page */

 
 

-#user_list {
-  width: 100%;
-  font-size: small;
-}
+#userinformation {

 
 

-#user_list tr {
-  vertical-align: middle;
+  min-height: 100px;
+  .userinformation-inner {
+    float: left;
+  }
+  h2 {
+    margin-top: 0;
+  }
+  .user-description {
+    width: 100%;
+    clear: both;
+  }
+  .deemphasize {
+    margin: 0;
+  }

 }
 
 }
 

-#user_list p {
-  margin-top: 0px;
-  margin-bottom: 0px;
+.admin-user-info small {
+  margin-bottom: $lineheight/2;
+  display: inline;
+  margin-right: $lineheight;

 }
 
 }
 

-#user_list_actions {
-  float: right;
-  margin-top: 10px;
+.activity-block {
+  clear: left;
+  border-bottom: 1px solid #ccc;
+  padding-bottom: $lineheight;
+  float: left;
+  h3 {
+    margin-bottom: $lineheight/2;
+  }

 }
 
 }
 

-/* Rules for the diary list */
-
-.diary_entry-list img.user_image {
-  float: right;
+.contact-activity {
+  margin-top: $lineheight;
+  width: 100%;

 }
 
 }
 

-.diary_entry-list img.user_thumbnail {
-  float: right;
+.activity-details p {
+  margin-left: 70px;
+  margin-bottom: 0;

 }
 
 }
 

-/* Rules for the diary entry view */
-
-.diary_entry-view img.user_image {
-  float: right;
+#friends-container .contact-activity ul {
+  margin-left: 70px;

 }
 
 }
 

-.diary_entry-view img.user_thumbnail {
-  float: right;
+.user-view {
+  p#no_home_location {
+    margin: $lineheight;
+  }
+  .user_thumbnail {
+    margin-top: $lineheight/4;
+    float: left;
+  }

 }
 
 }
 

-/* Rules for the new diary entry page */
+/* Rules for the user map */

 
 

-.diary_entry div#map {
-  position: relative;
-  width: 90%;
-  height: 400px;
-  border: 1px solid #ccc;
-  display: none;
+.content_map .leaflet-popup-content {
+  margin: $lineheight/2;
+  min-height: 50px;

 }
 
 }
 

-/* Rules for the login page */
+/* Rules for user popups on maps */

 
 

-#login_wrapper div {
-  margin: 5px;
-  padding: 15px;
-  border-radius: 15px;
-  -moz-border-radius: 15px;
+.user_popup {
+  min-width: 200px;
+  p {
+    padding: 0 0 5px 0;
+    margin-top: 0 0 0 60px;
+    font-size: 12px;
+  }
+  img.user_thumbnail {
+    float: left;
+    margin: 0 $lineheight/2 0 0;
+  }

 }
 
 }
 

-#login_login {
-  background-color: #f5f5ff;
-  border: 1px solid #f3f3ff;
-  border-radius: 15px;
-  -moz-border-radius: 15px;
-}
+/* Rules for the user list */

 
 

-#login_login h1 {
-  margin-top: 5px;
-}
+#user_list {
+  font-size: $lineheight/2;
+  width: 100%;

 
 

-table#login_openid_buttons {
-  padding-bottom: 10px;
-}
+  tr {
+    vertical-align: middle;
+  }

 
 

-#login_openid_buttons td {
-  padding-left: 10px;
-  padding-right: 10px;
-  padding-top: 5px;
-  padding-bottom: 5px;
+  p {
+    margin-top: 0px;
+    margin-bottom: 0px;
+  }

 }
 
 }
 

-#login_openid_buttons img {
-  border: 0;
+#user_list_actions {
+  float: right;
+  margin-top: $lineheight/2;

 }
 
 }
 

-#login_signup form.button-to div {
-  margin: 0px;
-  padding: 0px;
+/* Rules for the diary list page */
+
+.diary_entry-list img.user_thumbnail {
+  float: left;

 }
 
 }
 

-/* Rules for the account confirmation page */
+.diary_post {
+  max-width: 740px;
+  position: relative;
+  margin-top: $lineheight/2;
+  padding-top: $lineheight;
+  border-top: 1px solid #ccc;

 
 

-div#contributorTerms {
-  border: 1px solid black;
-  padding: 4px;
-  overflow: auto;
-  width: 95%;
-  height: 400px;
+  &:first-child {
+    margin-top: 0;
+    border-top: 0;
+    padding-top: 0;
+  }
+  h1, h2 {
+    font-size: 21px;
+    line-height: 1em;
+  }
+  small.deemphasize {
+    float: left;
+    display: block;
+  }
+  ul.secondary-actions { display: inline-block;}

 }
 
 }
 

-div#slim_content div#contributorTerms {
-  width: auto;
+.content-heading .hide_unless_logged_in { // hacky selector, better to just add a new class to this div
+  display: inline;

 }
 
 }
 

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

 }
 
 }
 

-div#contributorTerms p#last {
-  margin-bottom: 0px;
+/* Rules for the diary entry page */
+
+.diary_entry {
+  #map {
+    position: relative;
+    width: 90%;
+    height: 400px;
+    border: 1px solid #ccc;
+    display: none;
+    margin-bottom: $lineheight;
+  }
+  #newcomment {
+    border-top: 1px solid #ccc;
+    padding-top: $lineheight;
+    margin-top: $lineheight/2;
+  }
+  .comments {
+    max-width: 740px;
+  }
+  .diary-comment {
+    margin-top: $lineheight/2;
+    border-top: 1px dashed #ccc;
+    padding-top: $lineheight/2;
+    &:first-child {
+      margin-top: $lineheight;
+      padding-top: $lineheight;
+      border-top: 1px solid #ccc;
+    }
+    p {
+      margin-bottom: $lineheight/2;
+    }
+    .comment-heading {
+      margin-bottom: 0;
+      margin-top: 0;
+    }
+  }

 }
 
 }
 

-div#contributorTerms ol {
-  margin-bottom: 0px;
+.diary_entry-view img.user_thumbnail {
+  float: left;

 }
 
 }
 

-div#contributorTerms img {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-  margin-top: 10%;
+/* Rules for the login page */
+
+#login_openid_buttons {
+  margin-bottom: 0;

 }
 
 }
 

-form#termsForm {
-  width: 95%;
-  margin-bottom: 3em;
+#login_openid_buttons li {
+  float: left;
+  padding: $lineheight/4 $lineheight/2;

 }
 
 }
 

-form#termsForm div#buttons {
-  float: right;
-}
+/* Rules for the account confirmation page */

 
 

-form#termsForm input#agree {
-  margin-left: 50px;
-}
+#terms {
+  .legale {
+    border: 1px solid #ccc;
+    padding: $lineheight;
+    margin-bottom: $lineheight;
+    overflow: auto;
+    height: 10em;

 
 

-div#slim_content form#termsForm {
-  width: auto;
-}
+    &:p#last {
+      margin-bottom: 0px;
+    }

 
 

-p#contributorGuidance {
-  background-color: #f5f5ff;
-  border: 1px solid #f3f3ff;
-  border-radius: 15px;
-  -moz-border-radius: 15px;
-  padding: 10px;
-}
+    &:ol {
+      margin-bottom: 0px;
+    }

 
 

-/* Rules for the account settings page */
+    &:img {
+      display: block;
+      margin: $lineheight auto inherit auto;
+    }
+  }

 
 

-#accountForm {
-  margin-top: 20px;
+  form.sign {
+    input[type=submit] {
+      float: left;
+    }
+    #decline {
+      background: $grey;
+      &:hover {
+        background: darken($grey, $hovercolor);
+      }
+    }
+  }
+  fieldset {
+    margin-bottom: $lineheight;
+  }
+  #contributorGuidance {
+    background-color: $offwhite;
+    border-radius: 4px;
+    -moz-border-radius: 4px;
+  }
+  .signing-buttons {
+    height: 50px;
+  }

 }
 
 }
 

-#accountForm td {
-  padding-bottom: 10px;
-}
+/* Rules for the account settings page */

 
 #accountForm .user_map {
   position: relative;
 
 #accountForm .user_map {
   position: relative;


@@ -1023,19 +1359,16 @@ p#contributorGuidance {
   border: 1px solid #ccc;
 }
 
   border: 1px solid #ccc;
 }
 

-#accountForm td.accountImage {
-  img {
-    vertical-align: top;
-    margin-top: 3px;
-  }
+#accountForm .user_image {
+  margin-bottom: 0;
+}

 
 

-  table {
-    display: inline-block;
+#accountForm #user_image {
+  margin-left: 20px;
+}

 
 

-    td {
-      padding-bottom: 0px;
-    }
-  }
+#accountForm ul.accountImage-options {
+  margin-left: 120px;

 }
 
 .nohome .location {
 }
 
 .nohome .location {


@@ -1050,83 +1383,61 @@ p#contributorGuidance {
   display: inline !important;
 }
 
   display: inline !important;
 }
 

-#accountForm input[type=submit] {
-  margin-top: 15px;
-}
-
-/* Rules for the user view */
-
-.user-view img.user_image {
-  float: right;
-}
-
-.user-view .user_map {
-  float: right;
-  position: relative;
-  width: 400px;
-  height: 400px;
-  border: 1px solid #ccc;
-}
-
-.user-view .user_map p#no_home_location {
-  position: absolute;
-  top: 0px;
-  bottom: 0px;
-  width: 90%;
-  height: 30%;
-  margin: auto 5%
-}
-
-/* Rules for the user map */
-
-.user_map .leaflet-control-pan,
-.user_map .leaflet-control-zoomslider {
-  display: none;
-}
-
-.user_map .leaflet-control-zoom {
-  display: block;
+.content_map.settings_map {
+  width: 50%;
+  float: none;

 }
 
 }
 

-/* Rules for user popups on maps */
-
-.user_popup {
-  min-width: 200px;
-}
+/* Rules for the oauth settings page */

 
 

-.user_popup p {
-  padding-top: 3px;
-  padding-bottom: 3px;
-  margin-top: 0px;
-  margin-bottom: 0px;
-  margin-left: 55px;
-  margin-right: 2px;
+.oauth_clients .buttons .oauth-edit {
+  border-radius: 2px 0 0 2px;

 }
 
 }
 

-.user_popup img.user_thumbnail {
-  float: left;
+.oauth_clients .buttons .oauth-delete {
+  border-radius: 0 2px 2px 0;

 }
 
 }
 

-/* Rules for message in/out box page */
+/* Rules for messages pages */

 
 .messages {
   width: 100%;
 
 .messages {
   width: 100%;

-  border-collapse: collapse;
-  border-spacing: 0px;
-  border-width: 0px;
-}
+  border: 1px solid #ddd;

 
 

-.messages tbody tr {
-  border-top: 1px solid #ccc;
-}
+  input[type="submit"] {
+    margin: auto;
+  }
+  tbody tr {
+    border-top: 1px solid #ccc;
+  }

 
 

-.messages .inbox-row {
-  background: #eee;
-}
+  .inbox-row {
+    background: #f8f8ff;
+  }

 
 

-.messages tr td,
-.messages tr th {
-  padding: 0px 5px;
+  .inbox-row-unread {
+    background:#CBEEA7;
+  }
+
+  .right {
+    float: right;
+  }
+
+  tr td,
+  tr th {
+    padding: $lineheight/4;
+  }
+  p:last-child,
+  h2:last-child,
+  h3:last-child,
+  ol:last-child,
+  ul:last-child {
+    margin-bottom:0;
+  }
+  tr td {
+    height: 30px;
+    border-right: 1px solid $keyline;
+  }

 }
 
 .inbox-row .inbox-mark-read {
 }
 
 .inbox-row .inbox-mark-read {


@@ -1134,61 +1445,59 @@ p#contributorGuidance {
 }
 
 .info-line {
 }
 
 .info-line {

+  margin-bottom: $lineheight;
+  padding: $lineheight/4 0px 4px 0px;

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

-  padding: 5px 0px 4px 0px;
-}

 
 

-.info-line form,
-.info-line form div {
-  display: inline;
+  form, form div {
+    display: inline;
+  }

 }
 
 .info-line .user_thumbnail_tiny {
   vertical-align: middle;
 }
 
 }
 
 .info-line .user_thumbnail_tiny {
   vertical-align: middle;
 }
 

-.right {
-  float: right;
+.inbox-mark-unread,
+.inbox-mark-read,
+.inbox-delete {
+  width: 1%;

 }
 
 .inbox-row-unread .inbox-mark-unread {
   display: none;
 }
 
 }
 
 .inbox-row-unread .inbox-mark-unread {
   display: none;
 }
 

-/* Rules for "flash" notice boxes shown at the top of the content area */
-
-#error {
-  border: 1px solid red;
-  padding: 7px;
-  background-color: #fff0f0;
-  margin-bottom: 20px;
-  border-radius: 5px;
-  -moz-border-radius: 5px;
+.message-read .message-buttons {
+  margin-top: $lineheight;
+  padding-top: $lineheight;
+  border-top: 1px solid $keyline;

 }
 
 }
 

-#warning {
-  border: 1px solid orange;
-  padding: 7px;
-  background-color: #fff6f0;
-  margin-bottom: 20px;
-  border-radius: 5px;
-  -moz-border-radius: 5px;
+.message-read .buttons .mark-unread-button {
+  border-radius: 0;

 }
 
 }
 

-#notice {
-  border: 1px solid green;
-  padding: 7px;
-  background-color: #f0fff0;
-  margin-bottom: 20px;
-  border-radius: 5px;
-  -moz-border-radius: 5px;
+/* 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;
+  }

 }
 
 /* Rules for highlighting fields with rails validation errors */
 
 .field_with_errors {
   padding: 2px;
 }
 
 /* Rules for highlighting fields with rails validation errors */
 
 .field_with_errors {
   padding: 2px;

-  background-color: red;
+  background-color: #ff7070;

   display: table;
 }
 
   display: table;
 }
 


@@ -1196,50 +1505,89 @@ p#contributorGuidance {
 
 #errorExplanation {
   width: 400px;
 
 #errorExplanation {
   width: 400px;

-  border: 2px solid red;
-  padding: 7px;
-  padding-bottom: 12px;
-  margin-bottom: 20px;
+  border: 2px solid #ff7070;
+  padding: 0 $lineheight/2;
+  margin-bottom: $lineheight;

   background-color: #f0f0f0;
   background-color: #f0f0f0;

-}

 
 

-#errorExplanation h2 {
-  font-weight: bold;
-  font-size: 12px;
-  padding: 5px 5px 5px 15px;
-  margin: -7px;
-  background-color: #c00;
-  color: #fff;
-  text-align: left;
-}
+  h2 {
+    margin: 0 -10px 10px -10px;
+    padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;
+    font-weight: bold;
+    font-size: 12px;
+    background-color: #c00;
+    color: #fff;
+    text-align: left;
+  }

 
 

-#errorExplanation p {
-  color: #333;
-  margin-bottom: 0px;
-  padding: 5px;
-}
+  p {
+    color: #333;
+    margin-bottom: 0px;
+    padding: $lineheight/4;
+  }

 
 

-#errorExplanation ul li {
-  font-size: 12px;
-  list-style: square;
+  ul {
+    padding-left: $lineheight;
+
+    li {
+      font-size: 12px;
+      list-style: disc;
+    }
+  }

 }
 
 /* Rules for forms */
 
 }
 
 /* Rules for forms */
 

-.fieldName {
-  vertical-align: top;
-  font-weight: bold;
-  font-size: 12px;
-  line-height: 20px;
-  text-align: right;
+.standard-form {
+  fieldset {
+    margin-bottom: $lineheight;
+  }
+  label.standard-label {
+    display: block;
+    margin-bottom: $lineheight/4;
+    font-size: $typeheight;
+    font-weight: bold;
+    line-height: 1.5;
+  }
+  label.standard-label.secondary {
+    display: inline-block;
+    font-weight: normal;
+  }
+  .form-help {
+    font-weight: normal;
+  }
+  .form-column {
+    float: left;
+    margin-right: 20px;
+  }
+  .form-divider {
+    margin-top: $lineheight;
+    padding-top: $lineheight;
+    border-top: 1px solid $keyline;
+  }
+  .form-row {
+    margin-bottom: $lineheight/2;
+  }
+  .form-list {
+    margin-bottom: 0;
+  }
+  .form-list li {
+    margin-bottom: 5px;
+   }
+  input[type="checkbox"],
+  input[type="radio"] {
+    float: left;
+    margin-top: 5px;
+  }

 }
 
 }
 

-.submitButton {
-  text-align: right;
+#remember_me_openid {
+  display: block;

 }
 
 }
 

-.minorNote {
-  font-size: 0.8em;
+input[type="checkbox"],
+input[type="radio"] {
+    margin-right: 5px;

 }
 
 input[type="text"],
 }
 
 input[type="text"],


@@ -1248,11 +1596,15 @@ input[type="url"],
 input[type="password"],
 textarea {
   border: 1px solid #ccc;
 input[type="password"],
 textarea {
   border: 1px solid #ccc;

+  padding: 2px 5px;
+  margin: 0;
+  width: 200px;

 }
 
 }
 

-input.openid_url {
-  background: image-url('openid_input.png') repeat-y left white;
-  padding-left: 16px;
+textarea {
+  padding: 5px;
+  width: 100%;
+  height: 100% !important;

 }
 
 /* Rules for user images */
 }
 
 /* Rules for user images */


@@ -1261,12 +1613,16 @@ img.user_image {
   max-width: 100px;
   max-height: 100px;
   border: 1px solid #ccc;
   max-width: 100px;
   max-height: 100px;
   border: 1px solid #ccc;

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

 }
 
 img.user_thumbnail {
   max-width: 50px;
 }
 
 img.user_thumbnail {
   max-width: 50px;

-  max-height: 100px;
+  max-height: 50px;

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

+  margin-right: $lineheight;

 }
 
 img.user_thumbnail_tiny {
 }
 
 img.user_thumbnail_tiny {


@@ -1291,16 +1647,135 @@ abbr.geo {
 
 .rsssmall {
   position: relative;
 
 .rsssmall {
   position: relative;

-  top: 4px;
+  top: 5px;
+}
+
+/* General styles for action lists / subnavs / pager navs */
+
+ul.secondary-actions {
+  font-style: normal;
+  margin-bottom: 0;
+  margin-left: 0;
+  &.pager {
+    display: inline-block;
+    margin-right: 60px;
+  }
+  li {
+    display: block;
+    float: left;
+    list-style: none;
+    border-left: 1px solid #ccc;
+    padding-left: $lineheight/4;
+    margin-right: $lineheight/4;
+    &:first-child {
+      border-left: 0;
+      padding-left: 0;
+    }
+    &:last-child {
+      margin-right: 0px;
+    }
+  }
+}
+
+/* Utility for managing inner content areas */
+
+.inner22 { padding: $lineheight;}
+
+.inner12 { padding: $lineheight/2 $lineheight;}
+
+.inner11 { padding: $lineheight/2;}
+
+.inner02 { padding: 0 $lineheight;}
+
+/* Utility for general button styles */
+
+input[type="button"],
+input[type="submit"],
+input[type="reset"],
+a.button {
+  cursor: pointer;
+  border: 0;
+  display: inline-block;
+  line-height: 20px;
+  padding: $lineheight/4 $lineheight/2;
+  min-width: 120px;
+  margin: 0 0 $lineheight/2 0;
+  color: white;
+  background: $blue;
+  text-align: center;
+  border-radius: 2px;
+  -moz-border-radius: 2px;
+  &:hover {
+    background: darken($blue, $hovercolor);
+    text-decoration: none;
+  }
+  &.deemphasize {
+    background: $lightblue;
+    &:hover {
+      background: darken($lightblue, $hovercolor);
+    }
+  }
+  &:disabled {
+    background: $lightblue;
+  }
+  &:last-child {
+    margin-bottom: 0;
+  }
+}
+
+.buttons {
+  min-width: 200px;
+  input[type="submit"],
+  input[type="button"],
+  input[type="reset"],
+  .button {
+    box-sizing: border-box;
+    float: left;
+    border-radius: 0;
+    margin:0;
+    min-width: 100px;
+    max-width: 150px;
+    border-right:1px solid white;
+  }
+  input:first-child,
+  .button:first-child {
+    border-radius:2px 0 0 2px;
+  }
+  input:last-child,
+  .button:last-child {
+    border-radius:0 2px 2px 0;
+    border-right-width: 0;
+  }
+  input:only-child,
+  .button:only-child,
+  *[value="Hide"] + input:last-child,
+  *[value="Hide"] + .button:last-child {
+    border-radius:2px;
+    border-right-width: 0;
+  }
+    /* if a 3-button set has a hidden middle button */
+  *[value="Hide"] + input:nth-child(3),
+  *[value="Hide"] + .button:nth-child(3) {
+    border-radius:0 2px 2px 0;
+    border-right-width: 0;
+  }
+  /* if a 3-button set starts with a hidden button */
+  *[value="Hide"] + input:nth-child(2):not(:last-child),
+  *[value="Hide"] + .button:nth-child(2):not(:last-child) {
+    border-radius:2px 0 0 2px;
+    border-right-width: 1px solid white;
+  }

 }
 
 /* Rules for doing distinct colour of alternate table rows */
 
 }
 
 /* Rules for doing distinct colour of alternate table rows */
 

-.table0 {
-  background: #f6f6f6;
+.table0,
+.item0 {
+  background: $offwhite;

 }
 
 }
 

-.table1 {
+.table1,
+.item1 {

   background: #fff;
 }
 
   background: #fff;
 }
 


@@ -1311,22 +1786,99 @@ abbr.geo {
   border: 0;
 }
 
   border: 0;
 }
 

+/* Rules for rich text */
+
+.richtext,
+.prose {
+  h1, h2 {
+    padding-bottom: $lineheight/2;
+    border-bottom: 1px dashed #cccccc;
+    margin-bottom: $lineheight/2;
+  }
+
+  h1 {
+    font-size: 24px;
+  }
+
+  h2 {
+    font-size: 18px;
+  }
+
+  h3 {
+    font-size: $typeheight;
+  }
+
+  code {
+    font-size: 13px;
+    background: #e8e8e8;
+    padding: 2px 3px;
+  }
+
+  pre {
+    font-size: 13px;
+    background: #e8e8e8;
+    padding: 2px 3px;
+
+    code {
+      padding: 0;
+    }
+  }
+
+  img {
+    padding: $lineheight;
+    background-color: $offwhite;
+    display: block;
+    max-width: 100%;
+    margin: auto;
+  }
+
+  blockquote {
+    border-left: $lineheight solid $offwhite;
+    padding-left: $lineheight;
+    margin: 0;
+    color: #7E7E7E;
+  }
+
+  ul, ol {
+    font-style: italic;
+    padding-left: $lineheight;
+    margin-bottom: $lineheight;
+    margin-left: $lineheight;
+  }
+
+  ul li {
+    list-style: disc;
+  }
+
+  ol li {
+    list-style: decimal;
+  }
+}
+
+.diary_post .richtext {
+    margin-top: $lineheight;
+  }
+
+.comments .richtext {
+  margin-left: 70px;
+  margin-top: 0;
+}
+

 /* Rules for rich text editors */
 
 .richtext_container {
 /* Rules for rich text editors */
 
 .richtext_container {

-  white-space: nowrap;
+  margin-bottom: $lineheight;

 
   .richtext_content {
 
   .richtext_content {

+    width: 50%;

     display: inline-block;
     vertical-align: top;
 
     .richtext_preview {
       display: inline-block;
     display: inline-block;
     vertical-align: top;
 
     .richtext_preview {
       display: inline-block;

-      margin-top: 1px;
-      margin-bottom: 1px;
-      border: 4px solid #eee;
-      background-color: #eee;
-      white-space: normal;
+      padding: $lineheight;
+      background-color: $offwhite;
+      overflow-x: auto;

 
       &.loading {
         background-image: image-url("loading.gif");
 
       &.loading {
         background-image: image-url("loading.gif");


@@ -1343,36 +1895,137 @@ abbr.geo {
   .richtext_help {
     display: inline-block;
     vertical-align: top;
   .richtext_help {
     display: inline-block;
     vertical-align: top;

-    background-color: #ddd;

     margin-left: 15px;
     margin-left: 15px;

-    padding: 5px 10px 10px 10px;
-    font-size: 12px;
+    background-color: #f8f8ff;
+    padding: $lineheight/2;
+    width: 220px;

 
 

-    p {
-      margin: 0px;
+    ul {
+      margin-bottom: 0;
+    }
+
+    h4.heading, li {
+      border-bottom: 1px solid #ccc;
+      margin-bottom: $lineheight/4;
+      padding-bottom: $lineheight/4;

     }
 
     }
 

-    th {
+    li h4, li span, li p {
+      display: inline-block;

       vertical-align: top;
       vertical-align: top;

-      text-align: left;
-      padding: 0px 15px 0px 0px !important;
+      font-size: 11px;

     }
 
     }
 

-    td {
-      text-align: left;
-      font-family: fixed;
-      line-height: 16px;
-      padding: 0px !important;
+    li h4 {
+      width: 40%;
+      margin: 0;

     }
 
     }
 

-    input.richtext_doedit {
-      margin-top: 5px !important;
-      margin-right: 10px !important;
+    li span, li p {
+      width: 50%;
+      margin-left: $lineheight/2;
+      margin-bottom: $lineheight/4;
+      white-space: nowrap;

     }
     }

+  }
+}
+
+/* Rules for the user notes list */
+
+.note_list {
+  tr.creator {
+    background-color: #eeeeee;
+  }
+
+  td {
+    padding: 3px;
+  }
+
+  p {
+    margin-bottom: 0px;
+  }
+}
+
+/* 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;
+    background: image-url("sprite.png") 0 -45px no-repeat;
+  }
+
+  .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;

 
 

-    input.richtext_dopreview {
-      margin-top: 5px !important;
-      margin-left: 10px !important;
+    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
+ */
+.id-embed {
+  width: 100%;
+  height: 100%;
+}
+
+/* Rules for rotating sidebar ads */
+.ad-container {
+  display: block;
+  height: 120px;
+  overflow: hidden;
+  position: relative;
+  border-bottom: 1px solid #ccc;
+}
+
+.ad {
+  height: 100px;
+  border: 0;
+  background: #fff;

 }
 }