From 946001991d32aa123da5074f36d7910b2ac1b669 Mon Sep 17 00:00:00 2001 From: MewenLeHo Date: Fri, 23 Jun 2023 14:24:33 +0200 Subject: [PATCH 01/20] Prototype --- scss/_pagination.scss | 2 +- site/content/docs/5.3/components/pagination.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scss/_pagination.scss b/scss/_pagination.scss index 162d068ce5..48f3046c1a 100644 --- a/scss/_pagination.scss +++ b/scss/_pagination.scss @@ -154,7 +154,7 @@ &:first-child .page-link { margin-right: var(--#{$prefix}pagination-margin-x-first-last); - &:not(:empty) { + &:not(:empty) :not([data-bs-a11y]) { padding-right: var(--#{$prefix}pagination-padding-end); } diff --git a/site/content/docs/5.3/components/pagination.md b/site/content/docs/5.3/components/pagination.md index 6711464e36..0febad0405 100644 --- a/site/content/docs/5.3/components/pagination.md +++ b/site/content/docs/5.3/components/pagination.md @@ -30,7 +30,7 @@ Looking to use an icon or symbol in place of text for some pagination links? Be {{< example >}} From 4699306befa4b3a09adb0a337b294f8a6afcf097 Mon Sep 17 00:00:00 2001 From: MewenLeHo Date: Mon, 26 Jun 2023 09:42:15 +0200 Subject: [PATCH 02/20] Prototype --- scss/_pagination.scss | 2 +- site/content/docs/5.3/components/pagination.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scss/_pagination.scss b/scss/_pagination.scss index 48f3046c1a..162d068ce5 100644 --- a/scss/_pagination.scss +++ b/scss/_pagination.scss @@ -154,7 +154,7 @@ &:first-child .page-link { margin-right: var(--#{$prefix}pagination-margin-x-first-last); - &:not(:empty) :not([data-bs-a11y]) { + &:not(:empty) { padding-right: var(--#{$prefix}pagination-padding-end); } diff --git a/site/content/docs/5.3/components/pagination.md b/site/content/docs/5.3/components/pagination.md index 0febad0405..78a1d49168 100644 --- a/site/content/docs/5.3/components/pagination.md +++ b/site/content/docs/5.3/components/pagination.md @@ -30,8 +30,8 @@ Looking to use an icon or symbol in place of text for some pagination links? Be {{< example >}} {{< /example >}} From 55de3309390ca8f134e8d6a2d54afb47f1f82738 Mon Sep 17 00:00:00 2001 From: MewenLeHo Date: Mon, 26 Jun 2023 09:55:48 +0200 Subject: [PATCH 03/20] Fix --- site/content/docs/5.3/components/pagination.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/content/docs/5.3/components/pagination.md b/site/content/docs/5.3/components/pagination.md index 78a1d49168..76231fa3ab 100644 --- a/site/content/docs/5.3/components/pagination.md +++ b/site/content/docs/5.3/components/pagination.md @@ -30,8 +30,8 @@ Looking to use an icon or symbol in place of text for some pagination links? Be {{< example >}} {{< /example >}} From bfb234f87e9334049d6e9defa1cb5e5329bccca0 Mon Sep 17 00:00:00 2001 From: MewenLeHo Date: Mon, 26 Jun 2023 14:11:47 +0200 Subject: [PATCH 04/20] Prototype --- scss/_pagination.scss | 12 ++++++++++++ site/content/docs/5.3/components/pagination.md | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/scss/_pagination.scss b/scss/_pagination.scss index 162d068ce5..3909633ae8 100644 --- a/scss/_pagination.scss +++ b/scss/_pagination.scss @@ -204,6 +204,18 @@ // End mod } +// Boosted mod: special style for pagination with icons only +.icons-only { + .page-item { + &:first-child .page-link { + padding-right: 0; + } + &:last-child .page-link { + padding-left: 0; + } + } +} +// End mod // // Sizing diff --git a/site/content/docs/5.3/components/pagination.md b/site/content/docs/5.3/components/pagination.md index 76231fa3ab..6430840e39 100644 --- a/site/content/docs/5.3/components/pagination.md +++ b/site/content/docs/5.3/components/pagination.md @@ -29,7 +29,7 @@ Looking to use an icon or symbol in place of text for some pagination links? Be {{< example >}} {{< /example >}} diff --git a/site/content/docs/5.3/migration.md b/site/content/docs/5.3/migration.md index e15c820a73..05f3496ee2 100644 --- a/site/content/docs/5.3/migration.md +++ b/site/content/docs/5.3/migration.md @@ -30,8 +30,8 @@ If you need more details about the changes, please refer to the [v5.3.2 release] ```diff -
    • -
    • - +
    • - +
    • + +
    • + +
    • ``` ### Forms From 79925769f353425f69ac05f69fc5dcd9b0f0e6dc Mon Sep 17 00:00:00 2001 From: MewenLeHo Date: Wed, 23 Aug 2023 13:45:23 +0200 Subject: [PATCH 13/20] Fix padding and gap --- scss/_variables.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index b3104ecaad..681595ff44 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -1578,7 +1578,7 @@ $dropdown-dark-header-color: $white !default; // Boosted mod // scss-docs-start pagination-variables $pagination-padding-y: .5625rem !default; // Boosted mod: instead of `null` -$pagination-padding-x: .8125rem !default; // Boosted mod: instead of `null` +$pagination-padding-x: 1.125rem !default; // Boosted mod: instead of `null` $pagination-font-size: $font-size-base !default; @@ -1619,7 +1619,7 @@ $pagination-icon-min-width: .625rem !default; $pagination-icon-size: 1.125rem !default; $pagination-icon-width: add(.5rem, 1px) !default; $pagination-icon-height: subtract(1rem, 1px) !default; -$pagination-gap: 10px !default; +$pagination-gap: 5px !default; $pagination-active-item-bg: $primary !default; $pagination-active-item-color: color-contrast($pagination-active-item-bg) !default; From fb02b561b65f4e55c05d84f7b717a8c64dd1f365 Mon Sep 17 00:00:00 2001 From: MewenLeHo Date: Wed, 23 Aug 2023 16:43:42 +0200 Subject: [PATCH 14/20] Fix padding when no title but not a number --- scss/_pagination.scss | 5 +++++ scss/_variables.scss | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/scss/_pagination.scss b/scss/_pagination.scss index e144bc3c95..d7c8afcb41 100644 --- a/scss/_pagination.scss +++ b/scss/_pagination.scss @@ -1,6 +1,7 @@ .pagination { // scss-docs-start pagination-css-vars --#{$prefix}pagination-padding-x: #{$pagination-padding-x}; + --#{$prefix}pagination-padding-inline-x: #{$pagination-padding-inline-x}; --#{$prefix}pagination-padding-y: #{$pagination-padding-y}; --#{$prefix}pagination-margin-y: #{$pagination-margin-y}; // Boosted mod --#{$prefix}pagination-gap: #{$pagination-gap}; // Boosted mod @@ -153,6 +154,10 @@ background-color: var(--#{$prefix}pagination-active-item-bg); border-color: var(--#{$prefix}pagination-active-item-border-color); } + + &:not([title]) { + padding-inline: var(--#{$prefix}pagination-padding-inline-x); + } } &:first-child .page-link { diff --git a/scss/_variables.scss b/scss/_variables.scss index 681595ff44..da6c0e3f83 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -1578,7 +1578,8 @@ $dropdown-dark-header-color: $white !default; // Boosted mod // scss-docs-start pagination-variables $pagination-padding-y: .5625rem !default; // Boosted mod: instead of `null` -$pagination-padding-x: 1.125rem !default; // Boosted mod: instead of `null` +$pagination-padding-x: .8125rem !default; // Boosted mod: instead of `null` +$pagination-padding-inline-x: 1.125rem !default; // Boosted mod $pagination-font-size: $font-size-base !default; From 0a5b41075661226e088568494cec6079b09c1a9a Mon Sep 17 00:00:00 2001 From: MewenLeHo Date: Wed, 23 Aug 2023 16:49:33 +0200 Subject: [PATCH 15/20] Update migration guide --- site/content/docs/5.3/migration.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/content/docs/5.3/migration.md b/site/content/docs/5.3/migration.md index c220d3e8f9..e45cd1c521 100644 --- a/site/content/docs/5.3/migration.md +++ b/site/content/docs/5.3/migration.md @@ -60,6 +60,7 @@ If you need more details about the changes, please refer to the [v5.3.2 release]
  • --bs-pagination-gap
  • --bs-pagination-icon-min-width
  • --bs-pagination-item-max-width
    • +
  • --bs-pagination-padding-inline-x
    • @@ -73,6 +74,7 @@ If you need more details about the changes, please refer to the [v5.3.2 release]
  • $pagination-gap
  • $pagination-icon-min-width
  • $pagination-item-max-width
    • +
  • $pagination-padding-inline-x
    • From ba98b65672c059ce5c41002d3b5c75eb5121a705 Mon Sep 17 00:00:00 2001 From: MewenLeHo Date: Thu, 24 Aug 2023 10:18:32 +0200 Subject: [PATCH 16/20] . --- scss/_pagination.scss | 7 +++++-- scss/_variables.scss | 2 +- site/content/docs/5.3/migration.md | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/scss/_pagination.scss b/scss/_pagination.scss index d7c8afcb41..0b9e160cd6 100644 --- a/scss/_pagination.scss +++ b/scss/_pagination.scss @@ -1,7 +1,7 @@ .pagination { // scss-docs-start pagination-css-vars --#{$prefix}pagination-padding-x: #{$pagination-padding-x}; - --#{$prefix}pagination-padding-inline-x: #{$pagination-padding-inline-x}; + --#{$prefix}pagination-label-padding-inline-x: #{$pagination-label-padding-inline-x}; --#{$prefix}pagination-padding-y: #{$pagination-padding-y}; --#{$prefix}pagination-margin-y: #{$pagination-margin-y}; // Boosted mod --#{$prefix}pagination-gap: #{$pagination-gap}; // Boosted mod @@ -154,9 +154,12 @@ background-color: var(--#{$prefix}pagination-active-item-bg); border-color: var(--#{$prefix}pagination-active-item-border-color); } + } + &:first-child .page-link, + &:last-child .page-link { &:not([title]) { - padding-inline: var(--#{$prefix}pagination-padding-inline-x); + --#{$prefix}pagination-padding-x: var(--#{$prefix}pagination-label-padding-inline-x); } } diff --git a/scss/_variables.scss b/scss/_variables.scss index da6c0e3f83..ca3f51d2cf 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -1579,7 +1579,7 @@ $dropdown-dark-header-color: $white !default; // Boosted mod // scss-docs-start pagination-variables $pagination-padding-y: .5625rem !default; // Boosted mod: instead of `null` $pagination-padding-x: .8125rem !default; // Boosted mod: instead of `null` -$pagination-padding-inline-x: 1.125rem !default; // Boosted mod +$pagination-label-padding-inline-x: 1.125rem !default; // Boosted mod $pagination-font-size: $font-size-base !default; diff --git a/site/content/docs/5.3/migration.md b/site/content/docs/5.3/migration.md index e45cd1c521..1709b2405f 100644 --- a/site/content/docs/5.3/migration.md +++ b/site/content/docs/5.3/migration.md @@ -60,7 +60,7 @@ If you need more details about the changes, please refer to the [v5.3.2 release]
  • --bs-pagination-gap
  • --bs-pagination-icon-min-width
  • --bs-pagination-item-max-width
    • -
  • --bs-pagination-padding-inline-x
    • +
  • --bs-pagination-label-padding-inline-x
    • @@ -74,7 +74,7 @@ If you need more details about the changes, please refer to the [v5.3.2 release]
  • $pagination-gap
  • $pagination-icon-min-width
  • $pagination-item-max-width
    • -
  • $pagination-padding-inline-x
    • +
  • $pagination-label-padding-inline-x
    • From 026d25920d295ec5c2abe4bcd98f3f49cf88c302 Mon Sep 17 00:00:00 2001 From: MewenLeHo Date: Thu, 24 Aug 2023 11:23:12 +0200 Subject: [PATCH 17/20] . --- scss/_pagination.scss | 4 ++-- scss/_variables.scss | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scss/_pagination.scss b/scss/_pagination.scss index 0b9e160cd6..7a7228fb9a 100644 --- a/scss/_pagination.scss +++ b/scss/_pagination.scss @@ -1,7 +1,7 @@ .pagination { // scss-docs-start pagination-css-vars --#{$prefix}pagination-padding-x: #{$pagination-padding-x}; - --#{$prefix}pagination-label-padding-inline-x: #{$pagination-label-padding-inline-x}; + --#{$prefix}pagination-label-padding-x: #{$pagination-label-padding-x}; --#{$prefix}pagination-padding-y: #{$pagination-padding-y}; --#{$prefix}pagination-margin-y: #{$pagination-margin-y}; // Boosted mod --#{$prefix}pagination-gap: #{$pagination-gap}; // Boosted mod @@ -159,7 +159,7 @@ &:first-child .page-link, &:last-child .page-link { &:not([title]) { - --#{$prefix}pagination-padding-x: var(--#{$prefix}pagination-label-padding-inline-x); + --#{$prefix}pagination-padding-x: var(--#{$prefix}pagination-label-padding-x); } } diff --git a/scss/_variables.scss b/scss/_variables.scss index ca3f51d2cf..7b91209e37 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -1579,7 +1579,7 @@ $dropdown-dark-header-color: $white !default; // Boosted mod // scss-docs-start pagination-variables $pagination-padding-y: .5625rem !default; // Boosted mod: instead of `null` $pagination-padding-x: .8125rem !default; // Boosted mod: instead of `null` -$pagination-label-padding-inline-x: 1.125rem !default; // Boosted mod +$pagination-label-padding-x: 1.125rem !default; // Boosted mod $pagination-font-size: $font-size-base !default; From d57ee5e50e5b72b9b0542b45badb90059b966267 Mon Sep 17 00:00:00 2001 From: MewenLeHo Date: Thu, 24 Aug 2023 11:23:53 +0200 Subject: [PATCH 18/20] . --- site/content/docs/5.3/migration.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/content/docs/5.3/migration.md b/site/content/docs/5.3/migration.md index 1709b2405f..fc241c428e 100644 --- a/site/content/docs/5.3/migration.md +++ b/site/content/docs/5.3/migration.md @@ -60,7 +60,7 @@ If you need more details about the changes, please refer to the [v5.3.2 release]
  • --bs-pagination-gap
  • --bs-pagination-icon-min-width
  • --bs-pagination-item-max-width
    • -
  • --bs-pagination-label-padding-inline-x
    • +
  • --bs-pagination-label-padding-x
    • @@ -74,7 +74,7 @@ If you need more details about the changes, please refer to the [v5.3.2 release]
  • $pagination-gap
  • $pagination-icon-min-width
  • $pagination-item-max-width
    • -
  • $pagination-label-padding-inline-x
    • +
  • $pagination-label-padding-x
    • From 15f3d6b69d4a3f5d5e8d21f5c4f435cff41c33b0 Mon Sep 17 00:00:00 2001 From: MewenLeHo Date: Thu, 24 Aug 2023 15:47:23 +0200 Subject: [PATCH 19/20] . --- scss/_pagination.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_pagination.scss b/scss/_pagination.scss index 7a7228fb9a..ba04bea1f9 100644 --- a/scss/_pagination.scss +++ b/scss/_pagination.scss @@ -1,7 +1,7 @@ .pagination { // scss-docs-start pagination-css-vars --#{$prefix}pagination-padding-x: #{$pagination-padding-x}; - --#{$prefix}pagination-label-padding-x: #{$pagination-label-padding-x}; + --#{$prefix}pagination-label-padding-x: #{$pagination-label-padding-x}; // Boosted mod --#{$prefix}pagination-padding-y: #{$pagination-padding-y}; --#{$prefix}pagination-margin-y: #{$pagination-margin-y}; // Boosted mod --#{$prefix}pagination-gap: #{$pagination-gap}; // Boosted mod From 95c9c687af5687c4eb4b948be3c7600da62439b5 Mon Sep 17 00:00:00 2001 From: MewenLeHo Date: Fri, 25 Aug 2023 11:06:59 +0200 Subject: [PATCH 20/20] Fix version --- scss/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index 7b91209e37..3fb57b5e81 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -1628,7 +1628,7 @@ $pagination-active-item-border: $pagination-active-item-bg !default; $pagination-item-max-width: $spacer * .5 !default; // fusv-disable -$pagination-padding-end: 1.125rem !default; // Deprecated in Boosted 5.3.0 for responsive pagination +$pagination-padding-end: 1.125rem !default; // Deprecated in Boosted 5.3.2 for responsive pagination // fusv-enable // End mod // scss-docs-end pagination-variables