diff options
author | Chocobozzz <me@florianbigard.com> | 2019-06-12 17:33:29 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-06-13 09:21:18 +0200 |
commit | db714ab48a6444785f4b63706d56c50d38dac5ac (patch) | |
tree | 35c9d6bc6d09f5f48348b0e112237cd2e07ca51b | |
parent | 00aa1f0d9b9a976a102773cb520f2464ef5c7540 (diff) | |
download | PeerTube-db714ab48a6444785f4b63706d56c50d38dac5ac.tar.gz PeerTube-db714ab48a6444785f4b63706d56c50d38dac5ac.tar.zst PeerTube-db714ab48a6444785f4b63706d56c50d38dac5ac.zip |
Fix notification overflow
-rw-r--r-- | client/src/app/shared/users/user-notifications.component.scss | 1 | ||||
-rw-r--r-- | server/tests/api/check-params/config.ts | 3 | ||||
-rw-r--r-- | server/tests/api/server/config.ts | 5 | ||||
-rw-r--r-- | shared/extra-utils/server/config.ts | 3 |
4 files changed, 9 insertions, 3 deletions
diff --git a/client/src/app/shared/users/user-notifications.component.scss b/client/src/app/shared/users/user-notifications.component.scss index 88f38d9cf..0c6c70d98 100644 --- a/client/src/app/shared/users/user-notifications.component.scss +++ b/client/src/app/shared/users/user-notifications.component.scss | |||
@@ -14,6 +14,7 @@ | |||
14 | font-size: inherit; | 14 | font-size: inherit; |
15 | padding: 15px 5px 15px 10px; | 15 | padding: 15px 5px 15px 10px; |
16 | border-bottom: 1px solid $separator-border-color; | 16 | border-bottom: 1px solid $separator-border-color; |
17 | word-break: break-word; | ||
17 | 18 | ||
18 | &.unread { | 19 | &.unread { |
19 | background-color: rgba(0, 0, 0, 0.05); | 20 | background-color: rgba(0, 0, 0, 0.05); |
diff --git a/server/tests/api/check-params/config.ts b/server/tests/api/check-params/config.ts index 8155e11ab..a0d9392dc 100644 --- a/server/tests/api/check-params/config.ts +++ b/server/tests/api/check-params/config.ts | |||
@@ -66,7 +66,8 @@ describe('Test config API validators', function () { | |||
66 | '360p': true, | 66 | '360p': true, |
67 | '480p': true, | 67 | '480p': true, |
68 | '720p': false, | 68 | '720p': false, |
69 | '1080p': false | 69 | '1080p': false, |
70 | '2160p': false | ||
70 | }, | 71 | }, |
71 | hls: { | 72 | hls: { |
72 | enabled: false | 73 | enabled: false |
diff --git a/server/tests/api/server/config.ts b/server/tests/api/server/config.ts index 8ea21158a..c39516dee 100644 --- a/server/tests/api/server/config.ts +++ b/server/tests/api/server/config.ts | |||
@@ -59,6 +59,7 @@ function checkInitialConfig (server: ServerInfo, data: CustomConfig) { | |||
59 | expect(data.transcoding.resolutions['480p']).to.be.true | 59 | expect(data.transcoding.resolutions['480p']).to.be.true |
60 | expect(data.transcoding.resolutions['720p']).to.be.true | 60 | expect(data.transcoding.resolutions['720p']).to.be.true |
61 | expect(data.transcoding.resolutions['1080p']).to.be.true | 61 | expect(data.transcoding.resolutions['1080p']).to.be.true |
62 | expect(data.transcoding.resolutions['2160p']).to.be.true | ||
62 | expect(data.transcoding.hls.enabled).to.be.true | 63 | expect(data.transcoding.hls.enabled).to.be.true |
63 | 64 | ||
64 | expect(data.import.videos.http.enabled).to.be.true | 65 | expect(data.import.videos.http.enabled).to.be.true |
@@ -109,6 +110,7 @@ function checkUpdatedConfig (data: CustomConfig) { | |||
109 | expect(data.transcoding.resolutions['480p']).to.be.true | 110 | expect(data.transcoding.resolutions['480p']).to.be.true |
110 | expect(data.transcoding.resolutions['720p']).to.be.false | 111 | expect(data.transcoding.resolutions['720p']).to.be.false |
111 | expect(data.transcoding.resolutions['1080p']).to.be.false | 112 | expect(data.transcoding.resolutions['1080p']).to.be.false |
113 | expect(data.transcoding.resolutions['2160p']).to.be.false | ||
112 | expect(data.transcoding.hls.enabled).to.be.false | 114 | expect(data.transcoding.hls.enabled).to.be.false |
113 | 115 | ||
114 | expect(data.import.videos.http.enabled).to.be.false | 116 | expect(data.import.videos.http.enabled).to.be.false |
@@ -227,7 +229,8 @@ describe('Test config', function () { | |||
227 | '360p': true, | 229 | '360p': true, |
228 | '480p': true, | 230 | '480p': true, |
229 | '720p': false, | 231 | '720p': false, |
230 | '1080p': false | 232 | '1080p': false, |
233 | '2160p': false | ||
231 | }, | 234 | }, |
232 | hls: { | 235 | hls: { |
233 | enabled: false | 236 | enabled: false |
diff --git a/shared/extra-utils/server/config.ts b/shared/extra-utils/server/config.ts index a5f5989e0..2b7965bc2 100644 --- a/shared/extra-utils/server/config.ts +++ b/shared/extra-utils/server/config.ts | |||
@@ -98,7 +98,8 @@ function updateCustomSubConfig (url: string, token: string, newConfig: any) { | |||
98 | '360p': true, | 98 | '360p': true, |
99 | '480p': true, | 99 | '480p': true, |
100 | '720p': false, | 100 | '720p': false, |
101 | '1080p': false | 101 | '1080p': false, |
102 | '2160p': false | ||
102 | }, | 103 | }, |
103 | hls: { | 104 | hls: { |
104 | enabled: false | 105 | enabled: false |