aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--client/src/sass/include/_bootstrap-variables.scss1
-rw-r--r--server/tests/api/live/live-fast-restream.ts2
2 files changed, 2 insertions, 1 deletions
diff --git a/client/src/sass/include/_bootstrap-variables.scss b/client/src/sass/include/_bootstrap-variables.scss
index 796850174..7885e067c 100644
--- a/client/src/sass/include/_bootstrap-variables.scss
+++ b/client/src/sass/include/_bootstrap-variables.scss
@@ -40,6 +40,7 @@ $input-focus-border-color: #ced4da;
40 40
41$nav-pills-link-active-bg: #F0F0F0; 41$nav-pills-link-active-bg: #F0F0F0;
42$nav-pills-link-active-color: #000; 42$nav-pills-link-active-color: #000;
43$nav-link-transition: none;
43 44
44$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); 45$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);
45$dropdown-border-radius: 3px; 46$dropdown-border-radius: 3px;
diff --git a/server/tests/api/live/live-fast-restream.ts b/server/tests/api/live/live-fast-restream.ts
index b524cbe7f..fb4ae147c 100644
--- a/server/tests/api/live/live-fast-restream.ts
+++ b/server/tests/api/live/live-fast-restream.ts
@@ -102,7 +102,7 @@ describe('Fast restream in live', function () {
102 before(async function () { 102 before(async function () {
103 this.timeout(120000) 103 this.timeout(120000)
104 104
105 const env = { 'PEERTUBE_TEST_CONSTANTS_VIDEO_LIVE_CLEANUP_DELAY': '10000' } 105 const env = { PEERTUBE_TEST_CONSTANTS_VIDEO_LIVE_CLEANUP_DELAY: '10000' }
106 server = await createSingleServer(1, {}, { env }) 106 server = await createSingleServer(1, {}, { env })
107 107
108 // Get the access tokens 108 // Get the access tokens