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

Add padding to accordion content #1727

Merged
merged 13 commits into from Dec 30, 2022
Merged

Add padding to accordion content #1727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5568b98
Add some padding
MewenLeHo Dec 21, 2022
63f0e47
Merge branch 'main' into main-mlh-fix-padding-accordion-content
MewenLeHo Dec 21, 2022
fbc425f
New version
MewenLeHo Dec 21, 2022
7b8442b
Fix typo
MewenLeHo Dec 21, 2022
733c8c9
Merge branch 'main' into main-mlh-fix-padding-accordion-content
MewenLeHo Dec 22, 2022
b0be78c
Updates variables for padding
MewenLeHo Dec 22, 2022
f27c366
Refactoring and migration guide update
MewenLeHo Dec 23, 2022
0b1030d
Fix typo
MewenLeHo Dec 23, 2022
ae8fef6
Merge branch 'main' into main-mlh-fix-padding-accordion-content
louismaximepiton Dec 29, 2022
3722459
.
louismaximepiton Dec 29, 2022
d565bb2
Merge branch 'main' into main-mlh-fix-padding-accordion-content
julien-deramond Dec 30, 2022
dd935cc
Fix migration guide
julien-deramond Dec 30, 2022
7d40650
Reorder vars in migration guide
julien-deramond Dec 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions scss/_accordion.scss
View file
Open in desktop
Expand Up @@ -26,8 +26,10 @@
// Boosted mod: no --#{$prefix}accordion-btn-active-icon
// Boosted mod: no --#{$prefix}accordion-btn-focus-border-color
// Boosted mod: no --#{$prefix}accordion-btn-focus-box-shadow
--#{$prefix}accordion-body-padding-x: #{$accordion-body-padding-x};
--#{$prefix}accordion-body-padding-y: #{$accordion-body-padding-y};
--#{$prefix}accordion-body-padding-top: #{$accordion-body-padding-top}; // Boosted mod
--#{$prefix}accordion-body-padding-end: #{$accordion-body-padding-end}; // Boosted mod
--#{$prefix}accordion-body-padding-bottom: #{$accordion-body-padding-bottom}; // Boosted mod
--#{$prefix}accordion-body-padding-start: #{$accordion-body-padding-start}; // Boosted mod
--#{$prefix}accordion-active-color: #{$accordion-button-active-color};
--#{$prefix}accordion-active-bg: #{$accordion-button-active-bg};
// scss-docs-end accordion-css-vars
Expand Down Expand Up @@ -123,7 +125,7 @@
}

.accordion-body {
padding: 0 var(--#{$prefix}accordion-body-padding-x) var(--#{$prefix}accordion-body-padding-y) 0; // Boosted mod
padding: var(--#{$prefix}accordion-body-padding-top) var(--#{$prefix}accordion-body-padding-end) var(--#{$prefix}accordion-body-padding-bottom) var(--#{$prefix}accordion-body-padding-start); // Boosted mod
}

// Boosted mod: no Flush accordion items
Expand Down
10 changes: 8 additions & 2 deletions scss/_variables.scss
View file
Open in desktop
Expand Up @@ -1563,8 +1563,14 @@ $accordion-border-color: $gray-500 !default; // Boosted mod
$accordion-border-radius: $border-radius !default;
$accordion-inner-border-radius: subtract($accordion-border-radius, #{$accordion-border-width}) !default;

$accordion-body-padding-y: $spacer !default; // Boosted mod
$accordion-body-padding-x: $spacer !default; // Boosted mod
louismaximepiton marked this conversation as resolved.
Show resolved Hide resolved
$accordion-body-padding-top: 5px !default; // Boosted mod
julien-deramond marked this conversation as resolved.
Show resolved Hide resolved
$accordion-body-padding-end: $spacer !default; // Boosted mod
louismaximepiton marked this conversation as resolved.
Show resolved Hide resolved
$accordion-body-padding-bottom: $spacer !default; // Boosted mod
$accordion-body-padding-start: 0 !default; // Boosted mod
// fusv-disable
$accordion-body-padding-y: $spacer !default; // Deprecated in Boosted 5.2.3 to divide it in -padding<top | end | bottom |start>
$accordion-body-padding-x: $spacer !default; // Deprecated in Boosted 5.2.3 to divide it in -padding<top | end | bottom |start>
// fusv-enable

$accordion-button-padding-y: $accordion-padding-y !default;
$accordion-button-padding-x: $accordion-padding-x !default;
Expand Down
12 changes: 12 additions & 0 deletions site/content/docs/5.2/migration.md
View file
Open in desktop
Expand Up @@ -135,6 +135,8 @@ If you need more details about the changes, please refer to the [v5.2.3 release]
- <details class="mb-2">
<summary><span class="badge bg-danger">Breaking</span> Deprecated CSS variables:</summary>
<ul>
<li><code>--bs-accordion-body-padding-x</code></li>
<li><code>--bs-accordion-body-padding-y</code></li>
<li><code>--bs-dropdown-toggle-bg</code></li>
<li><code>--bs-dropdown-toggle-border-color</code></li>
<li><code>--bs-dropdown-toggle-color</code></li>
Expand All @@ -147,6 +149,10 @@ If you need more details about the changes, please refer to the [v5.2.3 release]
- <details class="mb-2">
<summary><span class="badge bg-success">New</span> CSS variables:</summary>
<ul>
<li><code>--bs-accordion-body-padding-bottom</code></li>
<li><code>--bs-accordion-body-padding-end</code></li>
<li><code>--bs-accordion-body-padding-start</code></li>
<li><code>--bs-accordion-body-padding-top</code></li>
<li><code>--bs-dropdown-line-height</code></li>
<li><code>--bs-focus-visible-inner-color</code></li>
<li><code>--bs-focus-visible-outer-color</code></li>
Expand All @@ -161,6 +167,8 @@ If you need more details about the changes, please refer to the [v5.2.3 release]
- <details class="mb-2">
<summary><span class="badge bg-danger">Breaking</span> Deprecated Sass variables:</summary>
<ul>
<li><code>$accordion-body-padding-x</code></li>
<li><code>$accordion-body-padding-y</code></li>
<li><code>$btn-close-focus-shadow</code></li>
<li><code>$form-range-thumb-active-border</code></li>
<li><code>$form-star-focus-box-shadow</code></li>
Expand All @@ -176,6 +184,10 @@ If you need more details about the changes, please refer to the [v5.2.3 release]
- <details class="mb-2">
<summary><span class="badge bg-success">New</span> Sass variables:</summary>
<ul>
<li><code>$accordion-body-padding-bottom</code></li>
<li><code>$accordion-body-padding-end</code></li>
<li><code>$accordion-body-padding-start</code></li>
<li><code>$accordion-body-padding-top</code></li>
<li><code>$focus-visible-inner-color</code></li>
<li><code>$focus-visible-inner-color-dark</code></li>
<li><code>$focus-visible-inner-width</code></li>
Expand Down