From 078b7c66808568cd240e0c952aa3c7ed8482770a Mon Sep 17 00:00:00 2001 From: gabalafou Date: Tue, 3 Dec 2024 12:45:14 -0600 Subject: [PATCH 1/3] Import Bootstrap after importing our variable overrides --- src/pydata_sphinx_theme/assets/styles/pydata-sphinx-theme.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pydata_sphinx_theme/assets/styles/pydata-sphinx-theme.scss b/src/pydata_sphinx_theme/assets/styles/pydata-sphinx-theme.scss index ff20f0e4a..d8eaac5df 100644 --- a/src/pydata_sphinx_theme/assets/styles/pydata-sphinx-theme.scss +++ b/src/pydata_sphinx_theme/assets/styles/pydata-sphinx-theme.scss @@ -1,4 +1,5 @@ // Import all of Bootstrap scss +@import "variables/bootstrap"; @import "~bootstrap/scss/bootstrap"; // Import FontAwesome from _node_modules @@ -8,7 +9,6 @@ @import "~@fortawesome/fontawesome-free/scss/brands"; // Variables -@import "variables/bootstrap"; @import "variables/layout"; @import "variables/fonts"; @import "variables/icons"; From 80f8875b62d501c2f633c71ec0776a704c2daa03 Mon Sep 17 00:00:00 2001 From: gabalafou Date: Tue, 3 Dec 2024 13:35:09 -0600 Subject: [PATCH 2/3] Add comment --- .../assets/styles/pydata-sphinx-theme.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pydata_sphinx_theme/assets/styles/pydata-sphinx-theme.scss b/src/pydata_sphinx_theme/assets/styles/pydata-sphinx-theme.scss index d8eaac5df..61128a2a6 100644 --- a/src/pydata_sphinx_theme/assets/styles/pydata-sphinx-theme.scss +++ b/src/pydata_sphinx_theme/assets/styles/pydata-sphinx-theme.scss @@ -1,5 +1,9 @@ -// Import all of Bootstrap scss +// IMPORTANT: our Bootstrap variable overrides must be imported before the +// Bootstrap files that reference those variables otherwise our overrides will +// have no effect. @import "variables/bootstrap"; + +// Import all of Bootstrap scss. @import "~bootstrap/scss/bootstrap"; // Import FontAwesome from _node_modules From 260c0e1f31e09999a7404307795ec381f37a9d68 Mon Sep 17 00:00:00 2001 From: gabalafou Date: Tue, 3 Dec 2024 13:35:38 -0600 Subject: [PATCH 3/3] punctuation --- src/pydata_sphinx_theme/assets/styles/pydata-sphinx-theme.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pydata_sphinx_theme/assets/styles/pydata-sphinx-theme.scss b/src/pydata_sphinx_theme/assets/styles/pydata-sphinx-theme.scss index 61128a2a6..1afad574b 100644 --- a/src/pydata_sphinx_theme/assets/styles/pydata-sphinx-theme.scss +++ b/src/pydata_sphinx_theme/assets/styles/pydata-sphinx-theme.scss @@ -1,5 +1,5 @@ // IMPORTANT: our Bootstrap variable overrides must be imported before the -// Bootstrap files that reference those variables otherwise our overrides will +// Bootstrap files that reference those variables; otherwise our overrides will // have no effect. @import "variables/bootstrap";