Merge remote-tracking branch 'upstream/pull/4303'

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

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 77b87f8788f045731b210df6accbb25f8175108c..16c986618fafe8a9c2f9b574be93c02b8a15ed2d 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -23,7 +23,7 @@ small, aside {
 
 .small_icon {
   vertical-align: middle;
 
 .small_icon {
   vertical-align: middle;

-  margin-right: $lineheight/4;
+  margin-right: $lineheight * 0.25;

 }
 
 [dir=rtl] { /* no-r2 */ text-align: right; }
 }
 
 [dir=rtl] { /* no-r2 */ text-align: right; }


@@ -80,11 +80,10 @@ small, aside {
 /* Rules for the header */
 
 #menu-icon {
 /* Rules for the header */
 
 #menu-icon {

-  display: none !important;
+  display: none;

   float: right;
   background: image-url("menu-icon.png") no-repeat;
   background-size: 30px 30px;
   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;
   width: 30px;
   height: 30px;
   margin: 14px 10px 0 0;


@@ -103,38 +102,21 @@ header {
 
   > * {
     height: 100%;
 
   > * {
     height: 100%;

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

   }
 
   h1, nav.primary {
     float: left;
   }
 
   }
 
   h1, nav.primary {
     float: left;
   }
 

-  a, a:hover {
-    text-decoration: none;
-  }
-

   img.logo {
   img.logo {

-    width: 30px;
-    height: 30px;

     margin-top: -2px;
     margin-top: -2px;

-    vertical-align: middle;

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

-    font-weight: 600;

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

-    margin: 0;

     padding-top: 15px;
     padding-top: 15px;

-
-    a {
-      color: #000;
-    }
-
-    a:hover {
-      color: #000;
-    }

   }
 
   .btn {
   }
 
   .btn {


@@ -144,7 +126,7 @@ header {
 
 
 nav.primary {
 
 
 nav.primary {

-  .btn-outline-primary {
+  & > .btn-group .btn-outline-primary {

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


@@ -188,35 +170,8 @@ nav.secondary {
     color: darken($darkgrey, 25%);
   }
 
     color: darken($darkgrey, 25%);
   }
 

-  .login-menu {
-    .btn-outline-secondary {
-      @include button-outline-variant($darkgrey, $color-hover: $white, $active-color: $white);
-    }
-  }
-
-  .user-menu {
-    .btn-outline-secondary {
-      @include button-outline-variant($darkgrey, $color-hover: $darkgrey, $active-background: white, $active-border: $darkgrey);
-      border-color: $grey;
-      &:hover {
-        border-color: $grey;
-      }
-    }
-  }
-

   #inboxanchor {
   #inboxanchor {

-    display: inline-block;
-    height: 25px;
-    margin: 3px 0 3px 3px;

     background-color: lighten($grey, 10%);
     background-color: lighten($grey, 10%);

-    line-height: 20px;
-    border-radius: 3;
-  }
-
-  .dropdown-menu {
-    .count-number {
-      font-size: 14px;
-    }

   }
 }
 
   }
 }
 


@@ -244,7 +199,7 @@ body.compact-nav {
 
 body.small-nav {
   #menu-icon {
 
 body.small-nav {
   #menu-icon {

-    display: inline-block !important;
+    display: block;

   }
 
   nav.primary,
   }
 
   nav.primary,


@@ -305,7 +260,7 @@ body.small-nav {
   }
 
   nav.secondary {
   }
 
   nav.secondary {

-    .user-menu {
+    .user-menu, .login-menu {

       width: 100%;
     }
   }
       width: 100%;
     }
   }


@@ -318,28 +273,21 @@ body.small-nav {
     display: inline-block;
   }
 
     display: inline-block;
   }
 

-  .overlay-sidebar #sidebar .welcome.visible {
+  .overlay-sidebar #sidebar .welcome {

     display: none;
   }
 
   .overlay-sidebar #sidebar #banner {
     display: none;
   }
     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 {

-  padding: 2px $lineheight/4;
-  border-radius: 2px;

   background: lighten($green, 30%);
   background: lighten($green, 30%);

-  margin: 0 2px;
-  font-size: 11px;
-  color: #333;
+  color: $gray-800;
+  font-weight: $font-weight-normal;

 }
 
 /* Rules for the message shown in place of the map when javascript is disabled */
 }
 
 /* Rules for the message shown in place of the map when javascript is disabled */


@@ -352,14 +300,21 @@ body.small-nav {
 
 /* Rules for Leaflet maps */
 
 
 /* Rules for Leaflet maps */
 

+.leaflet-top.leaflet-right,
+.leaflet-top.leaflet-left {
+  height: 100%;
+  column-gap: 10px;
+  display: flex;
+  flex-direction: column;
+  flex-wrap: wrap-reverse;
+}
+

 .leaflet-control .control-button {
   display: block;
   height: 40px;
   width: 40px;
   background-color: #333;
   background-color: rgba(0,0,0,.6);
 .leaflet-control .control-button {
   display: block;
   height: 40px;
   width: 40px;
   background-color: #333;
   background-color: rgba(0,0,0,.6);

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

   outline: none;
 
   &:hover,
   outline: none;
 
   &:hover,


@@ -378,26 +333,18 @@ body.small-nav {
     background-color: $vibrant-green;
   }
 
     background-color: $vibrant-green;
   }
 

-  .icon {
-    margin: 10px;
+  &-first {
+    border-start-start-radius: 4px;

   }
   }

-}
-
-.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;
-}
+  &-last {
+    border-end-start-radius: 4px;
+    margin-bottom: 10px;
+  }

 
 

-.control-locate .control-button,
-.control-share .control-button {
-  border-radius: 0 0 0 4px;
+  .icon {
+    margin: 10px;
+  }

 }
 
 /* Rules for the sidebar and main map area */
 }
 
 /* Rules for the sidebar and main map area */


@@ -433,9 +380,6 @@ body.small-nav {
 
     > div {
       position: relative;
 
     > div {
       position: relative;

-      float: left;
-      clear: both;
-      width: 100%;

     }
   }
 
     }
   }
 


@@ -450,11 +394,7 @@ body.small-nav {
     }
 
     .welcome {
     }
 
     .welcome {

-      display: none;
-
-      &.visible {
-        display: block;
-      }
+      display: block;

     }
 
     #sidebar_content {
     }
 
     #sidebar_content {


@@ -478,6 +418,11 @@ body.small-nav {
       display: block;
       width: $sidebarWidth;
     }
       display: block;
       width: $sidebarWidth;
     }

+
+    button.btn-close {
+      background-color: rgba(255, 255, 255, 0.5);
+      opacity: 1.0;
+    }

   }
 
   #map {
   }
 
   #map {


@@ -508,7 +453,7 @@ body.small-nav {
 
     .section {
       border-bottom: 1px solid $grey;
 
     .section {
       border-bottom: 1px solid $grey;

-      padding: 10px 20px;
+      padding: $spacer;

     }
   }
 }
     }
   }
 }


@@ -544,13 +489,6 @@ body.small-nav {
   }
 }
 
   }
 }
 

-.layers-ui,
-.share-ui {
-  li:last-child {
-    margin-bottom: 0;
-  }
-}
-

 .layers-ui {
   .base-layers {
     .leaflet-container {
 .layers-ui {
   .base-layers {
     .leaflet-container {


@@ -602,62 +540,13 @@ body.small-nav {
 }
 
 .share-ui {
 }
 
 .share-ui {

-  .share-tabs {
-    margin-bottom: 10px;
-
-    a {
-      color: #fff;
-      text-decoration: none;
-      background-color: $lightblue;
-      padding: 5px 10px;
-      border-right: 1px solid #fff;
-    }
-
-    a:first-child {
-      border-right: 1px solid #fff;
-      border-radius: 4px 0 0 4px;
-    }
-
-    a:last-child {
-      border-radius: 0 4px 4px 0;
-    }
-
-    a.active {
-      background-color: $blue;
-    }
-  }
-
-  .share-tab {
-    display: none;
-  }
-
-  .share-link {
-    input[type=text],
-    textarea {
-      width: 100%;
-      font-family: monospace;
-      font-size: small;
-      line-height: 1.3;
-    }
-  }
-
-  .share-image {
-    label {
-      margin-right: 10px;
-    }
-  }
-
-  #embed_html {
-    resize: vertical;
-  }
-

   #mapnik_scale {
     width: 100px;
   }
 }
 
 .leaflet-top {
   #mapnik_scale {
     width: 100px;
   }
 }
 
 .leaflet-top {

-  top: $lineheight/2 !important;
+  top: 10px !important;

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


@@ -676,34 +565,10 @@ body.small-nav {
 
 /* Rules for attribution text under the main map shown on printouts */
 
 
 /* Rules for attribution text under the main map shown on printouts */
 

-#attribution {
-  display: none;
-
-  table {
-    width: 100%
-  }
-}
-
-.attribution_license,
-.attribution_project {
-  text-align: left;
-}
-
-.attribution_notice {
-  text-align: center;
-}
-

 .donate-attr { color: darken($green, 10%) !important; }
 
 /* Rules for the sidebar */
 
 .donate-attr { color: darken($green, 10%) !important; }
 
 /* Rules for the sidebar */
 

-.sidebar_heading {
-  position: relative;
-  padding: $lineheight/2 $lineheight;
-  // background: $offwhite;
-  // border-bottom: 1px solid $grey;
-}
-

 #browse_status {
   input {
     display: block;
 #browse_status {
   input {
     display: block;


@@ -716,27 +581,15 @@ body.small-nav {
   }
 }
 
   }
 }
 

-#sidebar {
-  #sidebar_loader,
-  .search_more {
-    width: 100%;
-    margin: $lineheight auto;
-  }
-
-  .loader {
-    text-align: center;
-    margin: auto;
-    width: 40px;
-    display: block;
-  }
-}
-

 /* Temporary label size override until we remove site-wide font customisation */
 
 form {
   label {
     font-size: 16px;
   }
 /* Temporary label size override until we remove site-wide font customisation */
 
 form {
   label {
     font-size: 16px;
   }

+  .col-form-label {
+    font-size: 16px;
+  }

 }
 
 /* Stop bootstrap 5 from floating legends when they don't need to be */
 }
 
 /* Stop bootstrap 5 from floating legends when they don't need to be */


@@ -781,22 +634,15 @@ header .search_forms,
 /* Rules for search sidebar */
 
 #sidebar .search_results_entry {
 /* Rules for search sidebar */
 
 #sidebar .search_results_entry {

-  ul li {
-    cursor: pointer;
-    &.selected { background: $list-highlight; }
+  ul li.selected {
+    background: $list-highlight;

   }
 
   .search_more .loader {
     display: none;
   }
 
   .search_more .loader {
     display: none;

-    width: 100%;

   }
 }
 
   }
 }
 

-.search_results_error {
-  color: #f00;
-  padding: 10px 20px;
-}
-

 /* Rules for routing */
 
 div.direction {
 /* Rules for routing */
 
 div.direction {


@@ -809,14 +655,7 @@ div.direction {
 div.direction.i#{$i} { background-position: #{($i)*-20}px 0px; }
 }
 
 div.direction.i#{$i} { background-position: #{($i)*-20}px 0px; }
 }
 

-td.instruction, td.distance {
-    padding-top: $lineheight/5;
-    padding-bottom: $lineheight/5;
-    border-bottom: 1px solid $grey;
-}

 td.distance {
 td.distance {

-    color: $darkgrey;
-    text-align: right;

     font-size: x-small;
 }
 tr.turn {
     font-size: x-small;
 }
 tr.turn {


@@ -828,15 +667,6 @@ tr.turn:hover {
 
 .routing_marker { width: 15px; cursor: move; }
 
 
 .routing_marker { width: 15px; cursor: move; }
 

-/* Rules for entity history */
-
-#sidebar_content {
-  .browse_details {
-    position: relative;
-    border-bottom: $keyline;
-  }
-}
-

 .browse_status {
   display: none;
 }
 .browse_status {
   display: none;
 }


@@ -854,14 +684,6 @@ tr.turn:hover {
     }
   }
 
     }
   }
 

-  .comments {
-    color: $darkgrey;
-  }
-
-  .comments-0 {
-    opacity: 0.5;
-  }
-

   .changeset_more .loader {
     display: none;
     width: 100%;
   .changeset_more .loader {
     display: none;
     width: 100%;


@@ -929,21 +751,6 @@ tr.turn:hover {
     }
   }
 
     }
   }
 

-  .note-comments li, .changeset-comments li {
-    margin: $lineheight/2 0;
-
-    p {
-      margin: 10px 6px 0 6px;
-      line-height: 1.5;
-    }
-  }
-
-  .subscribe-buttons input {
-    font-size: 90%;
-    line-height: 15px;
-    min-height: 20px;
-  }
-

   span.action-button:hover {
     cursor: pointer;
     text-decoration: underline;
   span.action-button:hover {
     cursor: pointer;
     text-decoration: underline;


@@ -1011,18 +818,6 @@ tr.turn:hover {
     }
     #minlat { margin-bottom: -1px; }
   }
     }
     #minlat { margin-bottom: -1px; }
   }

-
-  .export_bound {
-    margin: $lineheight/4;
-  }
-
-  dl {
-    padding-left: $lineheight/2;
-    dd {
-      margin-left: 0;
-      margin-bottom: 10px;
-    }
-  }

 }
 
 /* Rules for edit pages */
 }
 
 /* Rules for edit pages */


@@ -1091,6 +886,10 @@ tr.turn:hover {
 
 [dir=rtl] .header-illustration {
   transform: scaleX(-1);
 
 [dir=rtl] .header-illustration {
   transform: scaleX(-1);

+
+  h1 {
+    transform: scaleX(-1);
+  }

 }
 
 #content.maximised {
 }
 
 #content.maximised {


@@ -1118,7 +917,7 @@ tr.turn:hover {
 /* Rules for the user map */
 
 .content_map .leaflet-popup-content {
 /* Rules for the user map */
 
 .content_map .leaflet-popup-content {

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

   min-height: 50px;
 }
 
   min-height: 50px;
 }
 


@@ -1128,7 +927,7 @@ tr.turn:hover {
   min-width: 200px;
   p {
     padding: 0 0 5px 0;
   min-width: 200px;
   p {
     padding: 0 0 5px 0;

-    margin-top: 0 0 0 60px;
+    margin: 0 0 0 60px;

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


@@ -1139,60 +938,21 @@ tr.turn:hover {
   width: 100%;
 }
 
   width: 100%;
 }
 

-/* Rules for the diary list page */
-
-.diary_post {
-  position: relative;
-  padding-top: $lineheight;
-  padding-bottom: $lineheight/2;
-  border-top: 1px solid $grey;
-
-  &.deleted {
-    background-color: #fee;
-  }
-}
-

 /* Rules for the diary entry page */
 
 .diary_entries {
   #map {
     height: 400px;
     display: none;
 /* Rules for the diary entry page */
 
 .diary_entries {
   #map {
     height: 400px;
     display: none;

-    margin-bottom: $lineheight;

   }
   .comments {
     max-width: 740px;
   }
   .diary-comment {
     border-top: 1px dashed $grey;
   }
   .comments {
     max-width: 740px;
   }
   .diary-comment {
     border-top: 1px dashed $grey;

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

     &:first-child {
     &:first-child {

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

       border-top: 1px solid $grey;
     }
       border-top: 1px solid $grey;
     }

-    &.deleted {
-      background-color: #fee;
-    }
-    p {
-      margin-bottom: $lineheight/2;
-    }
-    .comment-heading {
-      margin-bottom: 0;
-      margin-top: 0;
-    }
-  }
-}
-
-/* Rules for the log in page */
-
-#login_auth_buttons {
-  margin-bottom: 0;
-
-  li {
-    float: left;
-    padding: $lineheight/4 $lineheight/2;

   }
 }
 
   }
 }
 


@@ -1215,32 +975,6 @@ tr.turn:hover {
   }
 }
 
   }
 }
 

-/* Rules for the account settings page */
-
-#accountForm .user_image {
-  margin-bottom: 0;
-}
-
-#accountForm #user_image {
-  margin-left: 20px;
-}
-
-#accountForm ul.accountImage-options {
-  margin-left: 120px;
-}
-
-.nohome .location {
-  display: none;
-}
-
-#homerow .message {
-  display: none;
-}
-
-.nohome .message {
-  display: inline !important;
-}
-

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


@@ -1250,11 +984,6 @@ tr.turn:hover {
 /* Rules for messages pages */
 
 .messages {
 /* Rules for messages pages */
 
 .messages {

-  button[type="submit"] {
-    margin: auto;
-    white-space: nowrap;
-  }
-

   .inbox-row {
     background: $offwhite;
   }
   .inbox-row {
     background: $offwhite;
   }


@@ -1262,119 +991,22 @@ tr.turn:hover {
   .inbox-row-unread {
     background: #CBEEA7;
   }
   .inbox-row-unread {
     background: #CBEEA7;
   }

-
-  .right {
-    float: right;
-  }
-}
-
-.inbox-row .inbox-mark-read {
-  display: none;
-}
-
-.info-line {
-  margin-bottom: $lineheight;
-  padding: $lineheight/4 0px 4px 0px;
-  border-bottom: 1px solid $grey;
-
-  form, form div {
-    display: inline;
-  }
-}
-
-.info-line .user_thumbnail_tiny {
-  vertical-align: middle;
-}
-
-.inbox-sent {
-  white-space: nowrap;
-}
-
-.inbox-mark-unread,
-.inbox-mark-read,
-.inbox-delete {
-  width: 1%;
-}
-
-.inbox-row-unread .inbox-mark-unread {
-  display: none;
-}
-
-/* Rules for "flash" notice boxes shown at the top of the content area */
-
-.flash {
-  &.error {
-    background-color: #ff7070;
-  }
-
-  &.warning {
-    background-color: #ffe0cc;
-  }
-
-  &.notice {
-    background-color: #CBEEA7;
-  }
-}
-
-/* Rules for highlighting fields with rails validation errors */
-
-.formError {
-  display: inline-block;
-  padding: 5px 10px;
-  margin-top: 5px;
-  border-radius: 4px;
-  font-size: 12px;
-  color: #fff;
-  background-color: #ff7070;
-}
-
-/* Rules for rails validation error boxes */
-
-#errorExplanation {
-  width: 400px;
-  border: 2px solid #ff7070;
-  padding: 0 $lineheight/2;
-  margin-bottom: $lineheight;
-  background-color: #f0f0f0;
-
-  h2 {
-    margin: 0 -10px 10px -10px;
-    padding: $lineheight/4 $lineheight/4 $lineheight/4 15px;
-    font-weight: bold;
-    font-size: 12px;
-    background-color: #c00;
-    color: #fff;
-    text-align: left;
-  }
-
-  p {
-    color: #333;
-    margin-bottom: 0px;
-    padding: $lineheight/4;
-  }

 }
 
 .search_form {
   background-color: $lightgrey;
 
 }
 
 .search_form {
   background-color: $lightgrey;
 

+  #query {
+    z-index: 0;
+  }
+

   .describe_location {
   .describe_location {

-    top: 6px;
-    right: 6px;

     font-size: 10px;
     font-size: 10px;

-    color: $blue;

   }
 }
 
 .directions_form {
   background-color: $lightgrey;
   }
 }
 
 .directions_form {
   background-color: $lightgrey;

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

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


@@ -1396,15 +1028,8 @@ img.user_thumbnail_tiny {
   max-height: 25px;
 }
 
   max-height: 25px;
 }
 

-/* Rules for geo microformats */
-
-abbr.geo {
-  border-bottom: none;
-}
-

 /* General styles for action lists / subnavs */
 
 /* General styles for action lists / subnavs */
 

-

 nav.secondary-actions {
   margin-left: -11px;
   overflow: hidden;
 nav.secondary-actions {
   margin-left: -11px;
   overflow: hidden;


@@ -1419,9 +1044,9 @@ nav.secondary-actions {
       flex-basis: auto;
       list-style: none;
       border-left: 1px solid $grey;
       flex-basis: auto;
       list-style: none;
       border-left: 1px solid $grey;

-      padding-left: $lineheight/2;
-      margin-right: $lineheight/2;
-      margin-bottom: $lineheight/8;
+      padding-left: $lineheight * 0.5;
+      margin-right: $lineheight * 0.5;
+      margin-bottom: $lineheight * 0.125;

     }
   }
 }
     }
   }
 }


@@ -1431,24 +1056,6 @@ div.secondary-actions {
   text-align: center;
 }
 
   text-align: center;
 }
 

-/* Create a single-line dl */
-
-dl.dl-inline {
-  dt, dd {
-    display: inline-block;
-  }
-  dd {
-    margin-right: 1em;
-  }
-}
-
-/* Rules for OpenID logo */
-
-.openid_logo {
-  vertical-align: text-bottom;
-  border: 0;
-}
-

 /* Rules for rich text */
 
 .richtext,
 /* Rules for rich text */
 
 .richtext,


@@ -1484,14 +1091,6 @@ dl.dl-inline {
   }
 }
 
   }
 }
 

-/* Rules for the user notes list */
-
-.note_list {
-  tr.creator {
-    background-color: $offwhite;
-  }
-}
-

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