aboutsummaryrefslogtreecommitdiffhomepage
path: root/client
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2022-06-20 10:23:19 +0200
committerChocobozzz <me@florianbigard.com>2022-06-20 10:23:19 +0200
commit714e33a7428b71ef98129ce85a4bd64140bcd912 (patch)
tree59bd3e4b359bcd04f4ad97c404246688ccd84e68 /client
parentaa2ce188d102ab38452df316d06286040b5d9075 (diff)
parentd47b18079bfe4aed472ddcc0a89302ba85f03a48 (diff)
downloadPeerTube-714e33a7428b71ef98129ce85a4bd64140bcd912.tar.gz
PeerTube-714e33a7428b71ef98129ce85a4bd64140bcd912.tar.zst
PeerTube-714e33a7428b71ef98129ce85a4bd64140bcd912.zip
Merge branch 'release/4.2.0' into develop
Diffstat (limited to 'client')
-rw-r--r--client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.scss2
-rw-r--r--client/src/app/shared/shared-video-miniature/videos-selection.component.scss1
-rw-r--r--client/src/standalone/videos/embed.html7
3 files changed, 9 insertions, 1 deletions
diff --git a/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.scss b/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.scss
index b8e6136fb..fd8cd7ffc 100644
--- a/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.scss
+++ b/client/src/app/shared/shared-actor-image-edit/actor-avatar-edit.component.scss
@@ -15,6 +15,8 @@ my-actor-avatar {
15} 15}
16 16
17.actor-info-display-name { 17.actor-info-display-name {
18 @include peertube-word-wrap;
19
18 font-size: 20px; 20 font-size: 20px;
19 font-weight: $font-bold; 21 font-weight: $font-bold;
20 22
diff --git a/client/src/app/shared/shared-video-miniature/videos-selection.component.scss b/client/src/app/shared/shared-video-miniature/videos-selection.component.scss
index 3bb375980..1827f25ef 100644
--- a/client/src/app/shared/shared-video-miniature/videos-selection.component.scss
+++ b/client/src/app/shared/shared-video-miniature/videos-selection.component.scss
@@ -9,6 +9,7 @@
9 9
10.action-selection-mode-child { 10.action-selection-mode-child {
11 position: fixed; 11 position: fixed;
12 display: flex;
12 13
13 .action-button { 14 .action-button {
14 @include margin-left(55px); 15 @include margin-left(55px);
diff --git a/client/src/standalone/videos/embed.html b/client/src/standalone/videos/embed.html
index f30dda96b..eab6f81a6 100644
--- a/client/src/standalone/videos/embed.html
+++ b/client/src/standalone/videos/embed.html
@@ -67,7 +67,12 @@
67 if (placeholderPreview) placeholderPreview.style.display = 'none' 67 if (placeholderPreview) placeholderPreview.style.display = 'none'
68 } 68 }
69 69
70 window.onerror = function () { 70 window.onerror = function (msg) {
71 if (typeof msg === 'string' && msg.toLowerCase().includes(' ice ')) {
72 console.warn(msg)
73 return
74 }
75
71 window.displayIncompatibleBrowser() 76 window.displayIncompatibleBrowser()
72 } 77 }
73 78