mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-26 23:54:23 +01:00
Merge branch 'main' into fix-modal-color
This commit is contained in:
commit
494d94a0c7
@ -135,7 +135,12 @@
|
|||||||
@include border-bottom-radius(0);
|
@include border-bottom-radius(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
> .btn ~ .btn,
|
// The top radius should be 0 if the button is:
|
||||||
|
// - the "third or more" child
|
||||||
|
// - the second child and the previous element isn't `.btn-check` (making it the first child visually)
|
||||||
|
// - part of a btn-group which isn't the first child
|
||||||
|
> .btn:nth-child(n + 3),
|
||||||
|
> :not(.btn-check) + .btn,
|
||||||
> .btn-group:not(:first-child) > .btn {
|
> .btn-group:not(:first-child) > .btn {
|
||||||
@include border-top-radius(0);
|
@include border-top-radius(0);
|
||||||
}
|
}
|
||||||
|
@ -195,8 +195,6 @@ Make a set of buttons appear vertically stacked rather than horizontally. **Spli
|
|||||||
|
|
||||||
{{< example >}}
|
{{< example >}}
|
||||||
<div class="btn-group-vertical" role="group" aria-label="Vertical button group">
|
<div class="btn-group-vertical" role="group" aria-label="Vertical button group">
|
||||||
<button type="button" class="btn btn-primary">Button</button>
|
|
||||||
<button type="button" class="btn btn-primary">Button</button>
|
|
||||||
<div class="btn-group" role="group">
|
<div class="btn-group" role="group">
|
||||||
<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
|
<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
|
||||||
Dropdown
|
Dropdown
|
||||||
@ -206,6 +204,8 @@ Make a set of buttons appear vertically stacked rather than horizontally. **Spli
|
|||||||
<li><a class="dropdown-item" href="#">Dropdown link</a></li>
|
<li><a class="dropdown-item" href="#">Dropdown link</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
<button type="button" class="btn btn-primary">Button</button>
|
||||||
|
<button type="button" class="btn btn-primary">Button</button>
|
||||||
<div class="btn-group dropstart" role="group">
|
<div class="btn-group dropstart" role="group">
|
||||||
<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
|
<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
|
||||||
Dropdown
|
Dropdown
|
||||||
|
@ -428,7 +428,7 @@ Navbar themes are easier than ever thanks to Bootstrap's combination of Sass and
|
|||||||
<!-- Navbar content -->
|
<!-- Navbar content -->
|
||||||
</nav>
|
</nav>
|
||||||
|
|
||||||
<nav class="navbar" style="background-color: #e3f2fd;">
|
<nav class="navbar" style="background-color: #e3f2fd;" data-bs-theme="light">
|
||||||
<!-- Navbar content -->
|
<!-- Navbar content -->
|
||||||
</nav>
|
</nav>
|
||||||
```
|
```
|
||||||
|
@ -18,7 +18,7 @@ more:
|
|||||||
- name: Dripicons
|
- name: Dripicons
|
||||||
website: http://demo.amitjakhu.com/dripicons/
|
website: http://demo.amitjakhu.com/dripicons/
|
||||||
- name: Ikons
|
- name: Ikons
|
||||||
website: http://ikons.piotrkwiatkowski.co.uk/
|
website: https://ikons.piotrkwiatkowski.co.uk/
|
||||||
- name: Icons8
|
- name: Icons8
|
||||||
website: https://icons8.com/
|
website: https://icons8.com/
|
||||||
- name: icofont
|
- name: icofont
|
||||||
|
Loading…
x
Reference in New Issue
Block a user