Fix after review

Orange-OpenSource · Jun 27, 2023 · acd5cfa · acd5cfa
1 parent b30a335
commit acd5cfa
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/scss/_popover.scss b/scss/_popover.scss
@@ -13,8 +13,8 @@
  --#{$prefix}popover-box-shadow: #{$popover-box-shadow};
  --#{$prefix}popover-header-padding-x: #{$popover-header-padding-x};
  --#{$prefix}popover-header-padding-y: #{$popover-header-padding-y};
- --#{$prefix}popover-header-padding-bottom: #{$popover-header-padding-bottom}; // Boosted mod
  --#{$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};
@@ -189,11 +189,7 @@
 
 // Offset the popover to account for the popover arrow
 .popover-header {
- 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))
- var(--#{$prefix}popover-header-padding-x); // Boosted mod: instead of `var(--#{$prefix}popover-header-padding-y) var(--#{$prefix}popover-header-padding-x)`
+ 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
@@ -212,16 +208,12 @@
 }
 
 .popover-body {
- 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))
- var(--#{$prefix}popover-body-padding-x); // Boosted mod: instead of padding: `var(--#{$prefix}popover-body-padding-y) var(--#{$prefix}popover-body-padding-x);`
+ 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 {
- --bs-popover-body-padding-y: #{$popover-padding-y}; // Reset value to the defaut y padding popover one when there's only a body
+ --#{$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
diff --git a/scss/_variables.scss b/scss/_variables.scss
@@ -1779,12 +1779,12 @@ $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;
 $popover-inner-border-radius: calc(#{$popover-border-radius} - #{$popover-border-width}) !default; // stylelint-disable-line function-disallowed-list
 $popover-box-shadow: $box-shadow !default;
-$popover-padding-y: $spacer !default; // Boosted mod
 
 $popover-header-font-size: $font-size-lg !default; // Boosted mod: instead of `$font-size-base`
 $popover-header-line-height: 1.11 !default; // Boosted mod

diff --git a/site/content/docs/5.3/components/popovers.md b/site/content/docs/5.3/components/popovers.md
@@ -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" >}}