From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 16 Aug 2023 12:24:11 +0000 (+0100)
Subject: Merge pull request #4156 from AntonKhorev/bootstrap-code-direction-fix
X-Git-Tag: live~1186
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/28b00b85da663c161803897f6a54550597ed82c1?ds=sidebyside;hp=-c

Merge pull request #4156 from AntonKhorev/bootstrap-code-direction-fix

Don't do direction override from Bootstrap reboot of <code>
---

28b00b85da663c161803897f6a54550597ed82c1
diff --combined app/assets/stylesheets/common.scss
index 5f89453c6,2f6aebf44..ee11340d9
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@@ -460,11 -460,6 +460,11 @@@ body.small-nav 
        display: block;
        width: $sidebarWidth;
      }
 +
 +    button.btn-close {
 +      background-color: rgba(255, 255, 255, 0.5);
 +      opacity: 1.0;
 +    }
    }
  
    #map {
@@@ -1052,24 -1047,49 +1052,24 @@@ tr.turn:hover 
    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;
 -    margin-bottom: $lineheight;
    }
    .comments {
      max-width: 740px;
    }
    .diary-comment {
      border-top: 1px dashed $grey;
 -    padding-top: $lineheight/2;
 -    padding-bottom: $lineheight/2;
      &:first-child {
 -      margin-top: $lineheight/2;
 -      padding-top: $lineheight;
        border-top: 1px solid $grey;
      }
 -    &.deleted {
 -      background-color: #fee;
 -    }
      p {
        margin-bottom: $lineheight/2;
      }
 -    .comment-heading {
 -      margin-bottom: 0;
 -      margin-top: 0;
 -    }
    }
  }
  
@@@ -1112,6 -1132,11 +1112,6 @@@
  /* Rules for messages pages */
  
  .messages {
 -  button[type="submit"] {
 -    margin: auto;
 -    white-space: nowrap;
 -  }
 -
    .inbox-row {
      background: $offwhite;
    }
@@@ -1121,6 -1146,24 +1121,6 @@@
    }
  }
  
 -.inbox-row .inbox-mark-read {
 -  display: none;
 -}
 -
 -.inbox-sent {
 -  white-space: nowrap;
 -}
 -
 -.inbox-mark-unread,
 -.inbox-mark-read,
 -.inbox-delete {
 -  width: 1%;
 -}
 -
 -.inbox-row-unread .inbox-mark-unread {
 -  display: none;
 -}
 -
  .search_form {
    background-color: $lightgrey;
  
@@@ -1190,6 -1233,8 +1190,8 @@@ div.secondary-actions 
    code {
      background: $lightgrey;
      padding: 2px 3px;
+     direction: inherit; /* fix for Bootstrap < 5.2 */
+     unicode-bidi: unset; /* fix for Bootstrap < 5.2 */
    }
  
    pre {