X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/2e6852b1a6d1c33c139be82f26b0171a60a8e89a..a36f3558dd43dd5a598e36dd21fd5f7d2b4a94f5:/app/assets/stylesheets/common.css.scss

diff --git a/app/assets/stylesheets/common.css.scss b/app/assets/stylesheets/common.css.scss
index a5ce30981..255b846cf 100644
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1,30 +1,137 @@
 /* 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 {
+  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: 14px/20px "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 */
 
 body {
   font-family: 'Helvetica Neue',Arial,sans-serif;
   font-size: 14px;
-  line-height: 20px;
+  line-height: 1.6666;
   color: #222;
   background-color: #fff;
   margin: 0px;
   padding: 0px;
+  text-align: left;
 }
 
 body.slim {
   background-color: #f0f0f0;
 }
 
+h1, h2, h3 {
+  margin-top: 10px;
+  margin-bottom: 20px;
+  font-weight: bold;
+  line-height: 1.2;
+}
+
+h1, h2 {
+  font-size: 32px;
+}
+
+#content h2 {
+  font-size: 24px;
+}
+
+h3 {
+  font-size: 21px;
+  margin-top: 10px;
+  margin-bottom: 20px;
+}
+
+h4,h5,h6 {
+  font-size: 14px;
+  margin-top: 10px;
+  margin-bottom: 20px;
+  font-weight: bold;
+  line-height: 1.5;
+}
+
+p, ul {
+  margin-bottom: 20px;
+}
+
+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-bottom: 20px;
+}
+
+.small_icon {
+  vertical-align: middle;
+  margin-right: 5px;
+}
+
 /* Rules for links */
 
 a {
   color: #00f;
   text-decoration: none;
-}
-
-a:hover {
-  text-decoration: underline;
+  &:hover {
+    text-decoration: underline;
+  }
 }
 
 /* Rules for horizontal lines */
@@ -36,32 +143,46 @@ hr {
   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: 20px;
+  th, td {
+    text-align: left;
+    padding: 5px;
+    line-height: 20px;
+  }
+  th {
+    font-weight: bold;
+    vertical-align: top;
+  }
+  td {
+    vertical-align: middle;
+  }
 }
 
 /* Rules for the whole left sidebar, including the logo */
 
 #left {
   position: absolute;
-  top: 0px;
+  height: 100%;
   width: 185px;
   font-size: 11px;
   line-height: 12px;
+  z-index: 100;
+  border-right: 1px solid #ccc;
 }
 
 /* Rules for the OpenStreetMap logo in the top left corner */
 
 #logo {
+  display: block;
   width: 170px;
   min-width: 170px;
-  padding: 5px;
+  padding: 20px 5px;
   text-align: center;
-  margin: 25px 0 5px 0;
+  margin: auto;
 }
 
 #logo h1 {
@@ -85,12 +206,17 @@ h2 {
 
 /* Rules for the introductory text displayed in the left sidebar to new users */
 
-#intro {
-  border-top: 1px solid #ccc;
+.sidebar-copy {
+  padding: 5px 10px;
 }
 
-#intro p {
-  margin: 5px;
+.sidebar-copy p {
+  margin: 5px 0;
+}
+
+.sidebar-copy.intro {
+  margin-top: -1px;
+  border-top: 1px solid #ccc;
 }
 
 /*
@@ -99,16 +225,17 @@ h2 {
  * undergoing maintenance.
  */
 
-#alert {
-  width: 170px;
-  margin: 5px;
+.sidebar-alert {
   padding: 5px;
-  border: 1px solid #ccc;
-  background: #d00;
-  line-height: 1.2em;
-  font-size: 14px;
-  border-radius: 5px;
-  -moz-border-radius: 5px;
+  border-top: 1px solid #ccc;
+  margin-top: 4px;
+  margin-bottom: -4px;
+  background: #e00;
+  font-size: 12px;
+  font-weight: bold;
+  p {
+    margin: 5px;
+  }
 }
 
 /*
@@ -117,60 +244,70 @@ h2 {
  * donation drives.
  */
 
-.notice {
-  width: 170px;
-  margin: 5px;
+.sidebar-notice {
   padding: 5px;
-  border: 1px solid #ccc;
+  border-top: 1px solid #ccc;
+  margin-top: 4px;
+  margin-bottom: -4px;
   background: #ea0;
-  line-height: 20px;
-  font-size: 14px;
-  border-radius: 5px;
-  -moz-border-radius: 5px;
+  font-size: 12px;
+  p {
+    margin: 5px;
+  }
 }
 
 /* Rules for the menu displayed in the left sidebar */
 
 .left_menu {
-  padding: 5px;
-  margin: 4px 0;
-  border-top: 1px solid #ccc;
+  left: 0px;
+  margin: 0;
+  padding: 5px 10px;
+  line-height: 15px;
+  font-size: 12px;
+  list-style-type: none;
   border-bottom: 1px solid #ccc;
-  line-height: 20px;
-  font-size: 14px;
-  font-weight: bold;
+  border-top: 1px solid #ccc;
 }
 
-.left_menu h1 {
-  font-style: normal;
-  font-size: 15px;
+.left_menu img {
+  margin: 10px 0px;
 }
 
 .left_menu ul {
-  margin: 0px;
-  list-style-type: none;
+  padding: 0;
+  margin: 0;
 }
 
 .left_menu li {
-  margin: 0px;
-  padding: 0px;
+  list-style-type: none;
+  padding: 0;
+  margin: 0;
 }
 
-.left_menu a {
-  color: #000;
+.left_menu h4 {
+  padding: 5px 0 5px 0;
+  font-size: 12px;
+  margin: 0;
+}
+
+.left_menu li:last-child h4 {
+  padding-top: 0;
 }
 
 /* Rules for SOTM advert */
 
 #sotm {
-  width: 180px;
-  min-width: 180px;
-  margin: 5px;
+  width: 165px;
+  margin: 10px;
   padding: 0px;
   border: 0px;
   background: #fff;
 }
 
+#sotm img {
+  width: 165px;
+}
+
 /*
  * Rules for "optional boxes" which appear in the left sidebar on
  * certain pages. Current users are the seach box on the main page
@@ -178,132 +315,202 @@ h2 {
  */
 
 .optionalbox {
-  padding: 5px;
-  margin: 4px 0;
-  border-top: 1px solid #ccc;
-}
-
-.optionalbox h1 {
-  font-size: 14px;
-  font-weight: bold;
-  line-height: 20px;
-  margin: 0px;
-  vertical-align: bottom;
+  left: 0px;
+  padding: 5px 10px;
+  margin: 5px 0;
+  text-align: left;
 }
 
 /* Rules for the search box */
 
-.whereami {
-  line-height: 20px;
-  vertical-align: bottom;
+#search_field form {
+  width: 165px;
 }
 
-.search_container {
-  height: 15px;
-  padding-bottom: 5px;
+#search_field {
+  position: relative;
 }
 
-#search_field form {
-  width: 100%;
-  margin: 0px;
-  padding: 0px;
+#search_field input[type="text"] {
+  width: 165px;
+  padding: 3px;
+  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;
 }
 
-#search_field input[type="text"] {
-  width: 136px;
+#search_field input[type="text"]:focus {
+  outline: none;
+  border: 1px solid #000;
 }
 
 #search_field input[type="submit"] {
-  width: 26px;
-  padding-left: 0px;
-  padding-right: 0px;
+  border: 0;
+  margin: 0;
+  padding: 0;
+  width: 15px;
+  height: 15px;
+  text-indent: -1000px;
+  overflow: hidden;
+  background: image-url("sprite.png") 0 0 no-repeat;
+  position: absolute;
+  top: 5px;
+  right: 5px;
+  cursor: pointer;
 }
 
 .search_help {
-  margin-top: 2px;
-  margin-bottom: 0px;
+  margin: 5px 0 0 0;
+}
+
+/* Utility for de-emphasizing content */
+
+.deemphasize {
+  color: #999;
+  a {
+    color: #7092FF;
+  }
 }
 
 /* Rules for donation request box */
 
 .donate {
-  width: 155px;
-  margin: 10px 5px;
+  display: block;
+  position: relative;
+  width: 153px;
   padding: 5px;
-  border: 1px solid #ccc;
+  border: 1px solid #AED1A0;
   background: #cbeea7;
   line-height: 20px;
   text-align: center;
   font-size: 14px;
-  border-radius: 5px;
-  -moz-border-radius: 5px;
+  border-radius: 2px;
+  -moz-border-radius: 2px;
+  color: #222;
+  margin: 10px 10px 0px 10px;
+}
+
+.donate:hover {
+  background: #9ed485;
+  text-decoration: none;
+}
+
+.donate p {
+  text-indent: 20px;
+  margin: 0;
+}
+
+.donate .donate-icon {
+  width: 15px;
+  height: 15px;
+  border: 0px;
+  background: image-url("sprite.png") 0 -30px no-repeat;
+  position: absolute;
+  top: 8px;
+  left: 17px;
 }
 
 /* Rules for Creative Commons logo button */
 
 #cclogo {
-  margin-top: 10px;
-  margin-bottom: 10px;
+  margin: 10px 0;
+  float: right;
 }
 
 /* Rules for tabbed navigation bar */
 
+#top-bar {
+  position: relative;
+  margin-left: 185px;
+  height: 29px;
+  border-bottom: 1px solid #ccc;
+  background: white;
+  z-index: 100;
+}
+
+.site-edit #top-bar,
+.site-index #top-bar,
+.site-export #top-bar {
+  position: fixed;
+  left: 0;
+  right: 0;
+}
+
 #tabnav {
-  height: 20px;
-  margin: 0px;
-  padding-top: 5px;
-  background: image-url('tab_bottom.gif') repeat-x bottom;
+  height: 29px;
+  margin-bottom:0;
+  overflow: hidden;
 }
 
 #tabnav li {
-  margin: 0px;
-  padding: 0px;
   display: inline;
-  list-style-type: none;
 }
 
 #tabnav a, #tabnav a:link, #tabnav a:visited {
-  background: #f3f3f3;
-  font-size: 13px;
-  line-height: 14px;
+  float: left;
+  background: #fff;
   font-weight: bold;
-  padding: 2px 10px;
-  border: 1px solid #ccc;
+  padding: 3px 10px;
   text-decoration: none;
   color: #333;
-  border-top-right-radius: 5px;
-  -moz-border-radius-topright: 5px;
-  border-top-left-radius: 5px;
-  -moz-border-radius-topleft: 5px;
-}
-
-#tabnav a:link.active, #tabnav a:visited.active {
-  border-bottom: 1px solid #fff;
-  background: #fff;
+  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;
+}
+
+.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 {
-  background: #fff;
+  text-decoration: underline;
 }
 
 #tabnav a:link.disabled,
 #tabnav a:visited.disabled,
 #tabnav a:link:hover.disabled,
 #tabnav a:visited:hover.disabled {
-  background: #bbbbbb;
-  color: white
+  color: #ccc;
+  cursor: default;
+}
+
+#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 {
+  padding: 2px 5px;
+  border-radius: 3px;
+  background: #d7d7ff;
+  margin: 0 2px;
+  font-size: 11px;
+  color: #333;
 }
 
 /* Rules for greeting bar in the top right corner */
 
 #greeting {
-  height: 20px;
-  margin: 0px;
-  padding-top: 5px;
-  font-size: 13px;
-  line-height: 15px;
-  background: image-url('tab_bottom.gif') repeat-x bottom;
+  float: right;
+  padding-top: 3px;
 }
 
 .greeting-bar-unread {
@@ -316,21 +523,10 @@ h2 {
   z-index: 20000000;
   position: absolute;
   top: 15px;
+  left: 15px;
 }
 
-/* Rules for OpenLayers maps */
-
-#map {
-  margin: 0px;
-  padding: 0px;
-}
-
-.olControlAttribution {
-  bottom: 15px !important;
-  left: 0px !important;
-  right: 0px !important;
-  text-align: center;
-}
+/* Rules for Leaflet maps */
 
 #permalink {
   z-index: 10000;
@@ -339,33 +535,48 @@ h2 {
   right: 0px;
   padding: 5px;
   background:#fff;
-  text-align: right;
-  font-size: 12px;
 }
 
-#permalink a {
-    padding: 5px;
+.site-index .leaflet-top,
+.site-export .leaflet-top {
+  top: 10px !important;
+  .leaflet-control {
+    margin-top: 0px !important;
+  }
+}
+
+.site-index #map .olControlScaleLine,
+.site-export #map .olControlScaleLine {
+  left: 10px !important;
 }
 
 /* Rules for edit menu */
 
+.menuicon {
+  padding: 0 5px;
+  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 black;
+  border: 1px solid #cccccc;
+  border-top: 0px;
 }
 
 .menu ul {
-  margin-top: 10px;
-  margin-bottom: 10px;
-  padding-left: 10px;
-  padding-right: 10px;
+  margin: 0px;
 }
 
 .menu li {
-  list-style-type: none;
+  padding: 2px 5px;
+  border-top: 1px solid #eee;
   white-space: nowrap;
 }
 
@@ -375,6 +586,11 @@ h2 {
   display: none;
 }
 
+.attribution_license,
+.attribution_project {
+  text-align: left;
+}
+
 .attribution_notice {
   text-align: center;
 }
@@ -384,51 +600,68 @@ h2 {
 #sidebar {
   display: none;
   position: absolute;
-  margin: 0px;
-  padding: 0px;
-  width: 30%;
-  top: 0px;
-  bottom: 0px;
-}
-
-#sidebar #sidebar_content {
   overflow: auto;
-  position: absolute;
-  font-size: 13px;
-  line-height: 15px;
-  top: 29px;
+  top: 0px;
   bottom: 0px;
   left: 0px;
-  right: 0px;
+  border-right: 1px solid #ccc;
+  width: 33.3333%;
+  .sidebar_heading {
+    position: relative;
+    padding: 10px 20px;
+    z-index: 9999;
+    background: #F4F4FF;
+    border-bottom: 1px solid #ccc;
+  }
+  h4 {
+    margin: 0;
+  }
+  ul {
+    margin-bottom: 0;
+    li {
+      margin-bottom: 5px;
+      &:last-child {
+        margin-bottom: 0;
+      }
+    }
+  }
+}
+
+#sidebar_close {
+  position: absolute;
+  height: 20px;
+  top: 0px;
+  bottom: 0;
+  right: 20px;
+  margin: auto;
 }
 
-#sidebar .sidebar_title {
-  margin: 0px;
-  padding: 3px 6px 4px 6px;
-  height: 29px;
-  font-size: 14px;
-  line-height: 15px;
-  background: #bbb;
+#sidebar_content {
+  position: relative;
+  bottom: 0;
+  width: 100%;
+  h4 {
+    padding: 0 20px 10px 20px;
+    margin-top: 10px;
+    margin-bottom: 0;
+    border-bottom: 1px solid #ddd;
+  }
 }
 
 /* Rules for the map key which appears in the popout sidebar */
 
-#mapkey h3 {
-  font-size: 110%;
-  font-weight: normal;
-  text-align: center;
-}
-
-#mapkey .mapkey-table {
-  padding-left: 5px;
-  padding-right: 5px;
+#mapkey {
+  padding: 20px;
 }
 
-#mapkey .mapkey-table-key {
+#mapkey .mapkey-table-key img {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
 }
 
-#mapkey .mapkey-table-value {
-  font-size: 90%;
+#mapkey td {
+  padding: 0 5px 5px 5px;
 }
 
 /* Rules for search results which appear in the popout sidebar */
@@ -438,76 +671,80 @@ h2 {
   margin-bottom: 5px;
 }
 
-.search_results_heading {
-  margin: 0px;
-  padding: 3px 5px;
-  background: #eee;
+.search_results_entry {
+  margin-bottom: 0 ;
 }
 
-.search_results_entry {
-  margin: 0px;
-  padding: 2px 5px;
+.search_results_entry .search_searching {
+  text-align: center;
+  margin: 20px auto;
+  width: 20px;
+  display: block;
 }
 
+ul.results-list li { border-bottom: 1px solid #ccc; }
+
 .search_results_error {
-  margin: 0px;
-  padding: 2px 6px 0px;
   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: 20px;
+    right: 20px;
+    bottom: -40px;
+    margin-bottom: 0;
+  }
+  a.more-details {
+    position: absolute;
+    top: 0;
+    right: 20px;
+  }
+  ul li {
+    margin-bottom: 0;
+  }
 }
 
 .browse_details {
-  margin: 0px;
-  padding: 0px 6px;
+  position: relative;
+}
+
+.browse_status {
+  display: none;
 }
 
 /* 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;
-}
-
 .export_bounds {
-  width: 100%;
   text-align: center;
 }
 
-.export_bound {
-  margin: 5px;
+.export_area_inputs {
+  margin-bottom: 10px;
 }
 
-.export_details {
-  padding: 2px 6px;
+.export_bound {
+  margin: 5px;
 }
 
-#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: 10px;
 }
 
+#export_osm,
+#export_mapnik,
 #export_osmarender {
   display: none;
 }
 
-.export_hint {
-  padding: 0px 12px;
-  font-style: italic;
-}
-
 .export_buttons {
   width: 100%;
   text-align: center;
@@ -515,18 +752,29 @@ h2 {
 
 /* Rules for the main content area */
 
-body.site #content {
-  padding: 0px;
-  margin: 0px;
-  position: absolute;
-  bottom: 0px;
+#content {
+  padding: 20px;
+  position: relative;
 }
 
-#content {
-  padding: 10px;
-  margin: 0px;
-  position: absolute;
-  bottom: 0px;
+.site-edit #content,
+.site-index #content,
+.site-export #content {
+  position: fixed;
+  padding: 0;
+  top: 30px; bottom: 0;
+  left: 185px; right: 0;
+  border-left: 1px solid #ccc;
+}
+
+.wrapper {
+  margin-left: 185px;
+  border-left: 1px solid #ccc;
+  text-align: left;
+}
+
+.site-edit #content {
+  top: 30px;
 }
 
 #slim_container {
@@ -553,24 +801,53 @@ body.site #content {
   margin: 10px;
   position: absolute;
   top: 0px;
+  margin-right: 5px;
 }
 
 #slim_header img {
   vertical-align: middle;
   margin-bottom: 5px;
+  margin-right: 5px;
 }
 
-/* Rules for the home page */
+.content-heading {
+  position: relative;
+  padding: 20px;
+  background: #F4F4FF;
+  h1, h2 {
+    margin-bottom: 10px;
+    line-height: 100%;
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+  p {
+    margin-top: 10px;
+    margin-bottom: 0px;
+  }
+}
+
+/* Rules for small maps in content areas */
+
+.content_map {
+  position: relative;
+  width: 45%;
+  height: 398px;
+  border: 1px solid #ccc;
+  margin-bottom: 20px;
+  float: right;
+}
 
-.site_index #map {
-  position: absolute;
-  top: 0px;
-  bottom: 0px;
-  left: 0px;
-  right: 0px;
+.content_map #small_map {
+  height: 100%;
+  width: 100%;
+  margin-bottom: 20px;
 }
 
-.site_export #map {
+/* Rules for the home page */
+
+.site-export #map,
+.site-index #map {
   position: absolute;
   top: 0px;
   bottom: 0px;
@@ -580,91 +857,101 @@ body.site #content {
 
 /* Rules for the edit page */
 
-.site_edit #map {
+.site-edit #map {
   position: absolute;
   top: 0px;
   bottom: 0px;
   left: 0px;
   right: 0px;
+  overflow: hidden;
 }
 
 /* Rules for the changeset list shown by the history tab etc */
 
-#changeset_list_container {
-  position: relative;
-}
-
 #changeset_list {
-  width: 50%;
-  font-size: small;
-  border-collapse: collapse;
-  border-width: 0px;
-  margin-top: 1px;
-  margin-bottom: 1px;
-}
-
-#changeset_list td {
-  vertical-align: top;
-  padding: 3px;
-}
-
-#changeset_list .date {
-  white-space: nowrap;
-}
-
-#changeset_list .user {
-  white-space: nowrap;
-}
-
-#changeset_list .area {
-  white-space: nowrap;
-}
-
-#changeset_list .selected {
-  background-color: rgb(255, 255, 160);
-  background-color: rgba(255, 255, 85, 0.5);
+  width: 100%;
+  ul {
+    padding: 10px 0;
+    margin-bottom: 0px;
+    border-top: 1px solid #ccc;
+    &:last-child {
+      border-bottom: 1px solid #ccc;
+    }
+  }
+  .selected {
+    background-color: rgb(255, 255, 160);
+  }
+  .date,
+  .user {
+    border-left: 1px solid #ccc;
+    padding-left: 5px;
+    margin-right: 5px;
+  }
 }
 
 #changeset_list_map {
   position: absolute;
-  top: 0px;
-  bottom: 0px;
-  width: 49%;
-  min-height: 400px;
-  border: solid 1px black;
+  bottom: 20px;
+  top: 20px;
+  right: 20px;
+  width: 45%;
+  min-height: 398px;
+  max-height: 598px;
+  border: 1px solid #ccc;
 }
 
 /* Rules for the data browser */
 
-#browse_navigation {
-  width: 250px;
-  text-align: center;
-}
-
-table.browse_details th {
-  white-space: nowrap;
-}
-
-#browse_map {
-  width: 250px;
-}
-
-#browse_map #small_map {
-  width: 250px;
-  height: 300px;
-  border: solid 1px black;
+.browse-section {
+  border-top: 1px solid #ccc;
+  margin-top: 10px;
+  padding-top: 10px;
+  &:first-child {
+    margin-top: 0;
+  }
+  h4, p {
+    margin-bottom: 5px;
+  }
+  p, ul, .bbox {
+    margin-left: 33.3333%;
+  }
+  h4 {
+    width: 33.3333%;
+    float: left;
+  }
+}
+
+.bbox {
+  div {
+    width: 33.3333%;
+    text-align: center;
+    padding: 5px 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 .secondary-actions {
+  margin-bottom: 10px;
+}
+
 /* Rules for the trace list shown by the traces tab etc */
 
 #trace_list {
-  font-size: small;
-  border-collapse: collapse;
+  font-size: 10px;
   border-width: 0px;
+  text-align: right;
 }
 
 #trace_list .trace_summary {
@@ -692,91 +979,231 @@ table.browse_details th {
   color: red;
 }
 
-/* Rules for the user list */
+/* Rules for the user profile page */
 
-#user_list {
+#userinformation {
+  min-height: 100px;
+  .userinformation-inner {
+    float: left;
+  }
+  h2 {
+    margin-top: 0;
+  }
+  .user-description {
+    width: 100%;
+    clear: both;
+  }
+  .deemphasize {
+    margin: 0;
+  }
+}
+
+.admin-user-info small {
+  margin-bottom: 10px;
+  display: inline;
+  margin-right: 20px;
+}
+
+.activity-block {
+  border-bottom: 1px solid #ccc;
+  padding-bottom: 20px;
+  float: left;
+  h3 {
+    margin-bottom: 10px;
+  }
+}
+
+.contact-activity {
+  margin-top: 20px;
   width: 100%;
-  font-size: small;
 }
 
-#user_list tr {
-  vertical-align: middle;
+.activity-details p {
+  margin-left: 72px;
+  margin-bottom: 0;
 }
 
-#user_list p {
+#friends-container .contact-activity ul {
+  margin-left: 72px;
+  }
+
+.user-view p#no_home_location {
+  margin: 20px;
+}
+
+.user-view .user_thumbnail {
+  margin-top: 5px;
+  float: left;
+}
+
+/* Rules for the user map */
+
+.content_map .leaflet-popup-content {
+  margin: 10px 15px;
+  min-height: 62px;
+}
+
+.content_map .leaflet-popup-content-wrapper {
+-webkit-border-radius: 4px;
+  border-radius: 4px;
+}
+
+/* Rules for user popups on maps */
+
+.user_popup {
+  min-width: 200px;
+}
+
+.user_popup p {
+  padding-top: 3px;
+  padding-bottom: 3px;
   margin-top: 0px;
   margin-bottom: 0px;
+  margin-left: 55px;
+  margin-right: 2px;
 }
 
-#user_list_actions {
-  margin-top: 10px;
+.user_popup img.user_thumbnail {
+  float: left;
+  margin-right: 10px;
 }
 
-/* Rules for the new diary entry page */
+/* Rules for user popups on maps */
 
-.diary_entry div#map {
-  position: relative;
-  width: 90%;
-  height: 400px;
-  display: none;
+.user_popup p {
+  margin-bottom: 0;
+  margin-left: 60px;
+  font-size: 12px;
 }
 
-/* Rules for the login page */
+/* Rules for the user list */
 
-#login_wrapper div {
-  margin: 5px;
-  padding: 15px;
-  border-radius: 15px;
-  -moz-border-radius: 15px;
+#user_list {
+  font-size: 10px;
+  width: 100%;
 }
 
-#login_login {
-  background-color: #f5f5ff;
-  border: 1px solid #f3f3ff;
-  border-radius: 15px;
-  -moz-border-radius: 15px;
+#user_list tr {
+  vertical-align: middle;
 }
 
-#login_login h1 {
-  margin-top: 5px;
+#user_list p {
+  margin-top: 0px;
+  margin-bottom: 0px;
 }
 
-table#login_openid_buttons {
-  padding-bottom: 10px;
+#user_list_actions {
+  float: right;
+  margin-top: 10px;
 }
 
-#login_openid_buttons td {
-  padding-left: 10px;
-  padding-right: 10px;
-  padding-top: 5px;
-  padding-bottom: 5px;
+/* Rules for the diary list page */
+
+.diary_entry-list img.user_thumbnail {
+  float: left;
 }
 
-#login_openid_buttons img {
-  border: 0;
+.diary_post {
+  position: relative;
+  margin-top: 20px;
+  padding-top: 20px;
+  border-top: 1px solid #ccc;
+
+  &:first-child {
+    margin-top: 0;
+    border-top: 0;
+    padding-top: 0;
+  }
+  h1, h2 {
+    font-size: 21px;
+    line-height: 21px;
+  }
+  small.deemphasize {
+    display: block;
+  }
+  ul,
+  ol {
+    margin-bottom: 20px;
+    font-style: italic;
+    margin-left: 20px;
+  }
+  ul li {
+    list-style: disc;
+  }
+  ol li {
+    list-style: decimal;
+  }
+  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;
 }
 
-#login_signup form.button-to div {
-  margin: 0px;
-  padding: 0px;
+.post_heading {
+  margin-bottom: 20px;
+  h2 {
+    margin-top: 0;
+    margin-bottom: 0;
+    font-size: 24px;
+    float: left;
+    line-height: 32px;
+  }
+}
+
+/* Rules for the diary entry page */
+
+.diary_entry {
+  #map {
+    position: relative;
+    width: 90%;
+    height: 398px;
+    border: 1px solid #ccc;
+    display: none;
+    margin-bottom: 20px;
+  }
+  #newcomment {
+    border-top: 1px solid #ccc;
+    padding-top: 20px;
+    margin-top: 10px;
+  }
+  .diary-comment {
+    margin-top: 10px;
+    &:first-child {
+      margin-top: 20px;
+      padding-top: 20px;
+      border-top: 1px solid #ccc;
+    }
+    p {
+      margin-bottom: 10px;
+      margin-left: 70px;
+    }
+    .comment-heading {
+      margin-bottom: 0;
+      margin-top: 0;
+    }
+  }
+}
+
+.diary_entry-view img.user_thumbnail {
+  float: left;
 }
 
-/* Rules for the account confirmation page */
+/* Rules for the login page */
 
-div#contributorTerms {
-  border: 1px solid black;
-  padding: 4px;
-  overflow: auto;
-  width: 95%;
-  height: 400px;
+#login_openid_buttons li {
+  float: left;
+  padding: 5px 10px;
 }
 
-div#slim_content div#contributorTerms {
-  width: auto;
-}
+/* Rules for the account confirmation page */
 
-div#contributorTerms p#first {
-  margin-top: 0px;
+div#contributorTerms {
+  border: 1px solid #ccc;
+  padding: 20px;
+  margin-bottom: 20px;
+  overflow: auto;
+  height: 398px;
 }
 
 div#contributorTerms p#last {
@@ -789,14 +1216,15 @@ div#contributorTerms ol {
 
 div#contributorTerms img {
   display: block;
-  margin-left: auto;
-  margin-right: auto;
-  margin-top: 10%;
+  margin: 20px auto inherit auto;
+}
+
+form#termsForm div#buttons {
+  float: right;
 }
 
-form#termsForm {
-  width: 95%;
-  margin-bottom: 3em;
+form#termsForm input#agree {
+  margin-left: 40px;
 }
 
 div#slim_content form#termsForm {
@@ -804,27 +1232,33 @@ div#slim_content form#termsForm {
 }
 
 p#contributorGuidance {
-  background-color: #f5f5ff;
-  border: 1px solid #f3f3ff;
-  border-radius: 15px;
-  -moz-border-radius: 15px;
+  background-color: #f4f4ff;
+  border-radius: 3px;
+  -moz-border-radius: 3px;
+  margin-top: 20px;
   padding: 10px;
 }
 
 /* Rules for the account settings page */
 
+#accountForm {
+  margin-top: 20px;
+}
+
 #accountForm td {
   padding-bottom: 10px;
 }
 
 #accountForm .user_map {
   position: relative;
-  width: 500px;
-  height: 400px; 
+  width: 498px;
+  height: 398px;
+  border: 1px solid #ccc;
 }
 
-#accountImage td {
-  padding-bottom: 0px;
+.accountImage-options {
+  width: 50%;
+  display: inline-block;
 }
 
 .nohome .location {
@@ -843,92 +1277,82 @@ p#contributorGuidance {
   margin-top: 15px;
 }
 
-/* Rules for the user view */
-
-.user_view .user_map {
-  position: relative;
-  width: 400px;
-  height: 400px; 
-}
-
-.user_view .user_map p#no_home_location {
-  position: absolute;
-  top: 0px;
-  bottom: 0px;
-  width: 90%;
-  height: 30%;
-  margin: auto 5%
+.content_map.settings_map {
+  float: none;
+  width: 50%;
 }
 
-/* Rules for the user map */
+/* Rules for message in/out box page */
 
-.user_map .olControlPanZoomBar {
-  display: none;
+.messages {
+  width: 100%;
+  border: 1px solid #ddd;
 }
 
-.user_map .olControlPanZoom {
-  display: block;
+.messages tbody tr {
+  border-top: 1px solid #ccc;
 }
 
-/* Rules for user popups on maps */
+.messages .inbox-row {
+  background: #f8f8ff;
+}
 
-.user_popup p {
-  padding-top: 3px;
-  padding-bottom: 3px;
-  margin-top: 0px;
-  margin-bottom: 0px;
-  margin-left: 55px;
-  margin-right: 2px;
+.messages .inbox-row-unread {
+  background:#CBEEA7;
 }
 
-.user_popup img.user_thumbnail {
-  float: left;
+.right {
+  float: right;
 }
 
-/* Rules for message in/out box page */
+.messages tr td,
+.messages tr th {
+  padding: 5px;
+}
 
-#messages {
-  border: 1px solid #ccc;
+.inbox-row .inbox-mark-read {
+  display: none;
 }
 
-.inbox-row-unread .inbox-subject {
-  font-weight: bold;
+.info-line {
+  margin-bottom: 20px;
+  padding: 5px 0px 4px 0px;
+  border-bottom: 1px solid #ccc;
 }
 
-/* Rules for "flash" notice boxes shown at the top of the content area */
+.info-line form,
+.info-line form div {
+  display: inline;
+}
 
-#error {
-  border: 1px solid red;
-  padding: 7px;
-  background-color: #fff0f0;
-  margin-bottom: 20px;
-  border-radius: 5px;
-  -moz-border-radius: 5px;
+.info-line .user_thumbnail_tiny {
+  vertical-align: middle;
 }
 
-#warning {
-  border: 1px solid orange;
-  padding: 7px;
-  background-color: #fff6f0;
-  margin-bottom: 20px;
-  border-radius: 5px;
-  -moz-border-radius: 5px;
+.inbox-row-unread .inbox-mark-unread {
+  display: none;
 }
 
-#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: 20px;
+  &#error {
+    background-color: #ff7070;
+  }
+  &#warning {
+    background-color: #fff6f0;
+  }
+  &#notice {
+    background-color: #CBEEA7;
+  }
 }
 
 /* Rules for highlighting fields with rails validation errors */
 
 .field_with_errors {
   padding: 2px;
-  background-color: red;
+  background-color: #ff7070;
   display: table;
 }
 
@@ -936,19 +1360,20 @@ p#contributorGuidance {
 
 #errorExplanation {
   width: 400px;
-  border: 2px solid red;
-  padding: 7px;
-  padding-bottom: 12px;
+  border: 2px solid #ff7070;
+  padding: 10px;
   margin-bottom: 20px;
   background-color: #f0f0f0;
 }
 
 #errorExplanation h2 {
+  margin: -10px;
+  padding: 5px 5px 5px 15px;
   font-weight: bold;
   font-size: 12px;
-  margin: -7px;
   background-color: #c00;
   color: #fff;
+  text-align: left;
 }
 
 #errorExplanation p {
@@ -959,20 +1384,29 @@ p#contributorGuidance {
 
 #errorExplanation ul li {
   font-size: 12px;
-  list-style: square;
+  list-style: disc;
 }
 
 /* Rules for forms */
 
+.submitButton {
+  text-align: center;
+}
+
 .fieldName {
   vertical-align: top;
   font-weight: bold;
   font-size: 12px;
   line-height: 20px;
+  text-align: right;
+}
+
+.submitButton {
+  text-align: right;
 }
 
 .minorNote {
-  font-size: 0.8em;
+  font-size: 12px;
 }
 
 input[type="text"],
@@ -980,21 +1414,31 @@ input[type="email"],
 input[type="url"],
 input[type="password"],
 textarea {
-  border: 1px solid #888;
+  border: 1px solid #ccc;
 }
 
 /* Rules for user images */
 
 img.user_image {
-  max-width: 100px;
-  max-height: 100px;
-  border: 1px solid black;
+  width: 100px;
+  height: 100px;
+  border: 1px solid #ccc;
+  margin-bottom: 20px;
+  float: left;
+  margin-right: 20px;
 }
 
 img.user_thumbnail {
-  max-width: 50px;
-  max-height: 100px;
-  border: 1px solid black;
+  width: 50px;
+  height: 50px;
+  border: 1px solid #ccc;
+  margin-right: 20px;
+}
+
+img.user_thumbnail_tiny {
+  max-width: 24px;
+  max-height: 24px;
+  border: 1px solid #ccc;
 }
 
 /* Rule for "nowrap" class that can be applied to anything to stop wrapping */
@@ -1016,13 +1460,87 @@ abbr.geo {
   top: 4px;
 }
 
+/* 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-bottom: 20px;
+    margin-right: 60px;
+  }
+  li {
+    display: block;
+    float: left;
+    list-style: none;
+    border-left: 1px solid #ccc;
+    padding-left: 5px;
+    margin-right: 5px;
+    &:first-child {
+      border-left: 0;
+      padding-left: 0;
+    }
+  }
+  .hidden li,
+  .hide_unless_logged_in li,
+  .hide_unless_administrator li {
+    border-left: 1px solid #ccc;
+    padding-left: 5px;
+    }
+  .hidden:first-child li,
+  .hide_unless_logged_in:first-child li,
+  .hide_unless_administrator:first-child li {
+    border-left: 0;
+    padding-left: 0;
+  }
+}
+
+/* Utility for managing inner content areas */
+
+.inner22 { padding: 20px;}
+
+.inner12 { padding: 10px 20px;}
+
+.inner02 { padding: 0 20px;}
+
+/* Utility for general button styles */
+
+a.button {
+  display: block;
+  padding: 5px;
+  min-width: 120px;
+  margin-bottom: 10px;
+  color: white;
+  background: #7092FF;
+  text-align: center;
+  border-radius: 2px;
+  -moz-border-radius: 2px;
+  &:hover {
+    background: blue;
+    text-decoration: none;
+  }
+  &:last-child {
+    margin-bottom: 0;
+  }
+}
+
+a.button.submit {
+  background-color: #cbeea7;
+  &:hover {
+    background-color: #9ed485;
+  }
+}
 /* Rules for doing distinct colour of alternate table rows */
 
-.table0 {
-  background: #f6f6f6;
+.table0,
+.item0 {
+  background: #F4F4FF;
 }
 
-.table1 {
+.table1,
+.item1 {
   background: #fff;
 }
 
@@ -1032,3 +1550,59 @@ abbr.geo {
   vertical-align: text-bottom;
   border: 0;
 }
+
+/* Rules for rich text editors */
+
+.richtext_container {
+  white-space: nowrap;
+  .richtext_content {
+    display: inline-block;
+    vertical-align: top;
+    .richtext_preview {
+      display: inline-block;
+      padding: 20px;
+      background-color: #f4f4ff;
+      white-space: normal;
+      &.loading {
+        background-image: image-url("loading.gif");
+        background-repeat: no-repeat;
+        background-position: center;
+      }
+      > :first-child {
+        margin-top: 0px;
+      }
+    }
+  }
+  .richtext_help {
+    display: inline-block;
+    vertical-align: top;
+    margin-left: 15px;
+    background-color: #f8f8ff;
+    padding: 20px;
+    p {
+      margin: 0px;
+    }
+    th {
+      vertical-align: top;
+      text-align: left;
+      padding: 0px 15px 0px 0px !important;
+    }
+    table > thead th {
+      font-weight: bold;
+    }
+    td {
+      font-family: fixed;
+      line-height: 16px;
+      text-align: left;
+      padding: 0px !important;
+    }
+    input.richtext_doedit {
+      margin-top: 5px !important;
+      margin-right: 10px !important;
+    }
+    input.richtext_dopreview {
+      margin-top: 5px !important;
+      margin-left: 10px !important;
+    }
+  }
+}