aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-05-26 16:00:21 +0200
committerChocobozzz <me@florianbigard.com>2021-05-26 16:00:21 +0200
commit35f676e5d3e5e242e84ed63da2cc78117079c7cb (patch)
tree490172885661bec8e23f6f82f83834373ce8c3a5 /client/src
parent5ec3cbdf22fc88ebe57f370fc0bc0e3df7453458 (diff)
parentb45afe12f90c654aef8098e55bedfa81ca73b1f4 (diff)
downloadPeerTube-35f676e5d3e5e242e84ed63da2cc78117079c7cb.tar.gz
PeerTube-35f676e5d3e5e242e84ed63da2cc78117079c7cb.tar.zst
PeerTube-35f676e5d3e5e242e84ed63da2cc78117079c7cb.zip
Merge branch 'release/3.2.0' into develop
Diffstat (limited to 'client/src')
-rw-r--r--client/src/app/+accounts/account-video-channels/account-video-channels.component.scss2
-rw-r--r--client/src/app/+videos/+video-watch/video-watch.component.scss3
-rw-r--r--client/src/app/shared/shared-user-subscription/subscribe-button.component.html2
-rw-r--r--client/src/sass/include/_actor.scss2
4 files changed, 8 insertions, 1 deletions
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 f9d097644..2dfb057e7 100644
--- 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 @@
36 } 36 }
37 37
38 a { 38 a {
39 @include peertube-word-wrap;
40
39 color: pvar(--mainForegroundColor); 41 color: pvar(--mainForegroundColor);
40 } 42 }
41 43
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 301762695..6124090c9 100644
--- 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;
146 } 146 }
147 147
148 .video-info-name { 148 .video-info-name {
149 @include peertube-word-wrap;
150
149 margin-right: 30px; 151 margin-right: 30px;
150 min-height: 40px; // Align with the action buttons 152 min-height: 40px; // Align with the action buttons
151 font-size: 27px; 153 font-size: 27px;
@@ -173,6 +175,7 @@ $video-info-margin-left: 44px;
173 175
174 a { 176 a {
175 @include disable-default-a-behaviour; 177 @include disable-default-a-behaviour;
178 @include peertube-word-wrap;
176 179
177 color: pvar(--mainForegroundColor); 180 color: pvar(--mainForegroundColor);
178 181
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 75cfc918b..d8699ff69 100644
--- 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 @@
40 </ng-container> 40 </ng-container>
41 41
42 <div 42 <div
43 class="btn-group" ngbDropdown autoClose="outside" placement="bottom-right" 43 class="btn-group" ngbDropdown autoClose="outside" placement="bottom-right bottom-left"
44 role="group" aria-label="Multiple ways to subscribe to the current channel" i18n-aria-label 44 role="group" aria-label="Multiple ways to subscribe to the current channel" i18n-aria-label
45 > 45 >
46 <button class="btn btn-sm dropdown-toggle-split" ngbDropdownToggle aria-label="Open subscription dropdown" i18n-aria-label> 46 <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 38bd90ae6..372e7bd24 100644
--- a/client/src/sass/include/_actor.scss
+++ b/client/src/sass/include/_actor.scss
@@ -44,6 +44,8 @@
44 } 44 }
45 45
46 .actor-display-name { 46 .actor-display-name {
47 @include peertube-word-wrap;
48
47 display: flex; 49 display: flex;
48 flex-wrap: wrap; 50 flex-wrap: wrap;
49 } 51 }