OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'release/4.2.0' into develop

pull/5098/head
Chocobozzz 2022-06-24 10:33:26 +02:00
parent 58e7850615 c3fb12b31f
commit 4e56f0fff1
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/sass/include/_bootstrap-variables.scss
View File

@ -40,6 +40,7 @@ $input-focus-border-color: #ced4da;
$nav-pills-link-active-bg: #F0F0F0; $nav-pills-link-active-bg: #F0F0F0;
$nav-pills-link-active-color: #000; $nav-pills-link-active-color: #000;
$nav-link-transition: none;
$dropdown-box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -2px rgba(0, 0, 0, 0.2); $dropdown-box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -2px rgba(0, 0, 0, 0.2);
$dropdown-border-radius: 3px; $dropdown-border-radius: 3px;

2
server/tests/api/live/live-fast-restream.ts
View File

@ -102,7 +102,7 @@ describe('Fast restream in live', function () {
before(async function () { before(async function () {
this.timeout(120000) this.timeout(120000)
const env = { 'PEERTUBE_TEST_CONSTANTS_VIDEO_LIVE_CLEANUP_DELAY': '10000' } const env = { PEERTUBE_TEST_CONSTANTS_VIDEO_LIVE_CLEANUP_DELAY: '10000' }
server = await createSingleServer(1, {}, { env }) server = await createSingleServer(1, {}, { env })
// Get the access tokens // Get the access tokens