From: Chocobozzz <me@florianbigard.com>
Date: Fri, 24 Jun 2022 08:33:26 +0000 (+0200)
Subject: Merge branch 'release/4.2.0' into develop
X-Git-Tag: v4.3.0-rc.1~412
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=4e56f0fff12ab9840574e7a27277fc78b195b3e2;hp=--cc;p=github%2FChocobozzz%2FPeerTube.git

Merge branch 'release/4.2.0' into develop
---

4e56f0fff12ab9840574e7a27277fc78b195b3e2
diff --cc client/src/sass/include/_bootstrap-variables.scss
index 796850174,41a1448c4..7885e067c
--- a/client/src/sass/include/_bootstrap-variables.scss
+++ b/client/src/sass/include/_bootstrap-variables.scss
@@@ -40,11 -40,3 +40,12 @@@ $input-focus-border-color: #ced4da
  
  $nav-pills-link-active-bg: #F0F0F0;
  $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-border-radius: 3px;
 +$dropdown-link-active-color: pvar(--mainForegroundColor);
 +$dropdown-link-active-bg: pvar(--mainBackgroundHoverColor);
 +
 +$accordion-button-active-bg: pvar(--mainColorVeryLight);
 +$accordion-button-active-color: pvar(--mainForegroundColor);