Update bundle

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 0023286bf6391e405de80666cb962cf7d5fa0cba..8d3da8f7e8267d467b642176d13e9e6ae8a8ecd9 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -62,23 +62,22 @@ small, aside {
 .icon.note.grey   { /* no-r2 */ background-position: -240px -20px; }
 .icon.query       { /* no-r2 */ background-position: -260px 0; }
 
 .icon.note.grey   { /* no-r2 */ background-position: -240px -20px; }
 .icon.query       { /* no-r2 */ background-position: -260px 0; }
 

-/* Rules for links */
-
-a {
-  color: #24d;
-  text-decoration: none;
-  outline: 0;
-  &:hover {
-    text-decoration: underline;
-  }
-}
-

 /* Utility for de-emphasizing content */
 
 .text-muted a {
   color: $blue;
 }
 
 /* Utility for de-emphasizing content */
 
 .text-muted a {
   color: $blue;
 }
 

+/* Rules for borders */
+/* These add additional colours to those provided by bootstrap */
+.border-grey {
+  border-color: $grey !important;
+}
+
+.border-lightgrey {
+  border-color: $lightgrey !important;
+}
+

 /* Rules for the header */
 
 #menu-icon {
 /* Rules for the header */
 
 #menu-icon {


@@ -192,7 +191,7 @@ nav.secondary {
 
   .login-menu {
     .btn-outline-secondary {
 
   .login-menu {
     .btn-outline-secondary {

-      @include button-outline-variant($darkgrey);
+      @include button-outline-variant($darkgrey, $white, null, null, $white);

     }
   }
 
     }
   }
 


@@ -216,11 +215,6 @@ nav.secondary {
     }
   }
 
     }
   }
 

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

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


@@ -365,16 +359,6 @@ body.compact-nav {
       width: 100%;
     }
 
       width: 100%;
     }
 

-    h2 {
-      font-size: 1.5rem;
-    }
-
-    h3, h4 {
-      margin-top: $lineheight;
-      margin-bottom: $lineheight/2;
-      font-size: 1.25rem;
-    }
-

     .close-wrap {
       cursor: pointer;
       position: absolute;
     .close-wrap {
       cursor: pointer;
       position: absolute;


@@ -390,23 +374,6 @@ body.compact-nav {
         top: 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 {


@@ -700,6 +667,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, $white, null, null, $white, null, null, $white, null, null, $white);
+}
+
+.btn-secondary {
+  @include button-variant($secondary, $secondary, $white, null, null, $white, null, null, $white, null, null, $white);
+}
+
+.btn-outline-secondary {
+  @include button-outline-variant($secondary, $white, null, null, $white);
+}
+

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


@@ -791,7 +780,6 @@ tr.turn:hover {
   }
 
   .comments {
   }
 
   .comments {

-    float: right;

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


@@ -814,7 +802,6 @@ tr.turn:hover {
     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;
     }
   }


@@ -823,42 +810,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;


@@ -905,16 +863,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;


@@ -967,7 +915,7 @@ tr.turn:hover {
   }
 
   .export_area_inputs {
   }
 
   .export_area_inputs {

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

     input[type="text"] {
       width: 100px;
       text-align: center;
     input[type="text"] {
       width: 100px;
       text-align: center;


@@ -976,8 +924,6 @@ tr.turn:hover {
 
   .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 {


@@ -1064,6 +1010,7 @@ tr.turn:hover {
     background-image: image-url("sign-up-illustration-arm.png");
     position: absolute;
     z-index: 100;
     background-image: image-url("sign-up-illustration-arm.png");
     position: absolute;
     z-index: 100;

+    pointer-events: none;

   }
 }
 
   }
 }
 


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

-  border: 1px solid $grey;

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


@@ -1094,49 +1040,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 {


@@ -1153,30 +1056,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 */


@@ -1187,26 +1072,9 @@ 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;
-  }

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


@@ -1214,7 +1082,6 @@ tr.turn:hover {
 .diary_entries {
   #map {
     height: 400px;
 .diary_entries {
   #map {
     height: 400px;

-    border: 1px solid $grey;

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


@@ -1243,10 +1110,6 @@ tr.turn:hover {
   }
 }
 
   }
 }
 

-.diary_entries-show img.user_thumbnail {
-  float: left;
-}
-

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


@@ -1262,7 +1125,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;


@@ -1323,8 +1185,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 {


@@ -1375,8 +1238,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;
   }


@@ -1460,17 +1321,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 {


@@ -1478,7 +1333,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 */


@@ -1489,28 +1343,28 @@ abbr.geo {
 
 /* General styles for action lists / subnavs / pager navs */
 
 
 /* General styles for action lists / subnavs / pager navs */
 

-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;
+
+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;
+    &.pager {
+      display: inline-block;
+      margin-right: 60px;

     }
     }

-    &:last-child {
-      margin-right: 0px;
+    > li {
+      flex-basis: auto;
+      list-style: none;
+      border-left: 1px solid $grey;
+      padding-left: $lineheight/2;
+      margin-right: $lineheight/2;
+      margin-bottom: $lineheight/8;

     }
   }
 }
     }
   }
 }


@@ -1574,11 +1428,15 @@ div.secondary-actions {
   }
 }
 
   }
 }
 

-/* Customise the background colour of striped tables */
+/* Create a single-line dl */

 
 

-.table-striped > tbody > tr:nth-child(2n+1) > td,
-.table-striped > tbody > tr:nth-child(2n+1) > th {
-   background-color: $offwhite;
+dl.dl-inline {
+  dt, dd {
+    display: inline-block;
+  }
+  dd {
+    margin-right: 1em;
+  }

 }
 
 /* Rules for OpenID logo */
 }
 
 /* Rules for OpenID logo */


@@ -1593,13 +1451,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;


@@ -1625,10 +1481,6 @@ div.secondary-actions {
   }
 }
 
   }
 }
 

-.comments .richtext {
-  margin-left: 70px;
-}
-

 /* Rules for the user notes list */
 
 .note_list {
 /* Rules for the user notes list */
 
 .note_list {


@@ -1646,19 +1498,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 {


@@ -1708,15 +1551,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;


@@ -1758,8 +1592,8 @@ div.secondary-actions {
 
     .byosm span {
       display: inline-block;
 
     .byosm span {
       display: inline-block;

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

     }
   }
 
     }
   }