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

Fix custom popover padding #2031

Merged
merged 19 commits into from
Jun 27, 2023
Merged

Fix custom popover padding #2031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
4d00af2
Fix customer popover padding
MewenLeHo May 11, 2023
c168fb4
Merge branch 'main' into main-mlh-fix-popover-padding
MewenLeHo May 11, 2023
3f8a5c1
Fix Boosted mod and migration guide
MewenLeHo May 12, 2023
283387b
Merge branch 'main' into main-mlh-fix-popover-padding
MewenLeHo May 22, 2023
d0987c7
Merge branch 'main' into main-mlh-fix-popover-padding
MewenLeHo May 24, 2023
7b6dd88
Fix
MewenLeHo May 24, 2023
41eeac3
Merge branch 'main' into main-mlh-fix-popover-padding
MewenLeHo May 30, 2023
633953b
Fix custom popover padding y
MewenLeHo May 31, 2023
cf37532
Merge branch 'main' into main-mlh-fix-popover-padding
MewenLeHo Jun 6, 2023
0610a02
Allow header padding customisation
MewenLeHo Jun 6, 2023
84e7a74
Merge branch 'main' into main-mlh-fix-popover-padding
julien-deramond Jun 8, 2023
20d8521
Merge branch 'main' into main-mlh-fix-popover-padding
julien-deramond Jun 9, 2023
c8ad8a7
Fix migration guide
MewenLeHo Jun 12, 2023
de2e4e9
Merge branch 'main' into main-mlh-fix-popover-padding
MewenLeHo Jun 19, 2023
c76dea3
Add custom prototype
MewenLeHo Jun 19, 2023
c0dd388
Fix some use cases and reintroduce temporarily use cases tests in the…
julien-deramond Jun 21, 2023
37db65a
Merge branch 'main' into main-mlh-fix-popover-padding
julien-deramond Jun 26, 2023
b30a335
Finalize custom popover
julien-deramond Jun 26, 2023
acd5cfa
Fix after review
julien-deramond Jun 27, 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
26 changes: 14 additions & 12 deletions scss/_popover.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,25 @@
--#{$prefix}popover-max-width: #{$popover-max-width};
@include rfs($popover-font-size, --#{$prefix}popover-font-size);
--#{$prefix}popover-line-height: #{$popover-line-height}; // Boosted mod
--#{$prefix}popover-font-weight: #{$popover-font-weight}; // Boosted mod: extra CSS variable
--#{$prefix}popover-font-weight: #{$popover-font-weight}; // Boosted mod
--#{$prefix}popover-bg: #{$popover-bg};
--#{$prefix}popover-border-width: #{$popover-border-width};
--#{$prefix}popover-border-color: #{$popover-border-color};
--#{$prefix}popover-border-radius: #{$popover-border-radius};
--#{$prefix}popover-inner-border-radius: #{$popover-inner-border-radius};
--#{$prefix}popover-box-shadow: #{$popover-box-shadow};
--#{$prefix}popover-header-padding-x: #{$popover-header-padding-x}; // Boosted mod: deprecated in v5.3.0
--#{$prefix}popover-header-padding-y: #{$popover-header-padding-y}; // Boosted mod: deprecated in v5.3.0
--#{$prefix}popover-header-padding-x: #{$popover-header-padding-x};
--#{$prefix}popover-header-padding-y: #{$popover-header-padding-y};
--#{$prefix}popover-header-padding-top: #{$popover-header-padding-top}; // Boosted mod
--#{$prefix}popover-header-padding-bottom: #{$popover-header-padding-bottom}; // Boosted mod
@include rfs($popover-header-font-size, --#{$prefix}popover-header-font-size);
--#{$prefix}popover-header-line-height: #{$popover-header-line-height}; // Boosted mod
--#{$prefix}popover-header-color: #{$popover-header-color};
--#{$prefix}popover-header-bg: #{$popover-header-bg};
--#{$prefix}popover-body-padding-x: #{$popover-body-padding-x};
--#{$prefix}popover-body-padding-y: #{$popover-body-padding-y};
--#{$prefix}popover-body-padding-top: #{$popover-body-padding-top}; // Boosted mod
--#{$prefix}popover-body-padding-bottom: #{$popover-body-padding-bottom}; // Boosted mod
louismaximepiton marked this conversation as resolved.
Show resolved Hide resolved
--#{$prefix}popover-body-color: #{$popover-body-color};
--#{$prefix}popover-arrow-width: #{$popover-arrow-width};
--#{$prefix}popover-arrow-height: #{$popover-arrow-height};
Expand All @@ -29,7 +32,6 @@
z-index: var(--#{$prefix}popover-zindex);
display: block;
max-width: var(--#{$prefix}popover-max-width);
padding: var(--#{$prefix}popover-body-padding-y) var(--#{$prefix}popover-body-padding-x); // Boosted mod
// Our parent element can be arbitrary since tooltips are by default inserted as a sibling of their target element.
// So reset our font and text properties to avoid inheriting weird values.
@include reset-text();
Expand Down Expand Up @@ -187,7 +189,7 @@

// Offset the popover to account for the popover arrow
.popover-header {
// Boosted mod: no `padding`
padding: var(--#{$prefix}popover-header-padding-y, var(--#{$prefix}popover-header-padding-top)) var(--#{$prefix}popover-header-padding-x) var(--#{$prefix}popover-header-padding-y, var(--#{$prefix}popover-header-padding-bottom)); // Boosted mod: instead of `var(--#{$prefix}popover-header-padding-y) var(--#{$prefix}popover-header-padding-x)`
margin-bottom: 0; // Reset the default from Reboot
font-weight: var(--#{$prefix}popover-font-weight); // Boosted mod
line-height: var(--#{$prefix}popover-header-line-height); // Boosted mod
Expand All @@ -203,15 +205,15 @@
&:empty {
display: none;
}

// Boosted mod: popover body special padding when following a popover header
+ .popover-body {
padding-top: var(--#{$prefix}popover-header-padding-bottom);
}
// End mod
}

.popover-body {
// Boosted mod: no `padding`
padding: var(--#{$prefix}popover-body-padding-y, var(--#{$prefix}popover-body-padding-top)) var(--#{$prefix}popover-body-padding-x) var(--#{$prefix}popover-body-padding-y, var(--#{$prefix}popover-body-padding-bottom)); // Boosted mod: instead of padding: `var(--#{$prefix}popover-body-padding-y) var(--#{$prefix}popover-body-padding-x);`
color: var(--#{$prefix}popover-body-color);
}

// Boosted mod
:not(.popover-header) + .popover-body {
julien-deramond marked this conversation as resolved.
Show resolved Hide resolved
--#{$prefix}popover-body-padding-y: #{$popover-padding-y}; // Reset value to the defaut y padding popover one when there's only a body
}
// End mod
16 changes: 9 additions & 7 deletions scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1779,6 +1779,7 @@ $popover-line-height: 1.5 !default; // Boosted mod
$popover-font-weight: $font-weight-bold !default; // Boosted mod
$popover-bg: var(--#{$prefix}body-bg) !default;
$popover-max-width: $spacer * 19 !default; // Boosted mod: instead of `276px`
$popover-padding-y: $spacer !default; // Boosted mod
$popover-border-width: var(--#{$prefix}border-width) !default;
$popover-border-color: var(--#{$prefix}border-color-translucent) !default;
$popover-border-radius: var(--#{$prefix}border-radius-lg) !default;
Expand All @@ -1789,24 +1790,25 @@ $popover-header-font-size: $font-size-lg !default; // Boosted mod: inst
$popover-header-line-height: 1.11 !default; // Boosted mod
$popover-header-bg: $popover-bg !default; // Boosted mod: instead of `var(--#{$prefix}secondary-bg)`
$popover-header-color: $headings-color !default;
$popover-header-padding-top: $popover-padding-y !default; // Boosted mod
$popover-header-padding-bottom: map-get($spacers, 2) !default; // Boosted mod
// fusv-disable
$popover-header-padding-y: $spacer * .5 !default; // Boosted mod: deprecated in v5.3.0 replaced by `$popover-header-padding-top` and `$popover-header-padding-bottom`
// fusv-enable
$popover-header-padding-y: initial !default; // Boosted mod: instead of `.5rem`
$popover-header-padding-x: $spacer * .9 !default; // Boosted mod: instead of `$spacer`

$popover-body-color: var(--#{$prefix}body-color) !default;
$popover-body-padding-y: $spacer !default;
$popover-body-padding-x: $popover-header-padding-x !default;
$popover-body-padding-top: 0 !default; // Boosted mod
$popover-body-padding-bottom: $popover-padding-y !default; // Boosted mod
$popover-body-padding-y: initial !default; // Boosted mod: instead of `$spacer`
$popover-body-padding-x: $popover-header-padding-x !default; // Boosted mod: instead of `$spacer`

$popover-arrow-width: $spacer !default; // Boosted mod: instead of `1rem`
$popover-arrow-height: $popover-arrow-width * .5 !default;
$popover-arrow-height: $popover-arrow-width * .5 !default; // Boosted mod: instead of `.5rem`
// scss-docs-end popover-variables

// fusv-disable
// Deprecated in Bootstrap 5.2.0 for CSS variables
$popover-arrow-color: $popover-bg !default;
$popover-arrow-outer-color: $popover-border-color !default; // Boosted mod
$popover-arrow-outer-color: $popover-border-color !default; // Boosted mod: instead of `var(--#{$prefix}border-color-translucent)`
// fusv-enable

// Toasts
Expand Down
3 changes: 2 additions & 1 deletion site/assets/scss/_component-examples.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,9 @@
.custom-popover {
--bs-popover-max-width: 12.5rem;
--bs-popover-border-color: var(--bs-primary);
--bs-popover-header-padding-y: .5rem; // Boosted mod
--bs-popover-header-bg: var(--bs-primary);
--bs-popover-header-color: var(--bs-black); // Boosted mod: text-dark on primary
--bs-popover-header-color: var(--bs-black); // Boosted mod: instead of `var(--bs-white)`
--bs-popover-body-padding-x: 1rem;
--bs-popover-body-padding-y: .5rem;
}
Expand Down
2 changes: 2 additions & 0 deletions site/content/docs/5.3/components/popovers.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@ As part of Boosted's evolving CSS variables approach, popovers now use local CSS

{{< scss-docs name="popover-css-vars" file="scss/_popover.scss" >}}

Note that `--bs-popover-body-padding-y` and `--bs-popover-header-padding-y` have priority over `--bs-popover-body-padding-bottom` and `--bs-popover-body-padding-top`, and `--bs-popover-header-padding-bottom` and `--bs-popover-header-padding-top`, respectively.

### Sass variables

{{< scss-docs name="popover-variables" file="scss/_variables.scss" >}}
Expand Down
10 changes: 7 additions & 3 deletions site/content/docs/5.3/migration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,6 @@ Learn more by reading the new [color modes documentation]({{< docsref "/customiz
<ul>
<li><code>--bs-border-radius-2xl</code></li>
<li><code>--bs-offcanvas-transition-duration</code></li>
<li><code>--bs-popover-header-padding-x</code></li>
<li><code>--bs-popover-header-padding-y</code></li>
</ul>
</details>

Expand All @@ -289,7 +287,6 @@ Learn more by reading the new [color modes documentation]({{< docsref "/customiz
<li><code>$link-hover-color-dark</code></li>
<li><code>$mark-bg-dark</code></li>
<li><code>$mark-color-dark</code></li>
<li><code>$popover-header-padding-y</code></li>
<li><code>$pre-color-dark</code></li>
<li><code>$table-caption-color-dark</code></li>
</ul>
Expand Down Expand Up @@ -359,8 +356,11 @@ Learn more by reading the new [color modes documentation]({{< docsref "/customiz
<li><code>--bs-nav-underline-link-padding-x</code></li>
<li><code>--bs-modal-footer-margin-top</code></li>
<li><code>--bs-offcanvas-transition</code></li>
<li><code>--bs-popover-body-padding-bottom</code></li>
<li><code>--bs-popover-body-padding-top</code></li>
<li><code>--bs-popover-header-line-height</code></li>
<li><code>--bs-popover-header-padding-bottom</code></li>
<li><code>--bs-popover-header-padding-top</code></li>
<li><code>--bs-popover-line-height</code></li>
<li><code>--bs-primary-bg-subtle</code></li>
<li><code>--bs-primary-border-subtle</code></li>
Expand Down Expand Up @@ -493,9 +493,13 @@ Learn more by reading the new [color modes documentation]({{< docsref "/customiz
<li><code>$modal-footer-margin-top</code></li>
<li><code>$modal-footer-margin-top-sm</code></li>
<li><code>$modal-scrollable-footer-margin-top</code></li>
<li><code>$popover-body-padding-bottom</code></li>
<li><code>$popover-body-padding-top</code></li>
<li><code>$popover-header-line-height</code></li>
<li><code>$popover-header-padding-bottom</code></li>
<li><code>$popover-header-padding-top</code></li>
<li><code>$popover-line-height</code></li>
<li><code>$popover-padding-y</code></li>
<li><code>$pre-color-inverted</code></li>
<li><code>$primary-bg-subtle-dark</code></li>
<li><code>$primary-bg-subtle</code></li>
Expand Down