From efbd5591772ef04d4b31ebe225406bd22d2990cd Mon Sep 17 00:00:00 2001 From: jonnysp Date: Sat, 11 Mar 2023 19:03:19 +0100 Subject: [PATCH 01/14] Update _variables.scss Fix the color when set the data-bs-theme="dark" on the element itself --- scss/_variables.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index 0288898d3c35..6ae510ae337a 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -1347,7 +1347,7 @@ $card-cap-padding-x: $card-spacer-x !default; $card-cap-bg: rgba(var(--#{$prefix}body-color-rgb), .03) !default; $card-cap-color: null !default; $card-height: null !default; -$card-color: null !default; +$card-color: var(--#{$prefix}body-color) !default; $card-bg: var(--#{$prefix}body-bg) !default; $card-img-overlay-padding: $spacer !default; $card-group-margin: $grid-gutter-width * .5 !default; @@ -1498,7 +1498,7 @@ $modal-dialog-margin-y-sm-up: 1.75rem !default; $modal-title-line-height: $line-height-base !default; -$modal-content-color: null !default; +$modal-content-color: var(--#{$prefix}body-color) !default; $modal-content-bg: var(--#{$prefix}body-bg) !default; $modal-content-border-color: var(--#{$prefix}border-color-translucent) !default; $modal-content-border-width: var(--#{$prefix}border-width) !default; From 9539cbc878e6c5254e0cfc579c2172471717e211 Mon Sep 17 00:00:00 2001 From: jonnysp Date: Mon, 13 Mar 2023 12:13:31 +0100 Subject: [PATCH 02/14] labelcolor --- scss/_variables.scss | 2 +- scss/forms/_floating-labels.scss | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index 6ae510ae337a..336d17668227 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -872,7 +872,7 @@ $form-label-margin-bottom: .5rem !default; $form-label-font-size: null !default; $form-label-font-style: null !default; $form-label-font-weight: null !default; -$form-label-color: null !default; +$form-label-color: var(--#{$prefix}body-color) !default; // scss-docs-end form-label-variables // scss-docs-start form-input-variables diff --git a/scss/forms/_floating-labels.scss b/scss/forms/_floating-labels.scss index 3ca4264d7819..7f60f9462d9c 100644 --- a/scss/forms/_floating-labels.scss +++ b/scss/forms/_floating-labels.scss @@ -17,6 +17,7 @@ height: 100%; // allow textareas padding: $form-floating-padding-y $form-floating-padding-x; overflow: hidden; + color: var(--bs-body-color); text-align: start; text-overflow: ellipsis; white-space: nowrap; From 37943b6b99f94a337138ae4fd2be8475f0915a1d Mon Sep 17 00:00:00 2001 From: jonnysp Date: Mon, 13 Mar 2023 12:20:15 +0100 Subject: [PATCH 03/14] Update _floating-labels.scss --- scss/forms/_floating-labels.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/forms/_floating-labels.scss b/scss/forms/_floating-labels.scss index 7f60f9462d9c..53fcd59ced08 100644 --- a/scss/forms/_floating-labels.scss +++ b/scss/forms/_floating-labels.scss @@ -17,7 +17,7 @@ height: 100%; // allow textareas padding: $form-floating-padding-y $form-floating-padding-x; overflow: hidden; - color: var(--bs-body-color); + color: var(--#{$prefix}body-color); text-align: start; text-overflow: ellipsis; white-space: nowrap; From 81728bb59ff0d9e4410ac6b87fb37baee483a812 Mon Sep 17 00:00:00 2001 From: jonnysp Date: Mon, 13 Mar 2023 12:29:25 +0100 Subject: [PATCH 04/14] Update _floating-labels.scss --- scss/forms/_floating-labels.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/forms/_floating-labels.scss b/scss/forms/_floating-labels.scss index 53fcd59ced08..671ddbbfe48c 100644 --- a/scss/forms/_floating-labels.scss +++ b/scss/forms/_floating-labels.scss @@ -17,7 +17,7 @@ height: 100%; // allow textareas padding: $form-floating-padding-y $form-floating-padding-x; overflow: hidden; - color: var(--#{$prefix}body-color); + color: $input-color; text-align: start; text-overflow: ellipsis; white-space: nowrap; From d4990379ca9f802f43564726497d142519ebc3e5 Mon Sep 17 00:00:00 2001 From: jonnysp Date: Mon, 13 Mar 2023 13:26:24 +0100 Subject: [PATCH 05/14] Update _variables.scss --- scss/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index 336d17668227..3afd68080b26 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -1434,7 +1434,7 @@ $popover-box-shadow: $box-shadow !default; $popover-header-font-size: $font-size-base !default; $popover-header-bg: var(--#{$prefix}secondary-bg) !default; -$popover-header-color: $headings-color !default; +$popover-header-color: var(--#{$prefix}body-color) !default; $popover-header-padding-y: .5rem !default; $popover-header-padding-x: $spacer !default; From 0c835242d343290a35c07e5b0bf289fca2786259 Mon Sep 17 00:00:00 2001 From: jonnysp Date: Tue, 14 Mar 2023 08:23:37 +0100 Subject: [PATCH 06/14] Update _variables.scss --- scss/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_variables.scss b/scss/_variables.scss index 3afd68080b26..ec8fe5e840cd 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -1460,7 +1460,7 @@ $toast-max-width: 350px !default; $toast-padding-x: .75rem !default; $toast-padding-y: .5rem !default; $toast-font-size: .875rem !default; -$toast-color: null !default; +$toast-color: var(--#{$prefix}body-color) !default; $toast-background-color: rgba(var(--#{$prefix}body-bg-rgb), .85) !default; $toast-border-width: var(--#{$prefix}border-width) !default; $toast-border-color: var(--#{$prefix}border-color-translucent) !default; From 9dc1d594040703f9155b574e1b9933b526a11219 Mon Sep 17 00:00:00 2001 From: jonnysp Date: Tue, 14 Mar 2023 13:50:41 +0100 Subject: [PATCH 07/14] make the dark variants same as the lights make the dark variants same as the light variants, to see the theme effects. --- site/content/docs/5.3/examples/dropdowns/index.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/site/content/docs/5.3/examples/dropdowns/index.html b/site/content/docs/5.3/examples/dropdowns/index.html index 3dac768f276f..2cdd6ca63f81 100644 --- a/site/content/docs/5.3/examples/dropdowns/index.html +++ b/site/content/docs/5.3/examples/dropdowns/index.html @@ -57,7 +57,7 @@
  • Separated link
    • -
      + -
      -
      - +
      + + -
        +
        • @@ -193,7 +193,7 @@
        • - + Trash From 676abb98f934200da7cb58cf4a05c3a00244fb4c Mon Sep 17 00:00:00 2001 From: jonnysp Date: Tue, 14 Mar 2023 14:24:35 +0100 Subject: [PATCH 08/14] make theme switcher in some examples works --- site/content/docs/5.3/examples/blog-rtl/index.html | 1 - site/content/docs/5.3/examples/blog/index.html | 1 - site/content/docs/5.3/examples/cover/index.html | 1 - site/content/docs/5.3/examples/grid/index.html | 1 - site/content/docs/5.3/examples/jumbotron/index.html | 1 - site/content/docs/5.3/examples/pricing/index.html | 1 - site/content/docs/5.3/examples/sign-in/index.html | 1 - site/content/docs/5.3/examples/sticky-footer/index.html | 1 - 8 files changed, 8 deletions(-) diff --git a/site/content/docs/5.3/examples/blog-rtl/index.html b/site/content/docs/5.3/examples/blog-rtl/index.html index c3c6c6293771..2174a2d13b9a 100644 --- a/site/content/docs/5.3/examples/blog-rtl/index.html +++ b/site/content/docs/5.3/examples/blog-rtl/index.html @@ -5,7 +5,6 @@ extra_css: - "https://fonts.googleapis.com/css?family=Amiri:wght@400;700&display=swap" - "../blog/blog.rtl.css" -include_js: false ---
          diff --git a/site/content/docs/5.3/examples/blog/index.html b/site/content/docs/5.3/examples/blog/index.html index 9f11a21f9bc8..9bde8fb30b0a 100644 --- a/site/content/docs/5.3/examples/blog/index.html +++ b/site/content/docs/5.3/examples/blog/index.html @@ -4,7 +4,6 @@ extra_css: - "https://fonts.googleapis.com/css?family=Playfair+Display:700,900&display=swap" - "blog.css" -include_js: false ---
          diff --git a/site/content/docs/5.3/examples/cover/index.html b/site/content/docs/5.3/examples/cover/index.html index 80a73300df4e..002a5c3100b5 100644 --- a/site/content/docs/5.3/examples/cover/index.html +++ b/site/content/docs/5.3/examples/cover/index.html @@ -5,7 +5,6 @@ - "cover.css" html_class: "h-100" body_class: "d-flex h-100 text-center text-bg-dark" -include_js: false ---
          diff --git a/site/content/docs/5.3/examples/grid/index.html b/site/content/docs/5.3/examples/grid/index.html index 7c4f1d322fe9..8a61582028a6 100644 --- a/site/content/docs/5.3/examples/grid/index.html +++ b/site/content/docs/5.3/examples/grid/index.html @@ -4,7 +4,6 @@ extra_css: - "grid.css" body_class: "py-4" -include_js: false ---
          diff --git a/site/content/docs/5.3/examples/jumbotron/index.html b/site/content/docs/5.3/examples/jumbotron/index.html index df219512ae91..0038a26866da 100644 --- a/site/content/docs/5.3/examples/jumbotron/index.html +++ b/site/content/docs/5.3/examples/jumbotron/index.html @@ -1,7 +1,6 @@ --- layout: examples title: Jumbotron example -include_js: false ---
          diff --git a/site/content/docs/5.3/examples/pricing/index.html b/site/content/docs/5.3/examples/pricing/index.html index 6c9c82cb468a..0b0a4f880f51 100644 --- a/site/content/docs/5.3/examples/pricing/index.html +++ b/site/content/docs/5.3/examples/pricing/index.html @@ -3,7 +3,6 @@ title: Pricing example extra_css: - "pricing.css" -include_js: false --- diff --git a/site/content/docs/5.3/examples/sign-in/index.html b/site/content/docs/5.3/examples/sign-in/index.html index 0f084ed7b7dd..13754d954498 100644 --- a/site/content/docs/5.3/examples/sign-in/index.html +++ b/site/content/docs/5.3/examples/sign-in/index.html @@ -4,7 +4,6 @@ extra_css: - "sign-in.css" body_class: "text-center" -include_js: false ---
          diff --git a/site/content/docs/5.3/examples/sticky-footer/index.html b/site/content/docs/5.3/examples/sticky-footer/index.html index 4d5a33cd601a..631addabe433 100644 --- a/site/content/docs/5.3/examples/sticky-footer/index.html +++ b/site/content/docs/5.3/examples/sticky-footer/index.html @@ -5,7 +5,6 @@ - "sticky-footer.css" html_class: "h-100" body_class: "d-flex flex-column h-100" -include_js: false --- From 42b852093211e84a71a986d841114412fc1be57d Mon Sep 17 00:00:00 2001 From: jonnysp Date: Wed, 15 Mar 2023 08:01:49 +0100 Subject: [PATCH 09/14] Update _card.scss --- scss/_card.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scss/_card.scss b/scss/_card.scss index d3535a98b76f..7d909bf93739 100644 --- a/scss/_card.scss +++ b/scss/_card.scss @@ -30,7 +30,7 @@ flex-direction: column; min-width: 0; // See https://github.com/twbs/bootstrap/pull/22740#issuecomment-305868106 height: var(--#{$prefix}card-height); - color: var(--#{$prefix}body-color); + color: var(--#{$prefix}card-color); word-wrap: break-word; background-color: var(--#{$prefix}card-bg); background-clip: border-box; @@ -71,7 +71,6 @@ // as much space as possible, ensuring footers are aligned to the bottom. flex: 1 1 auto; padding: var(--#{$prefix}card-spacer-y) var(--#{$prefix}card-spacer-x); - color: var(--#{$prefix}card-color); } .card-title { From 61471d02912197dfd9a5519d49b6ad6b48d2e58a Mon Sep 17 00:00:00 2001 From: jonnysp Date: Wed, 15 Mar 2023 10:53:04 +0100 Subject: [PATCH 10/14] table theme dark table theme dark --- scss/_tables.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/scss/_tables.scss b/scss/_tables.scss index ebfc00a5c652..93897e6b751c 100644 --- a/scss/_tables.scss +++ b/scss/_tables.scss @@ -23,6 +23,7 @@ width: 100%; margin-bottom: $spacer; vertical-align: $table-cell-vertical-align; + background-color: var(--#{$prefix}table-bg); border-color: var(--#{$prefix}table-border-color); // Target th & td From 86620286d9c147b29b6a87731db5db739e3d28aa Mon Sep 17 00:00:00 2001 From: jonnysp Date: Wed, 26 Apr 2023 10:50:56 +0200 Subject: [PATCH 11/14] Revert "table theme dark" This reverts commit 61471d02912197dfd9a5519d49b6ad6b48d2e58a. --- scss/_tables.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/scss/_tables.scss b/scss/_tables.scss index 93897e6b751c..ebfc00a5c652 100644 --- a/scss/_tables.scss +++ b/scss/_tables.scss @@ -23,7 +23,6 @@ width: 100%; margin-bottom: $spacer; vertical-align: $table-cell-vertical-align; - background-color: var(--#{$prefix}table-bg); border-color: var(--#{$prefix}table-border-color); // Target th & td From c3c7348520c433fcbe66abeed40a4a2434ff9744 Mon Sep 17 00:00:00 2001 From: jonnysp Date: Wed, 26 Apr 2023 11:05:46 +0200 Subject: [PATCH 12/14] Revert "make the dark variants same as the lights" This reverts commit 9dc1d594040703f9155b574e1b9933b526a11219. --- site/content/docs/5.3/examples/dropdowns/index.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/site/content/docs/5.3/examples/dropdowns/index.html b/site/content/docs/5.3/examples/dropdowns/index.html index 2cdd6ca63f81..3dac768f276f 100644 --- a/site/content/docs/5.3/examples/dropdowns/index.html +++ b/site/content/docs/5.3/examples/dropdowns/index.html @@ -57,7 +57,7 @@
        • Separated link
        -
      -
      -
      - +
      + + -
        +
        • @@ -193,7 +193,7 @@
        • - + Trash From f09a5a029f61ef1a6d56676099897d5daea4ec17 Mon Sep 17 00:00:00 2001 From: jonnysp Date: Wed, 26 Apr 2023 11:06:01 +0200 Subject: [PATCH 13/14] Revert "make theme switcher in some examples works" This reverts commit 676abb98f934200da7cb58cf4a05c3a00244fb4c. --- site/content/docs/5.3/examples/blog-rtl/index.html | 1 + site/content/docs/5.3/examples/blog/index.html | 1 + site/content/docs/5.3/examples/cover/index.html | 1 + site/content/docs/5.3/examples/grid/index.html | 1 + site/content/docs/5.3/examples/jumbotron/index.html | 1 + site/content/docs/5.3/examples/pricing/index.html | 1 + site/content/docs/5.3/examples/sign-in/index.html | 1 + site/content/docs/5.3/examples/sticky-footer/index.html | 1 + 8 files changed, 8 insertions(+) diff --git a/site/content/docs/5.3/examples/blog-rtl/index.html b/site/content/docs/5.3/examples/blog-rtl/index.html index 2174a2d13b9a..c3c6c6293771 100644 --- a/site/content/docs/5.3/examples/blog-rtl/index.html +++ b/site/content/docs/5.3/examples/blog-rtl/index.html @@ -5,6 +5,7 @@ extra_css: - "https://fonts.googleapis.com/css?family=Amiri:wght@400;700&display=swap" - "../blog/blog.rtl.css" +include_js: false ---
          diff --git a/site/content/docs/5.3/examples/blog/index.html b/site/content/docs/5.3/examples/blog/index.html index 9bde8fb30b0a..9f11a21f9bc8 100644 --- a/site/content/docs/5.3/examples/blog/index.html +++ b/site/content/docs/5.3/examples/blog/index.html @@ -4,6 +4,7 @@ extra_css: - "https://fonts.googleapis.com/css?family=Playfair+Display:700,900&display=swap" - "blog.css" +include_js: false ---
          diff --git a/site/content/docs/5.3/examples/cover/index.html b/site/content/docs/5.3/examples/cover/index.html index 002a5c3100b5..80a73300df4e 100644 --- a/site/content/docs/5.3/examples/cover/index.html +++ b/site/content/docs/5.3/examples/cover/index.html @@ -5,6 +5,7 @@ - "cover.css" html_class: "h-100" body_class: "d-flex h-100 text-center text-bg-dark" +include_js: false ---
          diff --git a/site/content/docs/5.3/examples/grid/index.html b/site/content/docs/5.3/examples/grid/index.html index 8a61582028a6..7c4f1d322fe9 100644 --- a/site/content/docs/5.3/examples/grid/index.html +++ b/site/content/docs/5.3/examples/grid/index.html @@ -4,6 +4,7 @@ extra_css: - "grid.css" body_class: "py-4" +include_js: false ---
          diff --git a/site/content/docs/5.3/examples/jumbotron/index.html b/site/content/docs/5.3/examples/jumbotron/index.html index 0038a26866da..df219512ae91 100644 --- a/site/content/docs/5.3/examples/jumbotron/index.html +++ b/site/content/docs/5.3/examples/jumbotron/index.html @@ -1,6 +1,7 @@ --- layout: examples title: Jumbotron example +include_js: false ---
          diff --git a/site/content/docs/5.3/examples/pricing/index.html b/site/content/docs/5.3/examples/pricing/index.html index 0b0a4f880f51..6c9c82cb468a 100644 --- a/site/content/docs/5.3/examples/pricing/index.html +++ b/site/content/docs/5.3/examples/pricing/index.html @@ -3,6 +3,7 @@ title: Pricing example extra_css: - "pricing.css" +include_js: false --- diff --git a/site/content/docs/5.3/examples/sign-in/index.html b/site/content/docs/5.3/examples/sign-in/index.html index 13754d954498..0f084ed7b7dd 100644 --- a/site/content/docs/5.3/examples/sign-in/index.html +++ b/site/content/docs/5.3/examples/sign-in/index.html @@ -4,6 +4,7 @@ extra_css: - "sign-in.css" body_class: "text-center" +include_js: false ---
          diff --git a/site/content/docs/5.3/examples/sticky-footer/index.html b/site/content/docs/5.3/examples/sticky-footer/index.html index 631addabe433..4d5a33cd601a 100644 --- a/site/content/docs/5.3/examples/sticky-footer/index.html +++ b/site/content/docs/5.3/examples/sticky-footer/index.html @@ -5,6 +5,7 @@ - "sticky-footer.css" html_class: "h-100" body_class: "d-flex flex-column h-100" +include_js: false --- From 963134536459f3d139206c18c43ebff35276da7e Mon Sep 17 00:00:00 2001 From: jonnysp Date: Tue, 2 May 2023 08:38:55 +0200 Subject: [PATCH 14/14] fix dropdown example --- site/content/docs/5.3/examples/dropdowns/index.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/site/content/docs/5.3/examples/dropdowns/index.html b/site/content/docs/5.3/examples/dropdowns/index.html index 3dac768f276f..2cdd6ca63f81 100644 --- a/site/content/docs/5.3/examples/dropdowns/index.html +++ b/site/content/docs/5.3/examples/dropdowns/index.html @@ -57,7 +57,7 @@
        • Separated link
        -
      -
      -
      - +
      + + -