Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use native font stack / remove vendored open-sans + lato fonts #285

Merged
merged 13 commits into from
Mar 11, 2021
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions docs/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,9 @@ of the theme. The current font selections are:

- allowing upgrades to be handled in a relatively sane, manageable way

Currently, only `FontAwesome 5 Free <https://fontawesome.com/icons?m=free>`__ is
vendored (other fonts like Lato are no longer included by default).
The FontAwesome icons are used for :ref:`icon links <icon-links>` and admonitions.

Upgrading a font
^^^^^^^^^^^^^^^^
Expand Down
2 changes: 2 additions & 0 deletions docs/user_guide/configuring.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ If you'd like it to link to another page or use an external link instead, use th
}


.. _icon-links:

Configure icon links
====================

Expand Down
2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
},
"dependencies": {
"@fortawesome/fontawesome-free": "^5.13.0",
"@openfonts/lato_latin-ext": "^1.44.1",
"@openfonts/open-sans_all": "^1.44.1",
"bootstrap": "^4.4.1",
"jquery": "3.5.1",
"optimize-css-assets-webpack-plugin": "^5.0.3",
Expand Down

Large diffs are not rendered by default.

10 changes: 8 additions & 2 deletions pydata_sphinx_theme/static/css/theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,14 @@
/*****************************************************************************
* Font family
**/
--pst-font-family-base: 'Lato', sans-serif;
--pst-font-family-heading: 'Open Sans', sans-serif;
/* 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-base: var(--pst-font-family-base-system);
--pst-font-family-heading: var(--pst-font-family-base);
--pst-font-family-monospace-system: "SFMono-Regular", Menlo, Consolas, Monaco,
Liberation Mono, Lucida Console, monospace;
bollwyvl marked this conversation as resolved.
Show resolved Hide resolved
--pst-font-family-monospace: var(--pst-font-family-monospace-system);

/*****************************************************************************
* Color
Expand Down
20 changes: 0 additions & 20 deletions pydata_sphinx_theme/static/vendor/lato_latin-ext/1.44.1/LICENSE.md

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
120 changes: 0 additions & 120 deletions pydata_sphinx_theme/static/vendor/lato_latin-ext/1.44.1/index.css

This file was deleted.

20 changes: 0 additions & 20 deletions pydata_sphinx_theme/static/vendor/open-sans_all/1.44.1/LICENSE.md

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
120 changes: 0 additions & 120 deletions pydata_sphinx_theme/static/vendor/open-sans_all/1.44.1/index.css

This file was deleted.

10 changes: 3 additions & 7 deletions pydata_sphinx_theme/static/webpack-macros.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,17 @@
{% endmacro %}

{% macro head_pre_fonts() %}
<link rel="stylesheet"
href="{{ pathto('_static/vendor/open-sans_all/1.44.1/index.css', 1) }}">
<link rel="stylesheet"
href="{{ pathto('_static/vendor/lato_latin-ext/1.44.1/index.css', 1) }}">
{% endmacro %}

{% macro head_pre_bootstrap() %}
<link href="{{ pathto('_static/css/theme.css', 1) }}" rel="stylesheet" />
<link href="{{ pathto('_static/css/index.57d3cd9fdfd1e83932aa4eb4774f9fb9.css', 1) }}" rel="stylesheet" />
<link href="{{ pathto('_static/css/index.b847ed1d286ca3a9dcab2f5fac6be5cb.css', 1) }}" rel="stylesheet" />
{% endmacro %}

{% macro head_js_preload() %}
<link rel="preload" as="script" href="{{ pathto('_static/js/index.109f8ec7af5a9d176fcd.js', 1) }}">
<link rel="preload" as="script" href="{{ pathto('_static/js/index.0a9f29206eb557768251.js', 1) }}">
{% endmacro %}

{% macro body_post() %}
<script src="{{ pathto('_static/js/index.109f8ec7af5a9d176fcd.js', 1) }}"></script>
<script src="{{ pathto('_static/js/index.0a9f29206eb557768251.js', 1) }}"></script>
{% endmacro %}
7 changes: 7 additions & 0 deletions src/scss/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,13 @@ hr {
border-top: 1px solid #e5e5e5;
}

pre,
code,
kbd,
samp {
font-family: var(--font-family-monospace);
}

pre {
margin: 1.5em 0 1.5em 0;
padding: 10px;
Expand Down
Loading