Merge tag 'v1.6.0rc3' into sync/upstream

diff --cc app/javascript/mastodon/components/video_player.js
Simple merge

diff --cc app/javascript/mastodon/features/notifications/index.js
Simple merge

diff --cc app/javascript/styles/components.scss
index 2f2d6e1f03e087e0a20929ca10bc47af8a28c63d,7fd16f6b3d79a215cd24ead5e4471b90cc083db2..5573552601a85a3b8ad6c81dd03bd6e5e9a9e1d7
--- 1/app/javascript/styles/components.scss
--- 2/app/javascript/styles/components.scss
+++ b/app/javascript/styles/components.scss
@@@ -2697,21 -2345,24 +2701,37 @@@ button.icon-button.active i.fa-retweet 
    border: 0;
    width: 100%;
    height: 100%;
 +  justify-content: center;
 +  position: relative;
 +  text-align: center;
 +  z-index: 100;
 +
 +  .status__content > & {
 +    margin-top: 15px; // Add margin when used bare for NSFW video player
 +  }
 +
 +  &.full-width {
 +    margin-left: -68px;
 +    width: calc(100% + 80px);
 +  }
  }
  
+ .media-spoiler__video {
+   align-items: center;
+   background: $base-overlay-background;
+   color: $primary-text-color;
+   cursor: pointer;
+   display: flex;
+   flex-direction: column;
+   border: 0;
+   width: 100%;
+   height: 100%;
+   justify-content: center;
+   position: relative;
+   text-align: center;
+   z-index: 100;
+ }
+ 
  .media-spoiler__warning {
    display: block;
    font-size: 14px;
@@@ -4445,79 -3984,12 +4465,48 @@@ noscript 
        }
      }
    }
 +
 +  // fixes for the navbar-under mode
 +  .is-composing.navbar-under {
 +    .search {
 +      margin-top: -20px;
 +      margin-bottom: -20px;
 +      .search__icon {
 +        display: none;
 +      }
 +    }
 +  }
 +}
 +
 +// more fixes for the navbar-under mode
 +@mixin fix-margins-for-navbar-under {
 +  .tabs-bar {
 +    margin-top: 0 !important;
 +    margin-bottom: -6px !important;
 +  }
 +}
 +
 +.single-column.navbar-under {
 +  @include fix-margins-for-navbar-under;
 +}
 +
 +.auto-columns.navbar-under {
 +  @media screen and (max-width: 360px) {
 +    @include fix-margins-for-navbar-under;
 +  }
 +}
 +
 +.auto-columns.navbar-under .react-swipeable-view-container .columns-area,
 +.single-column.navbar-under .react-swipeable-view-container .columns-area {
 +  @media screen and (max-width: 360px) {
 +    height: 100% !important;
 +  }
  }
  
- .embed-modal__html {
-   color: $ui-secondary-color;
-   outline: 0;
-   box-sizing: border-box;
-   display: block;
-   width: 100%;
-   border: none;
-   padding: 10px;
-   font-family: 'mastodon-font-monospace', monospace;
-   background: $ui-base-color;
-   color: $ui-primary-color;
-   font-size: 14px;
-   margin: 0;
-   margin-bottom: 15px;
- 
-   &::-moz-focus-inner {
-     border: 0;
-   }
- 
-   &::-moz-focus-inner,
-   &:focus,
-   &:active {
-     outline: 0 !important;
-   }
- 
-   &:focus {
-     background: lighten($ui-base-color, 4%);
-   }
- 
-   @media screen and (max-width: 600px) {
-     font-size: 16px;
-   }
- }
- 
  .embed-modal {
+   max-width: 80vw;
+   max-height: 80vh;
+ 
    h4 {
      padding: 30px;
      font-weight: 500;

diff --cc app/javascript/styles/stream_entries.scss
Simple merge

diff --cc app/views/layouts/application.html.haml
Simple merge

diff --cc app/views/stream_entries/_detailed_status.html.haml
Simple merge

diff --cc config/application.rb
Simple merge