Set borders and spacing for control groups directly in js

[rails.git] / app / assets / stylesheets / common.scss

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 7ae0577402301d1f30e4e213f7bfe0fbc6a88cb5..f48387a595973c584df0fc397b937c238d9251cd 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -4,20 +4,10 @@
 
 /* Styles common to large and small screens */
 
 
 /* Styles common to large and small screens */
 

-.fillL { background-color: white; }
-

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

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

   font-size: $typeheight;
   font-size: $typeheight;

-  line-height: 1.6666;
-  color: #222;
-  background-color: #fff;
-  margin: 0px;
-  padding: 0px;
-  text-align: left;
-  height: 100%;

 }
 
 p > img {
 }
 
 p > img {


@@ -65,35 +55,26 @@ small, aside {
 .icon.clipboard   { /* no-r2 */ background-position: -160px 0; }
 .icon.link        { /* no-r2 */ background-position: -180px 0; }
 .icon.close       { /* no-r2 */ background-position: -200px 0; }
 .icon.clipboard   { /* no-r2 */ background-position: -160px 0; }
 .icon.link        { /* no-r2 */ background-position: -180px 0; }
 .icon.close       { /* no-r2 */ background-position: -200px 0; }

-.close-wrap:hover .icon.close,

 .icon.close:hover { /* no-r2 */ background-position: -200px -20px; }
 .icon.check       { /* no-r2 */ background-position: -220px 0; }
 .icon.note        { /* no-r2 */ background-position: -240px 0; }
 .icon.note.grey   { /* no-r2 */ background-position: -240px -20px; }
 .icon.query       { /* no-r2 */ background-position: -260px 0; }
 
 .icon.close:hover { /* no-r2 */ background-position: -200px -20px; }
 .icon.check       { /* no-r2 */ background-position: -220px 0; }
 .icon.note        { /* no-r2 */ background-position: -240px 0; }
 .icon.note.grey   { /* no-r2 */ background-position: -240px -20px; }
 .icon.query       { /* no-r2 */ background-position: -260px 0; }
 

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

 
 

-a {
-  color: #24d;
-  text-decoration: none;
-  outline: 0;
-  &:hover {
-    text-decoration: underline;
-  }
+.text-muted a {
+  color: $blue;

 }
 
 }
 

-/* Utility for de-emphasizing content */
-
-.deemphasize {
-  color: $darkgrey;
-  a {
-    color: $blue;
-  }
+/* Rules for borders */
+/* These add additional colours to those provided by bootstrap */
+.border-grey {
+  border-color: $grey !important;

 }
 
 }
 

-.text-muted a {
-  color: $blue;
+.border-lightgrey {
+  border-color: $lightgrey !important;

 }
 
 /* Rules for the header */
 }
 
 /* Rules for the header */


@@ -164,7 +145,7 @@ header {
 
 nav.primary {
   .btn-outline-primary {
 
 nav.primary {
   .btn-outline-primary {

-    @include button-outline-variant($green, $white);
+    @include button-outline-variant($green, $color-hover: $white, $active-color: $white);

   }
 
   .disabled {
   }
 
   .disabled {


@@ -209,35 +190,20 @@ nav.secondary {
 
   .login-menu {
     .btn-outline-secondary {
 
   .login-menu {
     .btn-outline-secondary {

-      @include button-outline-variant($darkgrey);
+      @include button-outline-variant($darkgrey, $color-hover: $white, $active-color: $white);

     }
   }
 
   .user-menu {
     .btn-outline-secondary {
     }
   }
 
   .user-menu {
     .btn-outline-secondary {

-      @include button-outline-variant($darkgrey, $darkgrey, white, $darkgrey);
+      @include button-outline-variant($darkgrey, $color-hover: $darkgrey, $active-background: white, $active-border: $darkgrey);

       border-color: $grey;
       &:hover {
         border-color: $grey;
       }
       border-color: $grey;
       &:hover {
         border-color: $grey;
       }

-      &:focus {
-        background-color: white;
-        box-shadow: none;
-      }
-    }
-    &.show .btn-outline-secondary {
-      background-color: white;
-      &:focus {
-        box-shadow: none;
-      }

     }
   }
 
     }
   }
 

-  img.user_thumbnail_tiny {
-    border: 0;
-    border-radius: 3px;
-  }
-

   #inboxanchor {
     display: inline-block;
     height: 25px;
   #inboxanchor {
     display: inline-block;
     height: 25px;


@@ -276,6 +242,95 @@ body.compact-nav {
   }
 }
 
   }
 }
 

+body.small-nav {
+  #menu-icon {
+    display: inline-block !important;
+  }
+
+  nav.primary,
+  nav.secondary {
+    float: none !important;
+    position: relative;
+    display: block;
+    clear: both;
+  }
+
+  header {
+    height: auto;
+    min-height: $headerHeight;
+    background: #fff;
+
+    &.closed nav {
+      display: none;
+    }
+
+    .search_forms {
+      display: block;
+    }
+  }
+
+  #sidebar .search_forms,
+  #edit_tab,
+  #export_tab {
+    display: none;
+  }
+
+  nav.primary {
+    padding: 0;
+
+    ul, li {
+      border: none;
+      border-radius: 0;
+      width: 100%;
+    }
+
+    ul {
+      border-top: 1px solid #eee;
+      li {
+        border-bottom: 1px solid #eee;
+        border-right: none;
+        > a {
+          border-radius: 0;
+          width: 100%;
+          text-align: center;
+          font-size: 15px;
+        }
+      }
+    }
+
+    .btn-group {
+      width: 100%;
+      padding: 10px;
+    }
+  }
+
+  nav.secondary {
+    .user-menu {
+      width: 100%;
+    }
+  }
+
+  #compact-secondary-nav {
+    display: none;
+  }
+
+  .compact-hide {
+    display: inline-block;
+  }
+
+  .overlay-sidebar #sidebar .welcome.visible {
+    display: none;
+  }
+
+  .overlay-sidebar #sidebar #banner {
+    display: none;
+  }
+
+  .leaflet-top.leaflet-right {
+    top: 10px !important;
+  }
+}
+

 /* Utility for styling notification numbers */
 
 .count-number {
 /* Utility for styling notification numbers */
 
 .count-number {


@@ -303,11 +358,10 @@ body.compact-nav {
   width: 40px;
   background-color: #333;
   background-color: rgba(0,0,0,.6);
   width: 40px;
   background-color: #333;
   background-color: rgba(0,0,0,.6);

-  border-radius: 4px 0 0 4px;
-  margin-bottom: 10px;

   outline: none;
 
   outline: none;
 

-  &:hover {
+  &:hover,
+  &:focus {

     background-color: black;
   }
 
     background-color: black;
   }
 


@@ -327,23 +381,6 @@ body.compact-nav {
   }
 }
 
   }
 }
 

-.leaflet-control .zoomin,
-.control-layers .control-button {
-  margin-bottom: 0px;
-  border-radius: 4px 0 0 0;
-}
-
-.leaflet-control .zoomout,
-.control-key .control-button {
-  margin-bottom: 0;
-  border-radius: 0;
-}
-
-.control-locate .control-button,
-.control-share .control-button {
-  border-radius: 0 0 0 4px;
-}
-

 /* Rules for the sidebar and main map area */
 
 .map-layout {
 /* Rules for the sidebar and main map area */
 
 .map-layout {


@@ -371,56 +408,16 @@ body.compact-nav {
       display: none;
     }
 
       display: none;
     }
 

+    #sidebar_content {
+      padding: $spacer;
+    }
+

     > div {
       position: relative;
       float: left;
       clear: both;
       width: 100%;
     }
     > div {
       position: relative;
       float: left;
       clear: both;
       width: 100%;
     }

-
-    h2 {
-      padding: $lineheight $lineheight $lineheight/2;
-      font-size: 1.5rem;
-    }
-
-    h3, h4 {
-      margin-top: $lineheight;
-      margin-bottom: $lineheight/2;
-      font-size: 1.25rem;
-    }
-
-    .close-wrap {
-      cursor: pointer;
-      position: absolute;
-      top: 0;
-      right: 0;
-      width: 60px;
-      height: 60px;
-
-      .icon.close {
-        pointer-events: none;
-        position: absolute;
-        right: 20px;
-        top: 20px;
-      }
-    }
-
-    .icon.close {
-      float: right;
-      cursor: pointer;
-    }
-
-    .flash {
-      padding: 15px;
-
-      picture {
-        margin-right: -25px;
-      }
-
-      div.message {
-        margin-left: 30px;
-      }
-    }

   }
 
   .overlay-sidebar #sidebar {
   }
 
   .overlay-sidebar #sidebar {


@@ -448,26 +445,11 @@ body.compact-nav {
 
   .welcome {
     display: none;
 
   .welcome {
     display: none;

-    padding-bottom: 5px;

 
     p {
 
     p {

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

       font-size: 110%;
       font-weight: 300;
     }
       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;
-      }
-    }

   }
 
   #banner {
   }
 
   #banner {


@@ -510,15 +492,6 @@ body.compact-nav {
       padding: 10px 20px;
     }
 
       padding: 10px 20px;
     }
 

-    a.close-button {
-      float: right;
-      padding:5px;
-      font-size:20px;
-      line-height:10px;
-      color:#222;
-      border:1px solid $grey;
-    }
-

     .tooltip {
       opacity: 1;
       border: 1px solid $grey;
     .tooltip {
       opacity: 1;
       border: 1px solid $grey;


@@ -529,6 +502,36 @@ body.compact-nav {
   }
 }
 
   }
 }
 

+@include media-breakpoint-down(md) {
+  body.map-layout {
+    #sidebar, #map {
+      position: relative;
+      overflow-x: hidden;
+      width: 100%;
+      height: 50%;
+    }
+
+    .overlay-sidebar {
+      #sidebar {
+        position: absolute;
+        width: 350px;
+        height: auto;
+        overflow: hidden;
+      }
+
+      #map {
+        height: 100%;
+      }
+    }
+
+    #map-ui {
+      z-index: 9999;
+      width: 100%;
+      overflow-y: scroll;
+    }
+  }
+}
+

 .layers-ui,
 .share-ui {
   li:last-child {
 .layers-ui,
 .share-ui {
   li:last-child {


@@ -687,11 +690,6 @@ body.compact-nav {
   padding: $lineheight/2 $lineheight;
   // background: $offwhite;
   // border-bottom: 1px solid $grey;
   padding: $lineheight/2 $lineheight;
   // background: $offwhite;
   // border-bottom: 1px solid $grey;

-  > .close {
-    float: right;
-    margin-top: 2px;
-    cursor: pointer;
-  }

 }
 
 #browse_status {
 }
 
 #browse_status {


@@ -700,6 +698,10 @@ body.compact-nav {
     margin-left: auto;
     margin-right: auto;
   }
     margin-left: auto;
     margin-right: auto;
   }

+
+  > div {
+   padding: $spacer;
+  }

 }
 
 #sidebar {
 }
 
 #sidebar {


@@ -725,6 +727,28 @@ form {
   }
 }
 
   }
 }
 

+/* Stop bootstrap 5 from floating legends when they don't need to be */
+legend {
+  float: none;
+}
+
+/* Override the text colour for primary and secondary buttons, to match our
+   bootstrap 4 colours. Note this has accessibility issues, which is why
+   bootstrap 5 calculates black as the appropriate colour, and we should
+   reconsider our colours at some point with that in mind. */
+
+.btn-primary {
+  @include button-variant($primary, $primary, $color: $white, $hover-color: $white, $active-color: $white, $disabled-color: $white);
+}
+
+.btn-secondary {
+  @include button-variant($secondary, $secondary, $color: $white, $hover-color: $white, $active-color: $white, $disabled-color: $white);
+}
+
+.btn-outline-secondary {
+  @include button-outline-variant($secondary, $color-hover: $white, $active-color: $white);
+}
+

 /* Rules for the search and direction forms */
 
 header .search_forms,
 /* Rules for the search and direction forms */
 
 header .search_forms,


@@ -763,13 +787,6 @@ header .search_forms,
 
 /* Rules for routing */
 
 
 /* Rules for routing */
 

-#sidebar_content>table {
-    padding: 5px 20px 10px 15px;
-    width: 100%;
-    border-collapse: separate;
-    border-spacing: 0;
-}
-

 div.direction {
   background-image: image-url('routing-sprite.png');
   width: 20px;
 div.direction {
   background-image: image-url('routing-sprite.png');
   width: 20px;


@@ -780,10 +797,6 @@ div.direction {
 div.direction.i#{$i} { background-position: #{($i)*-20}px 0px; }
 }
 
 div.direction.i#{$i} { background-position: #{($i)*-20}px 0px; }
 }
 

-p#routing_summary {
-    padding: 0 $lineheight $lineheight/4;
-}
-

 td.instruction, td.distance {
     padding-top: $lineheight/5;
     padding-bottom: $lineheight/5;
 td.instruction, td.distance {
     padding-top: $lineheight/5;
     padding-bottom: $lineheight/5;


@@ -800,8 +813,8 @@ tr.turn {
 tr.turn:hover {
     background: $list-highlight;
 }
 tr.turn:hover {
     background: $list-highlight;
 }

-.routing_engines, #route_from, #route_to { margin-left: 25px; }
-.routing_marker { width: 15px; position: absolute; cursor: move; }
+
+.routing_marker { width: 15px; cursor: move; }

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


@@ -820,14 +833,16 @@ tr.turn:hover {
 
 #sidebar .changesets {
   li {
 
 #sidebar .changesets {
   li {

-    cursor: pointer;
-

     &.selected { background: $list-highlight; }
     /* color is derived from changeset bbox fillColor in history.js */
     &.selected { background: $list-highlight; }
     /* color is derived from changeset bbox fillColor in history.js */

+
+    a.stretched-link > span, a:not(.stretched-link), [title] {
+      position: relative;
+      z-index: 2; /* needs to be higher than Bootstrap's stretched link ::after z-index */
+    }

   }
 
   .comments {
   }
 
   .comments {

-    float: right;

     color: $darkgrey;
   }
 
     color: $darkgrey;
   }
 


@@ -845,11 +860,11 @@ tr.turn:hover {
 
 #sidebar_content {
   .browse-section {
 
 #sidebar_content {
   .browse-section {

-    padding: $lineheight/2 $lineheight;
+    padding-bottom: $spacer;
+    margin-bottom: $spacer;

     border-bottom: 1px solid $grey;
 
     h4:first-child {
     border-bottom: 1px solid $grey;
 
     h4:first-child {

-      margin-top: 0;

       word-wrap: break-word;
     }
   }
       word-wrap: break-word;
     }
   }


@@ -858,42 +873,13 @@ tr.turn:hover {
     border-bottom: none;
   }
 
     border-bottom: none;
   }
 

-  .paginate {
-    float: right;
-    padding: 1px 6px;
-    border: 1px solid $lightgrey;
-    border-radius: 3px;
-  }
-
-  .browse-field {
-    margin-bottom: 10px;
-
-    h4 {
-      padding: 5px 0 5px 10px;
-      font-size: 12px;
-      border: 1px solid $grey;
-      border-radius: 4px 4px 0 0;
-      background-color: $offwhite;
-    }
-
-    p {
-      padding: 7px 10px;
-      font-size: 12px;
-      background-color: #FFF;
-      border: 1px solid $grey;
-      border-top: 0;
-      border-radius: 0 0 4px 4px;
-    }
-  }
-

   .browse-tag-list {
     background-color: $offwhite;
   .browse-tag-list {
     background-color: $offwhite;

-    border: 1px solid $grey;
-    border-radius: 3px;

     table-layout: fixed;
     border-collapse: separate;
     border-spacing: 0;
     width: 100%;
     table-layout: fixed;
     border-collapse: separate;
     border-spacing: 0;
     width: 100%;

+    margin-bottom: $spacer;

 
     th, td {
       border-bottom: 1px solid $grey;
 
     th, td {
       border-bottom: 1px solid $grey;


@@ -940,16 +926,6 @@ tr.turn:hover {
     }
   }
 
     }
   }
 

-  .comments-header {
-    float: left;
-  }
-
-  .subscribe-buttons {
-    float: left;
-    margin: 18px 10px 10px;
-    min-width: 80px;
-  }
-

   .subscribe-buttons input {
     font-size: 90%;
     line-height: 15px;
   .subscribe-buttons input {
     font-size: 90%;
     line-height: 15px;


@@ -966,17 +942,8 @@ tr.turn:hover {
     margin: 0 0 10px 10px;
   }
 
     margin: 0 0 10px 10px;
   }
 

-  .query-intro p {
-    padding: $lineheight $lineheight $lineheight/2;
-  }
-

   .query-results {
     display: none;
   .query-results {
     display: none;

-    padding-bottom: $lineheight/2;
-
-    h3 {
-      padding: 0 $lineheight;
-    }

 
     ul {
       li {
 
     ul {
       li {


@@ -992,29 +959,34 @@ tr.turn:hover {
   }
 }
 
   }
 }
 

+/* Bootstrap buttons don't have any vertical margin, so
+   they touch when adjacent buttons wrap onto a new line
+   e.g. wide form buttons on a narrow sidebar */
+
+.btn-wrapper {
+  > .btn {
+    margin-bottom: $spacer * 0.25;
+  }
+}
+

 /* Rules for export sidebar */
 
 .export_form {
 /* Rules for export sidebar */
 
 .export_form {

-  padding: $lineheight;
-

   .export_area_inputs,
   .export_button {
     text-align: center;
   }
 
   .export_area_inputs {
   .export_area_inputs,
   .export_button {
     text-align: center;
   }
 
   .export_area_inputs {

-    margin-bottom: $lineheight/2;
+    margin-bottom: $spacer;

     input[type="text"] {
     input[type="text"] {

-      width: 80px;
+      width: 100px;

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

-      margin-bottom: 5px;

     }
   }
 
   .export_boxy {
     background: $lightgrey;
     }
   }
 
   .export_boxy {
     background: $lightgrey;

-    border: 1px solid $grey;
-    border-radius: 3px;

 
     #maxlat { margin-top: -1px; }
     #minlon {
 
     #maxlat { margin-top: -1px; }
     #minlon {


@@ -1025,18 +997,13 @@ tr.turn:hover {
       float: right;
       /* no-r2 */ margin-right: -1px;
     }
       float: right;
       /* no-r2 */ margin-right: -1px;
     }

-    #minlat { margin-bottom: 0; }
+    #minlat { margin-bottom: -1px; }

   }
 
   .export_bound {
     margin: $lineheight/4;
   }
 
   }
 
   .export_bound {
     margin: $lineheight/4;
   }
 

-  .export_button {
-    margin-top: $lineheight;
-    margin-bottom: $lineheight;
-  }
-

   dl {
     padding-left: $lineheight/2;
     dd {
   dl {
     padding-left: $lineheight/2;
     dd {


@@ -1046,15 +1013,6 @@ tr.turn:hover {
   }
 }
 
   }
 }
 

-/* Rules for the routing sidebar */
-
-#sidebar_content {
-  #routing_credit {
-    text-align: center;
-    padding: 0.5em;
-  }
-}
-

 /* Rules for edit pages */
 
 .site-edit {
 /* Rules for edit pages */
 
 .site-edit {


@@ -1079,27 +1037,18 @@ tr.turn:hover {
 
 .content-inner {
   position: relative;
 
 .content-inner {
   position: relative;

-  max-width: 900px;
+  max-width: 960px;

   margin: auto;
   padding: $lineheight;
 }
 
 /* Overrides for pages that use new layout conventions */
 
   margin: auto;
   padding: $lineheight;
 }
 
 /* Overrides for pages that use new layout conventions */
 

-.users-new,
-.users-create,
-.users-terms,
-.users-confirm {
-  .content-heading .content-inner {
-    height: 200px;
-  }
-}
-

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

-  position: absolute;
-  height: 200px;
+  position: relative;
+  min-height: 200px;

   width: 100%;
   left: 0;
   bottom: 0;
   width: 100%;
   left: 0;
   bottom: 0;


@@ -1119,10 +1068,12 @@ tr.turn:hover {
   &.new-user-arm {
     height: 110px;
     width: 130px;
   &.new-user-arm {
     height: 110px;
     width: 130px;

-    left: 260px;
-    top: 160px;
+    left: 280px;
+    top: 180px;

     background-image: image-url("sign-up-illustration-arm.png");
     background-image: image-url("sign-up-illustration-arm.png");

+    position: absolute;

     z-index: 100;
     z-index: 100;

+    pointer-events: none;

   }
 }
 
   }
 }
 


@@ -1143,7 +1094,6 @@ tr.turn:hover {
 
 .content_map {
   height: 200px;
 
 .content_map {
   height: 200px;

-  border: 1px solid $grey;

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


@@ -1153,49 +1103,6 @@ tr.turn:hover {
   }
 }
 
   }
 }
 

-/* Rules for the user profile page */
-
-#userinformation {
-  min-height: 100px;
-  .userinformation-inner {
-    float: left;
-  }
-  .user-description {
-    width: 100%;
-    clear: both;
-  }
-}
-
-.admin-user-info small {
-  margin-bottom: $lineheight/2;
-  display: inline;
-  margin-right: $lineheight;
-}
-
-.contact-activity {
-  margin-top: $lineheight;
-  width: 100%;
-}
-
-.activity-details p {
-  margin-left: 70px;
-  margin-bottom: 0;
-}
-
-.users-show {
-  // Silly exception; remove when user page is redesigned.
-  .content-inner {
-    max-width: none;
-  }
-  p#no_home_location {
-    margin: $lineheight;
-  }
-  .user_thumbnail {
-    margin-top: $lineheight/4;
-    float: left;
-  }
-}
-

 /* Rules for the user map */
 
 .content_map .leaflet-popup-content {
 /* Rules for the user map */
 
 .content_map .leaflet-popup-content {


@@ -1212,30 +1119,12 @@ tr.turn:hover {
     margin-top: 0 0 0 60px;
     font-size: 12px;
   }
     margin-top: 0 0 0 60px;
     font-size: 12px;
   }

-  img.user_thumbnail {
-    float: left;
-    margin: 0 $lineheight/2 0 0;
-  }

 }
 
 /* Rules for the user list */
 
 #user_list {
   width: 100%;
 }
 
 /* Rules for the user list */
 
 #user_list {
   width: 100%;

-
-  tr {
-    vertical-align: middle;
-  }
-
-  p {
-    margin-top: 0px;
-    margin-bottom: 0px;
-  }
-}
-
-#user_list_actions {
-  float: right;
-  margin-top: $lineheight/2;

 }
 
 /* Rules for the diary list page */
 }
 
 /* Rules for the diary list page */


@@ -1246,53 +1135,19 @@ tr.turn:hover {
   padding-bottom: $lineheight/2;
   border-top: 1px solid $grey;
 
   padding-bottom: $lineheight/2;
   border-top: 1px solid $grey;
 

-  &:first-of-type {
-    margin-top: $lineheight/2;
-  }
-

   &.deleted {
     background-color: #fee;
   }
   &.deleted {
     background-color: #fee;
   }

-
-  .post_heading {
-    margin-bottom: $lineheight;
-
-    h2 {
-      margin-top: 0;
-      margin-bottom: $lineheight/2;
-    }
-  }
-
-  img.user_thumbnail {
-    float: left;
-  }
-
-  small.deemphasize {
-    float: left;
-    display: block;
-  }
-}
-
-.pagination {
-  padding-top: $lineheight;

 }
 
 /* Rules for the diary entry page */
 
 .diary_entries {
   #map {
 }
 
 /* Rules for the diary entry page */
 
 .diary_entries {
   #map {

-    position: relative;
-    width: 90%;

     height: 400px;
     height: 400px;

-    border: 1px solid $grey;

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

-  #newcomment {
-    border-top: 1px solid $grey;
-    padding-top: $lineheight;
-    margin-top: $lineheight/2;
-  }

   .comments {
     max-width: 740px;
   }
   .comments {
     max-width: 740px;
   }


@@ -1318,17 +1173,6 @@ tr.turn:hover {
   }
 }
 
   }
 }
 

-.diary_entries-show img.user_thumbnail {
-  float: left;
-}
-
-
-.diary-subscribe-buttons {
-  position: relative;
-  top: -30px;
-  left: 130px;
-}
-

 /* Rules for the log in page */
 
 #login_auth_buttons {
 /* Rules for the log in page */
 
 #login_auth_buttons {


@@ -1344,7 +1188,6 @@ tr.turn:hover {
 
 .users-terms {
   .legale {
 
 .users-terms {
   .legale {

-    border: 1px solid $grey;

     padding: $lineheight;
     margin-bottom: $lineheight;
     overflow: auto;
     padding: $lineheight;
     margin-bottom: $lineheight;
     overflow: auto;


@@ -1358,13 +1201,6 @@ tr.turn:hover {
       list-style-type: lower-alpha;
     }
   }
       list-style-type: lower-alpha;
     }
   }

-
-  #decline {
-    background: $lightblue;
-    &:hover {
-      background: darken($lightblue, $hovercolor);
-    }
-  }

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


@@ -1393,16 +1229,6 @@ tr.turn:hover {
   display: inline !important;
 }
 
   display: inline !important;
 }
 

-/* Rules for the oauth settings page */
-
-.oauth_clients .buttons .oauth-edit {
-  border-radius: 2px 0 0 2px;
-}
-
-.oauth_clients .buttons .oauth-delete {
-  border-radius: 0 2px 2px 0;
-}
-

 /* Rules for the oauth authorization page */
 
 .oauth-authorize ul {
 /* Rules for the oauth authorization page */
 
 .oauth-authorize ul {


@@ -1412,8 +1238,9 @@ tr.turn:hover {
 /* Rules for messages pages */
 
 .messages {
 /* Rules for messages pages */
 
 .messages {

-  input[type="submit"] {
+  button[type="submit"] {

     margin: auto;
     margin: auto;

+    white-space: nowrap;

   }
 
   .inbox-row {
   }
 
   .inbox-row {


@@ -1464,8 +1291,6 @@ tr.turn:hover {
 /* Rules for "flash" notice boxes shown at the top of the content area */
 
 .flash {
 /* Rules for "flash" notice boxes shown at the top of the content area */
 
 .flash {

-  padding: $lineheight;
-

   &.error {
     background-color: #ff7070;
   }
   &.error {
     background-color: #ff7070;
   }


@@ -1477,25 +1302,6 @@ tr.turn:hover {
   &.notice {
     background-color: #CBEEA7;
   }
   &.notice {
     background-color: #CBEEA7;
   }

-
-  div.message {
-    display: inline-block;
-    margin-left: $lineheight / 2;
-    vertical-align: middle;
-
-    p {
-      margin-top: $lineheight * 0.5;
-      margin-bottom: $lineheight * 0.5;
-
-      &:first-child {
-        margin-top: 0px;
-      }
-
-      &:last-child {
-        margin-bottom: 0px;
-      }
-    }
-  }

 }
 
 /* Rules for highlighting fields with rails validation errors */
 }
 
 /* Rules for highlighting fields with rails validation errors */


@@ -1536,251 +1342,25 @@ tr.turn:hover {
   }
 }
 
   }
 }
 

-/* Rules for forms */
-
-.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 $lightgrey;
-  }
-  .horizontal-list .standard-form-row {
-    float: left;
-    padding-right: 10px;
-  }
-  .standard-form-row {
-    margin-bottom: $lineheight/2;
-  }
-  .form-list {
-    margin-bottom: 0;
-  }
-  .form-list li {
-    margin-bottom: 5px;
-    list-style-type: none;
-  }
-  input[type="checkbox"],
-  input[type="radio"] {
-    float: left;
-    margin-top: 5px;
-  }
-
-  #remember_me_openid {
-    display: block;
-  }
-
-  select {
-    padding: 2px;
-  }
-
-  input[type="checkbox"],
-  input[type="radio"] {
-      margin-right: 5px;
-  }
-
-  input[type="text"],
-  input[type="email"],
-  input[type="url"],
-  input[type="password"],
-  textarea {
-    color: #222;
-    background-color: #fff;
-    border: 1px solid $grey;
-    border-radius: 3px;
-    padding: 2px 5px;
-    margin: 0;
-    width: 200px;
-
-    &.field_with_errors {
-      border: 2px solid #ff7070;
-    }
-  }
-
-  textarea {
-    padding: 5px;
-    width: 100%;
-    min-height: 50px;
-    resize: vertical;
-  }
-
-
-  /* Utility for general button styles */
-
-  input[type="button"],
-  input[type="submit"],
-  input[type="reset"],
-  a.button {
-    cursor: pointer;
-    border: 0;
-    display: inline-block;
-    padding: $lineheight/4 $lineheight/2;
-    min-height: 20px + $lineheight/2;
-    min-width: 120px;
-    margin: 0 0 $lineheight/2 0;
-    color: white;
-    background: $blue;
-    text-align: center;
-    border-radius: 2px;
-    &:hover {
-      background: darken($blue, $hovercolor);
-      text-decoration: none;
-    }
-    &.deemphasize {
-      background: $lightblue;
-      &:hover {
-        background: darken($lightblue, $hovercolor);
-      }
-    }
-    &:disabled {
-      background: $lightgrey;
-      &:hover {
-        background: $lightgrey;
-      }
-    }
-    &:last-child {
-      margin-bottom: 0;
-    }
-  }
-
-  input[type="button"],
-  input[type="submit"],
-  input[type="reset"] {
-    line-height: normal;
-  }
+.search_form {
+  background-color: $lightgrey;

 
 

-  a.button {
-    line-height: 20px;
+  .describe_location {
+    top: 6px;
+    right: 6px;
+    font-size: 10px;
+    color: $blue;

   }
   }

+}

 
 

-  .search_form,
-  .directions_form {
-    position: relative;
-    padding: $lineheight/2;
-    background-color: $lightgrey;
-
-    .query_wrapper {
-      position: relative;
-      overflow: hidden;
-      border-radius: 2px 0 0 2px;
-    }
-
-    input[type=text] {
-      width: 100%;
-      height: 30px;
-      transition: 300ms linear;
-    }
-
-    input[type=text].overflow {
-      border-right: none;
-      border-radius: 3px 0px 0px 3px;
-    }
-
-    input:focus {
-      outline: none;
-      box-shadow: 0px 0px 7px $vibrant-green;
-    }
-
-    input[type=submit].float {
-      float: right;
-      width: auto;
-      min-width: 0;
-      border-radius: 0 2px 2px 0;
-    }
-
-    input.error {
-      background-color: rgba($red, 0.4);
-    }
-
-    select {
-      /* this next line is to polyfill the vertical alignment of text within a select element,
-       * which is different between firefox and chrome. */
-      padding: 0.3em 0;
-    }
-
-    .query_options {
-      text-align: right;
-      font-size: 10px;
-      color: $blue;
-    }
-
-    .describe_location {
-      position: absolute;
-      top: 6px;
-      right: 6px;
-      font-size: 10px;
-      color: $blue;
-    }
-
-    .switch_link {
-      float: right;
-      width: auto;
-      min-width: 0;
-      margin-left: 6px;
-    }
-
-    img.button {
-      display: block;
-      width: 20px;
-      height: 20px;
-    }
-
-    span.force_width {
-      width: 100%;
-      padding-right: 25px;
-      display: block;
-    }
-
-    select.routing_engines {
-      min-height: 30px;
-      margin: 0px 0px 5px 25px;
-    }
-
-    input.routing_go {
-      min-width: 100px;
-      float: right;
-    }
-
-    div.header {
-      width: 100%;
-      height: 30px;
-    }
-
-    div.line {
-      width: 100%;
-      margin: 0px 0px 5px 0px;
-    }
-
-    div.loader_copy {
-      display: none;
+.directions_form {
+  background-color: $lightgrey;

 
 

-      img {
-        vertical-align: middle;
-      }
-    }
+  .loader_copy {
+    display: none;

 
 

-    a.reverse_directions {
-      cursor: pointer;
-      margin: 0px 0px 5px 25px;
+    img {
+      vertical-align: middle;

     }
   }
 }
     }
   }
 }


@@ -1790,17 +1370,11 @@ tr.turn:hover {
 img.user_image {
   max-width: 100px;
   max-height: 100px;
 img.user_image {
   max-width: 100px;
   max-height: 100px;

-  border: 1px solid $grey;
-  margin-bottom: $lineheight;
-  float: left;
-  margin-right: $lineheight;

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

-  border: 1px solid $grey;
-  margin-right: $lineheight;

 }
 
 img.user_thumbnail_tiny {
 }
 
 img.user_thumbnail_tiny {


@@ -1808,7 +1382,6 @@ img.user_thumbnail_tiny {
   height: auto;
   max-width: 25px;
   max-height: 25px;
   height: auto;
   max-width: 25px;
   max-height: 25px;

-  border: 1px solid $grey;

 }
 
 /* Rules for geo microformats */
 }
 
 /* Rules for geo microformats */


@@ -1817,30 +1390,26 @@ abbr.geo {
   border-bottom: none;
 }
 
   border-bottom: none;
 }
 

-/* General styles for action lists / subnavs / pager navs */
+/* General styles for action lists / subnavs */

 
 

-ul.secondary-actions {
-  font-style: normal;
-  margin-bottom: 0;
-  margin-left: 0;
-  padding: 0;
-  &.pager {
-    display: inline-block;
-    margin-right: 60px;
-  }
-  > li {
-    display: block;
-    float: left;
-    list-style: none;
-    border-left: 1px solid $grey;
-    padding-left: $lineheight/2;
-    margin-right: $lineheight/2;
-    &:first-child {
-      border-left: 0;
-      padding-left: 0;
-    }
-    &:last-child {
-      margin-right: 0px;
+
+nav.secondary-actions {
+  margin-left: -11px;
+  overflow: hidden;
+  > ul {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    margin-bottom: 0;
+    margin-left: -1px;
+    padding: 0;
+    > li {
+      flex-basis: auto;
+      list-style: none;
+      border-left: 1px solid $grey;
+      padding-left: $lineheight/2;
+      margin-right: $lineheight/2;
+      margin-bottom: $lineheight/8;

     }
   }
 }
     }
   }
 }


@@ -1850,79 +1419,17 @@ div.secondary-actions {
   text-align: center;
 }
 
   text-align: center;
 }
 

-/* Utility for managing inner content areas */
-
-.inner22 { padding: $lineheight;}
-
-.inner12 { padding: $lineheight/2 $lineheight;}
+/* Create a single-line dl */

 
 

-.inner11 { padding: $lineheight/2;}
-
-.inner20 { padding: $lineheight 0;}
-
-.inner02 { padding: 0 $lineheight;}
-
-.buttons {
-  min-width: 200px;
-  input[type="submit"],
-  input[type="button"],
-  input[type="reset"],
-  .button,
-  .button_to {
-    box-sizing: border-box;
-    float: left;
-    border-radius: 0;
-    margin:0;
-    min-width: 75px;
-    max-width: 180px;
-    border-right:1px solid white;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    overflow: hidden;
-  }
-  input:first-child,
-  .button:first-child,
-  .button_to:first-child {
-    border-radius:2px 0 0 2px;
-  }
-  input:last-child,
-  .button:last-child,
-  .button_to:last-child {
-    border-radius:0 2px 2px 0;
-    border-right-width: 0;
-  }
-  input:only-child,
-  .button:only-child,
-  .button_to:only-child,
-  *[value="Hide"] + input:last-child,
-  *[value="Hide"] + .button:last-child,
-  *[value="Hide"] + .button_to: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),
-  *[value="Hide"] + .button_to:nth-child(3) {
-    border-radius:0 2px 2px 0;
-    border-right-width: 0;
+dl.dl-inline {
+  dt, dd {
+    display: inline-block;

   }
   }

-  /* 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),
-  *[value="Hide"] + .button_to:nth-child(2):not(:last-child) {
-    border-radius:2px 0 0 2px;
-    border-right-width: 1px;
+  dd {
+    margin-right: 1em;

   }
 }
 
   }
 }
 

-/* Customise the background colour of striped tables */
-
-.table-striped > tbody > tr:nth-child(2n+1) > td,
-.table-striped > tbody > tr:nth-child(2n+1) > th {
-   background-color: $offwhite;
-}
-

 /* Rules for OpenID logo */
 
 .openid_logo {
 /* Rules for OpenID logo */
 
 .openid_logo {


@@ -1935,13 +1442,11 @@ div.secondary-actions {
 .richtext,
 .prose {
   code {
 .richtext,
 .prose {
   code {

-    font-size: 13px;

     background: $lightgrey;
     padding: 2px 3px;
   }
 
   pre {
     background: $lightgrey;
     padding: 2px 3px;
   }
 
   pre {

-    font-size: 13px;

     background: $lightgrey;
     padding: 2px 3px;
     white-space: pre-wrap;
     background: $lightgrey;
     padding: 2px 3px;
     white-space: pre-wrap;


@@ -1967,97 +1472,6 @@ div.secondary-actions {
   }
 }
 
   }
 }
 

-.diary_post .richtext {
-    margin-top: $lineheight;
-  }
-
-.comments .richtext {
-  margin-left: 70px;
-  margin-top: 0;
-}
-
-/* Rules for rich text editors */
-
-.standard-form {
-  input.richtext_title[type="text"] {
-    width: 50%;
-    width: calc(100% - 235px);
-
-    @media only screen and (max-width:768px) {
-      width: 100%;
-    }
-  }
-
-  .richtext_container {
-    margin-bottom: $lineheight;
-
-    .richtext_content {
-      width: 50%;
-      width: calc(100% - 235px);
-      display: inline-block;
-      vertical-align: top;
-
-      @media only screen and (max-width:768px) {
-        width: 100%;
-      }
-
-      .richtext_preview {
-        display: inline-block;
-        padding: $lineheight;
-        background-color: $offwhite;
-        overflow-x: auto;
-
-        &.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: $offwhite;
-      padding: $lineheight/2;
-      width: 220px;
-
-      ul {
-        margin-bottom: 0;
-      }
-
-      h4.heading, li {
-        border-bottom: 1px solid $grey;
-        margin-bottom: $lineheight/4;
-        padding-bottom: $lineheight/4;
-      }
-
-      li h4, li span, li p {
-        display: inline-block;
-        vertical-align: top;
-        font-size: 11px;
-      }
-
-      li h4 {
-        width: 40%;
-        margin: 0;
-      }
-
-      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 {
 /* Rules for the user notes list */
 
 .note_list {


@@ -2075,19 +1489,10 @@ div.secondary-actions {
 
 /* Rules for the "Welcome" page */
 .site-welcome, .site-fixthemap {
 
 /* Rules for the "Welcome" page */
 .site-welcome, .site-fixthemap {

-  .center {
-    text-align: center;
-    .sprite {
-      float: none;
-      margin: auto;
-    }
-  }
-

   .sprite {
     background-image: image-url("welcome-sprite.png");
     background-size: 500px 250px;
     display: block;
   .sprite {
     background-image: image-url("welcome-sprite.png");
     background-size: 500px 250px;
     display: block;

-    float: left;

   }
 
   .icon-list {
   }
 
   .icon-list {


@@ -2137,15 +1542,6 @@ div.secondary-actions {
     /* no-r2 */ background-position: -350px 0;
   }
 
     /* no-r2 */ background-position: -350px 0;
   }
 

-  .start-mapping {
-    margin: auto;
-    cursor: pointer;
-    border: none;
-    padding: 20px 40px;
-    font-size: 30px;
-    text-decoration: none;
-  }
-

   .icon.note {
     background-color: #333;
     border-radius: 4px;
   .icon.note {
     background-color: #333;
     border-radius: 4px;


@@ -2154,53 +1550,21 @@ div.secondary-actions {
 
 .site-about #content {
   background-color: $lightgrey;
 
 .site-about #content {
   background-color: $lightgrey;

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

 
   .content-inner {
 
   .content-inner {

-    position: relative;
-    color: #333;
-    min-width: 320px;
-    max-width: 640px;
-  }
-
-  .text {
-    background: white;
-    padding: 40px;
+    max-width: 760px;

   }
 
   .attr {
   }
 
   .attr {

-    position: relative;
-    padding: 170px 40px 20px;
-    background: #333;
-    background: rgba(0, 0, 0, .8);
-    margin-bottom: 0;

     margin-top: -20px;
 
     h1 {
     margin-top: -20px;
 
     h1 {

-      display: block;
-      color: white;
-      font-weight: 300;
-      font-size: 28px;

       span {
         color: $vibrant-green;
       }
     }
 
       span {
         color: $vibrant-green;
       }
     }
 

-    @include media-breakpoint-up(sm) {
-      h1 {
-        font-size: 34px;
-      }
-    }
-

     .user-image {
     .user-image {

-      position: absolute;
-      top: 0px;
-      right: 240px;
-      left: 0px;

       height: 150px;
       background-position: 0 50%;
       background-repeat: no-repeat;
       height: 150px;
       background-position: 0 50%;
       background-repeat: no-repeat;


@@ -2210,23 +1574,13 @@ div.secondary-actions {
     }
 
     .byosm {
     }
 
     .byosm {

-      position: absolute;
-      top: 0px;
-      right: 0px;
-      z-index: 1;
-      width: 240px;
-      height: 150px;
-      padding: 20px 20px 20px 40px;
-      font: 500 20px/24px Helvetica, Arial, sans-serif;
-      white-space: nowrap;
-      color: #fff;

       background: $vibrant-green;
     }
 
     .byosm span {
       display: inline-block;
       background: $vibrant-green;
     }
 
     .byosm span {
       display: inline-block;

-      width: 20px;
-      margin-left: -20px;
+      width: 1em;
+      margin-left: -1em;

     }
   }
 
     }
   }
 


@@ -2265,9 +1619,3 @@ div.secondary-actions {
 }
 
 @import 'browse';
 }
 
 @import 'browse';

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