Merge branch 'release/3.2.0' into develop

diff --git a/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss b/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss
index f9d09764462354ec5bdcf734f8fe766083b2b62b..2dfb057e74a5140ba02ba18fbbaf434bd8e6ccaa 100644 (file)
--- a/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss
+++ b/client/src/app/+accounts/account-video-channels/account-video-channels.component.scss
@@ -36,6 +36,8 @@
   }
 
   a {
+    @include peertube-word-wrap;
+
     color: pvar(--mainForegroundColor);
   }
 

diff --git a/client/src/app/+videos/+video-watch/video-watch.component.scss b/client/src/app/+videos/+video-watch/video-watch.component.scss
index 30176269553b884a37c385dd8837bda186be9b21..6124090c9de9994681a913f4884c650e99e0da63 100644 (file)
--- a/client/src/app/+videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/+videos/+video-watch/video-watch.component.scss
@@ -146,6 +146,8 @@ $video-info-margin-left: 44px;
       }
 
       .video-info-name {
+        @include peertube-word-wrap;
+
         margin-right: 30px;
         min-height: 40px; // Align with the action buttons
         font-size: 27px;
@@ -173,6 +175,7 @@ $video-info-margin-left: 44px;
 
         a {
           @include disable-default-a-behaviour;
+          @include peertube-word-wrap;
 
           color: pvar(--mainForegroundColor);
 

diff --git a/client/src/app/shared/shared-user-subscription/subscribe-button.component.html b/client/src/app/shared/shared-user-subscription/subscribe-button.component.html
index 75cfc918b5c0c4d46ca7af2b0dae7b6186b05c65..d8699ff6905b1b2fde09db2f71b6768ca00ecad9 100644 (file)
--- a/client/src/app/shared/shared-user-subscription/subscribe-button.component.html
+++ b/client/src/app/shared/shared-user-subscription/subscribe-button.component.html
@@ -40,7 +40,7 @@
   </ng-container>
 
   <div
-    class="btn-group" ngbDropdown autoClose="outside" placement="bottom-right"
+    class="btn-group" ngbDropdown autoClose="outside" placement="bottom-right bottom-left"
     role="group" aria-label="Multiple ways to subscribe to the current channel" i18n-aria-label
   >
     <button class="btn btn-sm dropdown-toggle-split" ngbDropdownToggle aria-label="Open subscription dropdown" i18n-aria-label>

diff --git a/client/src/sass/include/_actor.scss b/client/src/sass/include/_actor.scss
index 38bd90ae6dec5622b5dcd1374d150b0f14f9234d..372e7bd241c6f39a031f92971b38a1f54f3dbc7b 100644 (file)
--- a/client/src/sass/include/_actor.scss
+++ b/client/src/sass/include/_actor.scss
@@ -44,6 +44,8 @@
   }
 
   .actor-display-name {
+    @include peertube-word-wrap;
+
     display: flex;
     flex-wrap: wrap;
   }