Skip to content

Commit

Permalink
Merge branch 'trallard/webpack-5' of https://github.com/pydata/pydata…
Browse files Browse the repository at this point in the history
…-sphinx-theme into trallard/webpack-5
  • Loading branch information
trallard committed Aug 16, 2024
2 parents 9497624 + 0d364f0 commit e943ae9
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@
"compare-versions": "^5.0.3",
"webpack-bundle-analyzer": "^4.10.2"
}
}
}
1 change: 0 additions & 1 deletion src/pydata_sphinx_theme/assets/scripts/bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import "@popperjs/core";
import * as bootstrap from "bootstrap";
import { documentReady } from "./mixin";


/*******************************************************************************
* Trigger tooltips
*/
Expand Down
2 changes: 1 addition & 1 deletion src/pydata_sphinx_theme/assets/scripts/fontawesome.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
// Define the custom behavior of the page
import { documentReady } from "./mixin";

import '@fortawesome/fontawesome-free/js/all.min.js';
import "@fortawesome/fontawesome-free/js/all.min.js";
9 changes: 5 additions & 4 deletions src/pydata_sphinx_theme/assets/styles/variables/_fonts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,11 @@ html {

// Font family
// These are adapted from https://systemfontstack.com/ */
--pst-font-family-base-system: -apple-system, "BlinkMacSystemFont", "Segoe UI", "Helvetica Neue", "Arial", sans-serif,
"Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
--pst-font-family-monospace-system: "SFMono-Regular", "Menlo", "Consolas", "Monaco", "Liberation Mono",
"Lucida Console", monospace;
--pst-font-family-base-system: -apple-system, "BlinkMacSystemFont", "Segoe UI",
"Helvetica Neue", "Arial", sans-serif, "Apple Color Emoji", "Segoe UI Emoji",
"Segoe UI Symbol";
--pst-font-family-monospace-system: "SFMono-Regular", "Menlo", "Consolas",
"Monaco", "Liberation Mono", "Lucida Console", monospace;
--pst-font-family-base: var(--pst-font-family-base-system);
--pst-font-family-heading: var(--pst-font-family-base-system);
--pst-font-family-monospace: var(--pst-font-family-monospace-system);
Expand Down

0 comments on commit e943ae9

Please sign in to comment.