Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Docs: Dropdown fixes #1793

Merged
merged 3 commits into from
Feb 7, 2023
Merged

Docs: Dropdown fixes #1793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36fdf45
Fixes
louismaximepiton Jan 19, 2023
fa55377
Be closer to Bootstrap
louismaximepiton Jan 19, 2023
15314aa
Merge branch 'main' into main-lmp-dropdown-fixes
julien-deramond Feb 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scss/_button-group.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
// Boosted mod
.btn-group:not(.dropstart) &,
.dropstart & ~ .btn {
&:not(:hover):not(:focus):not(:active) {
&:not(:hover):not(:focus):not(:active):not(.show) {
border-left-color: transparent;

&::before {
Expand Down
5 changes: 3 additions & 2 deletions scss/_nav.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,15 @@
}

.nav-link {
display: flex; // Boosted mod
display: flex; // Boosted mod: instead of `block`
align-items: center; // Boosted mod
padding: var(--#{$prefix}nav-link-padding-y) var(--#{$prefix}nav-link-padding-x);
@include font-size(var(--#{$prefix}nav-link-font-size));
font-weight: var(--#{$prefix}nav-link-font-weight);
color: var(--#{$prefix}nav-link-color);
text-decoration: if($link-decoration == none, null, none);
background: none; // Boosted mod: Prevent dropdown's background to interfere
background: none;
border: 0;
@include transition($nav-link-transition);

// Boosted mod: no focus
Expand Down
2 changes: 1 addition & 1 deletion site/content/docs/5.2/components/dropdowns.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ And putting it to use in a navbar:
<div class="collapse navbar-collapse" id="navbarNavDarkDropdown">
<ul class="navbar-nav">
<li class="nav-item dropdown">
<button class="btn btn-dark dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
<button class="nav-link dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
Dropdown
</button>
<ul class="dropdown-menu dropdown-menu-dark">
Expand Down