Presentation work

[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 66cbb5d2ab1f331f5b7471be30e79652bc16c524..5166c7a31c5fbf0f74ad29e79222028c931394e4 100644 (file)
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
@@ -1,20 +1,4 @@
-/* Parameters */
-$lineheight: 20px;
-$typeheight: 14px;
-
-$offwhite: #f4f4ff;
-$blue: #7092FF;
-$lightblue: #B8C5F0;
-$green: #7ebc6f;
-$grey: #CCC;
-$red: red;
-$lightgrey: #EEE;
-$darkgrey: #AAA;
-$hovercolor: 20%;
-$headerHeight: 54px;
-$sidebarWidth: 300px;
-$keyline: 1px solid $lightgrey;
-$border-radius: 3px;
+@import "parameters";

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


@@ -52,7 +36,9 @@ abbr, acronym {
   cursor: help;
 }
 
   cursor: help;
 }
 

-strong { font-weight: 500; }
+strong {
+  font-weight: bold;
+}

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


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

+  height: 100%;

 }
 
 body.slim {
 }
 
 body.slim {


@@ -122,11 +109,13 @@ body.slim {
 }
 
 h1, h2, h3 {
 }
 
 h1, h2, h3 {

-  font-weight: 500;
+  font-weight: 600;

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

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

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


@@ -145,6 +134,8 @@ small, aside {
   font-size: 12px;
 }
 
   font-size: 12px;
 }
 

+#container { position: relative; }
+

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


@@ -181,6 +172,7 @@ small, aside {
 .icon.clipboard   { background-position: -160px 0; }
 .icon.link        { background-position: -180px 0; }
 .icon.close       { background-position: -200px 0; }
 .icon.clipboard   { background-position: -160px 0; }
 .icon.link        { background-position: -180px 0; }
 .icon.close       { background-position: -200px 0; }

+.icon.close:hover { background-position: -200px -20px; }

 .icon.check       { background-position: -220px 0; }
 .icon.note        { background-position: -240px 0; }
 .icon.gear        { background-position: -260px 0; }
 .icon.check       { background-position: -220px 0; }
 .icon.note        { background-position: -240px 0; }
 .icon.gear        { background-position: -260px 0; }


@@ -188,7 +180,7 @@ small, aside {
 /* Rules for links */
 
 a {
 /* Rules for links */
 
 a {

-  color: #00f;
+  color: #24d;

   text-decoration: none;
   -webkit-appearance: none;
   outline: 0;
   text-decoration: none;
   -webkit-appearance: none;
   outline: 0;


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

-    font-weight: 500;
+    font-weight: 600;

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


@@ -236,12 +228,23 @@ table {
 
 /* Rules for the header */
 
 
 /* Rules for the header */
 

+#menu-icon { 
+  display: none !important;
+  float: right;
+  background: image-url("menu-icon.png") no-repeat;
+  background-size: 30px 30px;
+  display: block;
+  width: 30px;
+  height: 30px;
+  margin: 14px 10px 0 0;
+  opacity: 0.6;
+}
+

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

-  // border-bottom: $keyline;

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

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

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


@@ -249,7 +252,7 @@ header {
 
   > * {
     height: 100%;
 
   > * {
     height: 100%;

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

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


@@ -263,13 +266,13 @@ header {
   img.logo {
     width: 30px;
     height: 30px;
   img.logo {
     width: 30px;
     height: 30px;

-    margin-top: -4px;
+    margin-top: -2px;

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

-    padding: ($lineheight - 3) $lineheight ($lineheight + 3);
+    padding-top: 15px;

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


@@ -286,11 +289,10 @@ nav.primary {
 
     > li {
       border-right: $border;
 
     > li {
       border-right: $border;

+      float: left;

       &:last-child { 
         border-right: 0;
       &:last-child { 
         border-right: 0;

-        > a { border-radius: 0 $border-radius $border-radius 0; } 

       }
       }

-      &:first-child > a { border-radius: $border-radius 0 0 $border-radius; }

       > a:hover { background: lighten($green, 30%); }
       &.current > a:hover { background: $green; }
       &.disabled > a:hover { background: lighten($green, 38%); }
       > a:hover { background: lighten($green, 30%); }
       &.current > a:hover { background: $green; }
       &.disabled > a:hover { background: lighten($green, 38%); }


@@ -344,14 +346,16 @@ nav.secondary {
   position: absolute;
   right: 0;
 
   position: absolute;
   right: 0;
 

-  > ul a,
-  .dropdown-toggle {
-    display: inline-block;
-    text-decoration: none;
-    color: $darkgrey;
-    padding: 5px;
+  > ul {
+    vertical-align: middle;
+    a, .dropdown-toggle {
+      display: inline-block;
+      text-decoration: none;
+      color: $darkgrey;
+      padding: 5px;

 
 

-    &:hover { color: darken($darkgrey, 10%); }
+      &:hover { color: darken($darkgrey, 25%); }
+    }

   }
 
   > ul li.current a {
   }
 
   > ul li.current a {


@@ -360,14 +364,13 @@ nav.secondary {
 
   .user-menu {
     $border: 1px solid $grey;
 
   .user-menu {
     $border: 1px solid $grey;

-
-    font-weight: 500;

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

+      float: left;

       &:last-child { 
         border-right: 0;
 
       &:last-child { 
         border-right: 0;
 


@@ -381,14 +384,18 @@ nav.secondary {
 
     a {
       padding: 5px 15px;
 
     a {
       padding: 5px 15px;

+

     }
 
     &.logged-in > a {
       padding: 0;
       > .user-button {
     }
 
     &.logged-in > a {
       padding: 0;
       > .user-button {

-        padding: 5px 10px 5px 6px;
+        line-height: 1.8;
+        padding: 5px 10px 3px 6px;

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

+        color: $darkgrey;

       }
       }

+      &:hover > .user-button { color: darken($darkgrey, 5%); }

     }
   }
 
     }
   }
 


@@ -401,7 +408,7 @@ nav.secondary {
     border: 0;
     vertical-align: top;
     margin-top: 0px;
     border: 0;
     vertical-align: top;
     margin-top: 0px;

-    margin: 3px 0 0 3px;
+    margin: 4px 0 0 4px;

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


@@ -417,7 +424,8 @@ nav.secondary {
 
   .dropdown-menu {
     left: auto;
 
   .dropdown-menu {
     left: auto;

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

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


@@ -427,12 +435,30 @@ nav.secondary {
   }
 }
 
   }
 }
 

+#compact-secondary-nav {
+  display: none;
+  ul li a {
+    width: 100%;
+    color: #333;
+    &:hover { color: #fff; }
+  }
+}
+
+@media only screen and (max-width:960px) {
+  #compact-secondary-nav {
+    display: inline-block;
+  }
+  .compact-hide {
+    display: none;
+  }
+}
+

 /* Utility for styling notification numbers */
 
 .count-number {
   padding: 2px $lineheight/4;
   border-radius: 2px;
 /* Utility for styling notification numbers */
 
 .count-number {
   padding: 2px $lineheight/4;
   border-radius: 2px;

-  background: #d7d7ff;
+  background: lighten($green, 30%);

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


@@ -583,6 +609,7 @@ nav.secondary {
 
 .map-layout {
   #content {
 
 .map-layout {
   #content {

+    overflow: hidden;

     position: absolute;
     top: $headerHeight;
     bottom: 0;
     position: absolute;
     top: $headerHeight;
     bottom: 0;


@@ -599,57 +626,61 @@ nav.secondary {
   #sidebar {
     float: left;
     width: $sidebarWidth;
   #sidebar {
     float: left;
     width: $sidebarWidth;

-    border-right: $keyline;
+    background: #fff;
+    font-size: 12px;

 
 

-    h2, h3, h4 {
+    h2 {

       padding: $lineheight $lineheight $lineheight/2;
     }
 
       padding: $lineheight $lineheight $lineheight/2;
     }
 

-    h4 {
-      font-weight: normal;
-      color: #666;
-      font-size: 12px;
+    h3, h4 {
+      margin-top: $lineheight;
+      margin-bottom: $lineheight/2;
+      font-size: 13px;

     }
 
     .icon.close {
     }
 
     .icon.close {

-      position: absolute;
-      right: $lineheight;
-    }
-
-    .footer {
-      position: absolute;
-      bottom: 0;
-    }
-
-    p.credits {
-      font-size: 11px;
-      color: #999;
-
-      a {
-        color: #666;
-      }
+      float: right;
+      cursor: pointer;

     }
     }

+  }

 
 

-    p.large-text {
-      font-size: 1.7em;
-      line-height: 1.4em;
-      font-weight: 300;
-    }
+  .welcome {
+    display: none;

   }
 
   }
 

-  #sidebar.minimized {
+  .overlay-sidebar #sidebar {

     position: absolute;
     z-index: 1000;
     height: auto;
     position: absolute;
     z-index: 1000;
     height: auto;

-    border-right: none;
-
+    border-bottom-right-radius: 5px;
+    overflow: hidden;
+    .welcome {
+      display: block;
+    }

     #sidebar_content {
       display: none;
     }
     #sidebar_content {
       display: none;
     }

+  }

 
 

-    #search_form {
-      background: none;
-      width: 78%;
+  .welcome {
+    p {
+      padding: $lineheight/2 $lineheight $lineheight;
+      font-size: 110%;
+      font-weight: 300;
+    }
+
+    .button {
+      width: 50%;
+      float: left;
+      margin: 0;
+      border-radius: 0;
+      font-weight: normal;
+      padding: .6em;
+
+      &.learn-more {
+        border-right: 1px solid #fff;
+      }

     }
   }
 
     }
   }
 


@@ -680,6 +711,14 @@ nav.secondary {
       color:#222;
       border:1px solid #ddd;
     }
       color:#222;
       border:1px solid #ddd;
     }

+
+    .tooltip {
+      opacity: 1;
+      border: 1px solid #ccc;
+      .tooltip-arrow {
+        border-top-color: #ccc;
+      }
+    }

   }
 }
 
   }
 }
 


@@ -691,45 +730,52 @@ nav.secondary {
 }
 
 .layers-ui {
 }
 
 .layers-ui {

-  li {
-    overflow: hidden;
-    border-radius: 3px;
-    border: 3px solid #fff;
-    margin-bottom: 8px;
-    position: relative;
-    transition: border-color 0.08s ease-in;
-  }
-
-  label {
-    position: absolute;
-    top: 12px;
-    left: 10px;
-    cursor: pointer;
-    font-weight: 500;
-    font-size: 16px;
-    text-stroke: 2px #fff;
-    text-shadow:
-     -2px -2px 1px #fff,  
-      2px -2px 1px #fff,
-      -2px 2px 1px #fff,
-       2px 2px 1px #fff;
-  }
-
-  li.active {
-    border-color: darken($green, 10%);
-  }
-
-  li:hover {
-    border-color: $grey;
-    &.active { border-color: darken($green, 20%); }
-  }
-

   .base-layers {
     .leaflet-container {
       width: 100%;
       height: 50px;
       cursor: pointer;
     }
   .base-layers {
     .leaflet-container {
       width: 100%;
       height: 50px;
       cursor: pointer;
     }

+
+    li  {
+      overflow: hidden;
+      border-radius: 3px;
+      border: 2px solid #fff;
+      margin-bottom: 8px;
+      position: relative;
+      transition: border-color 0.08s ease-in;
+      
+      label {
+        position: absolute;
+        top: 0;
+        left: 0;
+        padding: 2px 6px;
+        border-bottom-right-radius: 3px;
+        cursor: pointer;
+        font-weight: 600;
+        font-size: 16px;
+        text-stroke: 2px #fff;
+        background: rgba(255,255,255,.9);
+        z-index: 2; // For IE9
+        input[type="radio"] {
+          display: none;
+        }
+      }
+
+      &.active { border-color: darken($green, 10%); }
+      &:hover {
+        border-color: $grey;
+        &.active { border-color: darken($green, 20%); }
+      }
+    }
+  }
+
+  .overlay-layers {
+    p {
+      font-size: 13px;
+      margin-bottom: 8px;
+    }
+    li.disabled { color: #999; }

   }
 }
 
   }
 }
 


@@ -788,8 +834,8 @@ nav.secondary {
   }
 }
 
   }
 }
 

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

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


@@ -822,6 +868,8 @@ nav.secondary {
   text-align: center;
 }
 
   text-align: center;
 }
 

+.donate-attr { color: darken($green, 10%) !important; }
+

 /* Rules for the sidebar */
 
 .sidebar_heading {
 /* Rules for the sidebar */
 
 .sidebar_heading {


@@ -836,39 +884,50 @@ nav.secondary {
   }
 }
 
   }
 }
 

-#sidebar_content {
-  position: absolute;
-  top: 50px;
-  bottom: 0;
-  width: 100%;
-  overflow-y: auto;
+#browse_status {
+  p {
+    padding: $lineheight;
+  }
+
+  input {
+    display: block;
+    margin-left: auto;
+    margin-right: auto;
+  }
+}

 
 

+#sidebar {
+  #sidebar_loader,

   .loader,
   .load_more {
     text-align: center;
     margin: $lineheight auto;
   .loader,
   .load_more {
     text-align: center;
     margin: $lineheight auto;

-    width: $lineheight;
+    width: 40px;

     display: block;
   }
 }
 
 /* Rules for the search box */
 
     display: block;
   }
 }
 
 /* Rules for the search box */
 

-#search_form {
+header .search_form {
+  display: none;
+}
+
+.search_form {

   position: relative;
   position: relative;

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

   background-color: $lightgrey;
 
   background-color: $lightgrey;
 

-  #query_wrapper {
+  .query_wrapper {

     position: relative;
     overflow: hidden;
     position: relative;
     overflow: hidden;

+    border-radius: 2px 0 0 2px;

   }
 
   }
 

-  input {
+  input[type=text] {

     width: 100%;
     height: 30px;
     border-right: none;
     width: 100%;
     height: 30px;
     border-right: none;

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

 
     transition: 300ms linear;
     -webkit-transition: 300ms linear;
 
     transition: 300ms linear;
     -webkit-transition: 300ms linear;


@@ -887,56 +946,16 @@ nav.secondary {
     border-radius: 0 2px 2px 0;
   }
 
     border-radius: 0 2px 2px 0;
   }
 

-  #describe_location {
+  .describe_location {

     position: absolute;
     top: 6px;
     right: 6px;
     font-size: 10px;
     color: $blue;
   }
     position: absolute;
     top: 6px;
     right: 6px;
     font-size: 10px;
     color: $blue;
   }

-}
-
-/* Rules for donation request box */
-
-a.donate {
-  display: block;
-  width: 163px;
-  padding: $lineheight/4;
-  border: 1px solid #AED1A0;
-  background: #cbeea7;
-  font-size: $typeheight;
-  line-height: 1.4;
-  text-align: center;
-  border-radius: 2px;
-  color: #222;
-  margin: $lineheight/2 auto;

 
 

-  &:hover {
-    background: #9ed485;
-    text-decoration: none;
-  }
-}
-
-/* Rules for rotating sidebar ads */
-
-.ad-container {
-  display: block;
-  height: 120px;
-  margin: auto;
-  overflow: hidden;
-  position: relative;
-  border-bottom: 1px solid #ccc;
-
-  a {
-    display: block;
-    width: 165px;
-    margin: auto;
-  }
-
-  .ad {
-    height: 100px;
-    border: 0;
-    background: #fff;
+  .query_wrapper.routing {
+    display: none;

   }
 }
 
   }
 }
 


@@ -953,7 +972,7 @@ a.donate {
   }
 }
 
   }
 }
 

-/* Rules for search results which appear in the popout sidebar */
+/* Rules for search sidebar */

 
 .search_results_entry {
   ul li {
 
 .search_results_entry {
   ul li {


@@ -974,28 +993,23 @@ a.donate {
   color: #f00;
 }
 
   color: #f00;
 }
 

-/* Rules for data browser information which appears in the popout sidebar */
+/* Rules for routing */

 
 

-#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;
-  }
+#sidebar_content>table {
+    margin: 20px 0px 10px 15px;
+}
+
+td.direction {
+    background-image: image-url('routing-sprite.png'); 
+    width: 20px; height: 20px; 
+    background-repeat: no-repeat;
+}
+@for $i from 1 through 17 {
+td.direction.i#{$i}  { background-position: #{($i)*-20+20}px 0px; }

 }
 
 /* Rules for entity history */
 }
 
 /* Rules for entity history */

+

 #sidebar_content {
   .browse_details {
     position: relative;
 #sidebar_content {
   .browse_details {
     position: relative;


@@ -1007,31 +1021,50 @@ a.donate {
   display: none;
 }
 
   display: none;
 }
 

-/* Rules for the changeset list shown by the history tab */
+/* Rules for the history sidebar */

 
 #sidebar .changesets {
   li {
 
 #sidebar .changesets {
   li {

-    padding: $lineheight;
-    border-bottom: $keyline;
+    padding: 15px 20px;
+    border-bottom: 1px solid #ddd;

     cursor: pointer;
     cursor: pointer;

+
+    &.selected { background: #FFFFE6; }
+    /* color is derived from changeset bbox fillColor in history.js */

   }
 
   }
 

-  li.selected {
-    background: #FCFEA4;
+  h4 {
+    margin: 0;
+    a {
+      color: #000;
+    }

   }
 }
 
   }
 }
 

-/* Rules for the data browser */
+/* Rules for the browse sidebar */

 
 #sidebar_content {
   .browse-section {
 
 #sidebar_content {
   .browse-section {

-    padding: 10px 20px;
+    padding: $lineheight/2 $lineheight;
+    border-bottom: 1px solid #ddd;

 
 

-    h4 {
-      padding: 0;
+    h4:first-child {
+      margin-top: 0;
+      word-wrap: break-word;

     }
   }
 
     }
   }
 

+  .browse-section:last-of-type {
+    border-bottom: none;
+  }
+
+  .paginate {
+    float: right;
+    padding: 1px 6px;
+    border: 1px solid #eee;
+    border-radius: 3px;
+  }
+

   .paginate ul {
     padding-left: 20px;
   }
   .paginate ul {
     padding-left: 20px;
   }


@@ -1058,83 +1091,106 @@ a.donate {
   }
 
   .browse-tag-list {
   }
 
   .browse-tag-list {

-    border: 1px solid #CCC;
-    border-radius: 4px;
+    background-color: #F6F6F6;
+    border: 1px solid #ddd;
+    border-radius: 3px;

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

+    table-layout: fixed;
+    border-collapse: separate;

 
 

-    li {
-      border-bottom: 1px solid #CCC;
+    th, td {
+      border-bottom: 1px solid #ddd;

     }
 
     }
 

-    li:last-child {
+    tr:last-child th, tr:last-child td {

       border-bottom: 0;
     }
 
     .browse-tag-k,
     .browse-tag-v {
       border-bottom: 0;
     }
 
     .browse-tag-k,
     .browse-tag-v {

-      display: inline-block;

       width: 50%;
       width: 50%;

-      height: 30px;
-      float: left;

       padding: 6px 10px;
       padding: 6px 10px;

+      word-wrap: break-word;

     }
 
     .browse-tag-k {
       font-weight: 500;
       background-color: #F6F6F6;
     }
 
     .browse-tag-k {
       font-weight: 500;
       background-color: #F6F6F6;

-      border-radius: 4px 0 0 4px;

     }
 
     .browse-tag-v {
     }
 
     .browse-tag-v {

-      border-left: 1px solid #CCC;
+      border-left: 1px solid #ddd;
+      background-color: #fff;

     }
   }
     }
   }

-}

 
 

-/* Rules for the changeset details */
+  .warning {
+    margin: $lineheight/2 0;
+    padding: $lineheight/2;
+    font-size: 90%;
+  }

 
 

-#sidebar_content {
-  .browse-section.header {
-    padding: 20px;
-    border-bottom: $keyline;
+  .note-comments li {
+    margin: $lineheight/2 0;

 
 

-    h2 {
-      padding: 0 0 5px 0;
-      border-bottom: none;
+    p {
+      margin-left: 10px;

     }
   }
     }
   }

+
+  .note-description {
+    overflow: hidden;
+    margin: 0 0 10px 10px;
+  }

 }
 
 }
 

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

 
 

-.export_bounds {
-  text-align: center;
-}
+.export_form {
+  padding: $lineheight;

 
 

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

   }
   }

-}

 
 

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

 
 

-#export_osm {
-  span.small-title { 
-    font-weight: 500;
-    display: block;
-    font-size: 14px;
-    padding-bottom: 5px; 
+  .export_boxy {
+    background: #eee;
+    border: 1px solid #ccc;
+    border-radius: 3px;
+
+    #maxlat { margin-top: -1px; }
+    #minlon {
+      float: left;
+      margin-left: -1px;
+    }
+    #maxlon {
+      float: right;
+      margin-right: -1px;
+    }
+    #minlat { margin-bottom: 0; }
+  }
+
+  .export_bound {
+    margin: $lineheight/4;
+  }
+
+  .export_button {
+    margin-top: $lineheight;
+    margin-bottom: $lineheight;

   }
 
   dl {
   }
 
   dl {

-    padding-left: 30px;
-    font-size: 13px;
-    color: #666;
+    padding-left: $lineheight/2;

     dd {
       margin-left: 0;
       margin-bottom: 10px;
     dd {
       margin-left: 0;
       margin-bottom: 10px;


@@ -1154,6 +1210,7 @@ a.donate {
 
   #map {
     height: 100%;
 
   #map {
     height: 100%;

+    overflow: hidden;

   }
 }
 
   }
 }
 


@@ -1166,7 +1223,7 @@ a.donate {
 }
 
 .content-body {
 }
 
 .content-body {

-  h1, h2, h3, p {
+  h1, h2, h3, p, ul, ol {

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


@@ -1232,19 +1289,13 @@ a.donate {
   }
 }
 
   }
 }
 

-@media only screen and (max-width:900px) {
-  .header-illustration.new-user-arm {
-    display: none;
-  }
-}
-

 #content.maximised {
   top: 0;
   left: 0;
   right: 0;
   bottom: 0;
   border: 0;
 #content.maximised {
   top: 0;
   left: 0;
   right: 0;
   bottom: 0;
   border: 0;

-  z-index: 1000;
+  z-index: 2000;

 }
 
 #slim_container {
 }
 
 #slim_container {


@@ -1378,6 +1429,10 @@ a.donate {
 }
 
 .user-view {
 }
 
 .user-view {

+  // Silly exception; remove when user page is redesigned.
+  .content-inner {
+    max-width: none;
+  }

   p#no_home_location {
     margin: $lineheight;
   }
   p#no_home_location {
     margin: $lineheight;
   }


@@ -1527,7 +1582,7 @@ a.donate {
     padding: $lineheight;
     margin-bottom: $lineheight;
     overflow: auto;
     padding: $lineheight;
     margin-bottom: $lineheight;
     overflow: auto;

-    height: 10em;
+    height: 20em;

   }
 
   #decline {
   }
 
   #decline {


@@ -1536,11 +1591,6 @@ a.donate {
       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 */


@@ -1651,6 +1701,10 @@ a.donate {
   vertical-align: middle;
 }
 
   vertical-align: middle;
 }
 

+.inbox-sent {
+  white-space: nowrap;
+}
+

 .inbox-mark-unread,
 .inbox-mark-read,
 .inbox-delete {
 .inbox-mark-unread,
 .inbox-mark-read,
 .inbox-delete {


@@ -1663,6 +1717,7 @@ a.donate {
 
 .message-read .message-buttons {
   margin-top: $lineheight;
 
 .message-read .message-buttons {
   margin-top: $lineheight;

+  margin-bottom: $lineheight * 1.5;

   padding-top: $lineheight;
   border-top: 1px solid $lightgrey;
 }
   padding-top: $lineheight;
   border-top: 1px solid $lightgrey;
 }


@@ -1690,12 +1745,6 @@ a.donate {
 
 /* Rules for highlighting fields with rails validation errors */
 
 
 /* Rules for highlighting fields with rails validation errors */
 

-.field_with_errors {
-  padding: 2px;
-  background-color: #ff7070;
-  display: inline-block;
-}
-

 .formError {
   display: inline-block;
   padding: 5px 10px;
 .formError {
   display: inline-block;
   padding: 5px 10px;


@@ -1718,7 +1767,7 @@ a.donate {
   h2 {
     margin: 0 -10px 10px -10px;
     padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;
   h2 {
     margin: 0 -10px 10px -10px;
     padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;

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

     font-size: 12px;
     background-color: #c00;
     color: #fff;
     font-size: 12px;
     background-color: #c00;
     color: #fff;


@@ -1751,7 +1800,7 @@ a.donate {
     display: block;
     margin-bottom: $lineheight/4;
     font-size: $typeheight;
     display: block;
     margin-bottom: $lineheight/4;
     font-size: $typeheight;

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

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


@@ -1808,6 +1857,10 @@ textarea {
   padding: 2px 5px;
   margin: 0;
   width: 200px;
   padding: 2px 5px;
   margin: 0;
   width: 200px;

+
+  &.field_with_errors {
+    border: 2px solid #ff7070;
+  }

 }
 
 textarea {
 }
 
 textarea {


@@ -1834,6 +1887,8 @@ img.user_thumbnail {
 }
 
 img.user_thumbnail_tiny {
 }
 
 img.user_thumbnail_tiny {

+  width: auto;
+  height: auto;

   max-width: 25px;
   max-height: 25px;
   border: 1px solid #ccc;
   max-width: 25px;
   max-height: 25px;
   border: 1px solid #ccc;


@@ -1881,7 +1936,6 @@ ul.secondary-actions {
 
 div.secondary-actions {
   padding: 10px;
 
 div.secondary-actions {
   padding: 10px;

-  border-top: 1px solid #ccc;

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


@@ -1947,7 +2001,7 @@ a.button {
     float: left;
     border-radius: 0;
     margin:0;
     float: left;
     border-radius: 0;
     margin:0;

-    min-width: 100px;
+    min-width: 75px;

     max-width: 180px;
     border-right:1px solid white;
     text-overflow: ellipsis;
     max-width: 180px;
     border-right:1px solid white;
     text-overflow: ellipsis;


@@ -2082,14 +2136,32 @@ a.button {
 
 /* Rules for rich text editors */
 
 
 /* Rules for rich text editors */
 

+input.richtext_title[type="text"] {
+  width: 50%;
+  width: -moz-calc(100% - 235px);
+  width: -webkit-calc(100% - 235px);
+  width: calc(100% - 235px);
+
+  @media only screen and (max-width:768px) {
+    width: 100%;
+  }
+}
+

 .richtext_container {
   margin-bottom: $lineheight;
 
   .richtext_content {
     width: 50%;
 .richtext_container {
   margin-bottom: $lineheight;
 
   .richtext_content {
     width: 50%;

+    width: -moz-calc(100% - 235px);
+    width: -webkit-calc(100% - 235px);
+    width: calc(100% - 235px);

     display: inline-block;
     vertical-align: top;
 
     display: inline-block;
     vertical-align: top;
 

+    @media only screen and (max-width:768px) {
+      width: 100%;
+    }
+

     .richtext_preview {
       display: inline-block;
       padding: $lineheight;
     .richtext_preview {
       display: inline-block;
       padding: $lineheight;


@@ -2162,66 +2234,6 @@ a.button {
   }
 }
 
   }
 }
 

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

 /* Rules for the iD editor */
 
 .id-embed {
 /* Rules for the iD editor */
 
 .id-embed {


@@ -2273,6 +2285,7 @@ a.button {
   list-style: none;
   background-color: #ffffff;
   border: 1px solid #ccc;
   list-style: none;
   background-color: #ffffff;
   border: 1px solid #ccc;

+  border-radius: 0 3px 3px;

   *border-right-width: 2px;
   *border-bottom-width: 2px;
   -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
   *border-right-width: 2px;
   *border-bottom-width: 2px;
   -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);


@@ -2358,7 +2371,7 @@ a.button {
 }
 
 /* Rules for the "Welcome" page */
 }
 
 /* Rules for the "Welcome" page */

-.site-welcome {
+.site-welcome, .site-fixthemap {

   .center {
     text-align: center;
     .sprite { 
   .center {
     text-align: center;
     .sprite { 


@@ -2438,7 +2451,8 @@ a.button {
 }
 
 .site-about #content {
 }
 
 .site-about #content {

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

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


@@ -2571,9 +2585,16 @@ a.button {
     &.local        { background-position: 0px    0px; }
     &.community    { background-position: 0px  -40px; }
     &.open         { background-position: 0px  -80px; }
     &.local        { background-position: 0px    0px; }
     &.community    { background-position: 0px  -40px; }
     &.open         { background-position: 0px  -80px; }

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

     &.infringement { background-position: 0px -160px; }
   }
 }
 
 @import 'browse';
     &.infringement { background-position: 0px -160px; }
   }
 }
 
 @import 'browse';

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