diff options
author | Chocobozzz <me@florianbigard.com> | 2022-06-24 10:33:26 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2022-06-24 10:33:26 +0200 |
commit | 4e56f0fff12ab9840574e7a27277fc78b195b3e2 (patch) | |
tree | 90486e58f51d714f46d5635b91000e82be41b785 /client/src | |
parent | 58e7850615e2cf8de64a16929c6f04310f99f330 (diff) | |
parent | c3fb12b31f8367394df4eb5718e4059e167782d8 (diff) | |
download | PeerTube-4e56f0fff12ab9840574e7a27277fc78b195b3e2.tar.gz PeerTube-4e56f0fff12ab9840574e7a27277fc78b195b3e2.tar.zst PeerTube-4e56f0fff12ab9840574e7a27277fc78b195b3e2.zip |
Merge branch 'release/4.2.0' into develop
Diffstat (limited to 'client/src')
-rw-r--r-- | client/src/sass/include/_bootstrap-variables.scss | 1 |
1 files changed, 1 insertions, 0 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; |