forks
/
peertube
1
0
Fork 0
Code Releases Activity

Merge branch 'release/3.2.0' into develop

This commit is contained in:
Chocobozzz 2021-05-26 16:00:21 +02:00
parent 5ec3cbdf22 b45afe12f9
commit 35f676e5d3
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/+accounts/account-video-channels/account-video-channels.component.scss
View File

@ -36,6 +36,8 @@
} }
a { a {
@include peertube-word-wrap;
color: pvar(--mainForegroundColor); color: pvar(--mainForegroundColor);
} }

3
client/src/app/+videos/+video-watch/video-watch.component.scss
View File

@ -146,6 +146,8 @@ $video-info-margin-left: 44px;
} }
.video-info-name { .video-info-name {
@include peertube-word-wrap;
margin-right: 30px; margin-right: 30px;
min-height: 40px; // Align with the action buttons min-height: 40px; // Align with the action buttons
font-size: 27px; font-size: 27px;
@ -173,6 +175,7 @@ $video-info-margin-left: 44px;
a { a {
@include disable-default-a-behaviour; @include disable-default-a-behaviour;
@include peertube-word-wrap;
color: pvar(--mainForegroundColor); color: pvar(--mainForegroundColor);

2
client/src/app/shared/shared-user-subscription/subscribe-button.component.html
View File

@ -40,7 +40,7 @@
</ng-container> </ng-container>
<div <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 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> <button class="btn btn-sm dropdown-toggle-split" ngbDropdownToggle aria-label="Open subscription dropdown" i18n-aria-label>

2
client/src/sass/include/_actor.scss
View File

@ -44,6 +44,8 @@
} }
.actor-display-name { .actor-display-name {
@include peertube-word-wrap;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
} }