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.

Sign up for GitHub

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

fixed typo in Bootstrap in code and CHANGES.rst #378

Merged
merged 1 commit into from
Feb 16, 2025
Merged

fixed typo in Bootstrap in code and CHANGES.rst #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 1 deletion CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Changelog
=========

- Fixed typo in Bootstrap in code and CHANGES.rst.
- Upgrade to Bootstrap Icons 1.11.3.


Expand Down Expand Up @@ -67,7 +68,7 @@ Release date: 2022/11/20

- Drop Python 3.6 support, and test against Python 3.10.
- Add support for strict Content Security Policy (CSP) (`#252 <https://github.com/helloflask/bootstrap-flask/pull/252>`__)
- Upgrade to Bootstrap 5.2.2, Popper 2.11.6, Bootswatch 5.2.2, and Boostrap Icons 1.9.1.
- Upgrade to Bootstrap 5.2.2, Popper 2.11.6, Bootswatch 5.2.2, and Bootstrap Icons 1.9.1.
- Fix Flask-SQLAlchemy ``paginate`` named parameters in tests and examples.
- Support to preview available Bootswatch theme in the example application.
- Remove ``.DS_Store`` files from the distribution files.
Expand Down
8 changes: 4 additions & 4 deletions flask_bootstrap/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,18 +108,18 @@ def load_css(self, version=None, bootstrap_sri=None, bootswatch_theme=None):
base_path = 'css'
else:
base_path = f'css/bootswatch/{bootswatch_theme.lower()}'
boostrap_url = url_for('bootstrap.static', filename=f'{base_path}/{self.bootstrap_css_filename}')
bootstrap_url = url_for('bootstrap.static', filename=f'{base_path}/{self.bootstrap_css_filename}')
else:
if not bootswatch_theme:
base_path = f'{CDN_BASE}/bootstrap@{version}/dist/css'
else:
base_path = f'{CDN_BASE}/bootswatch@{version}/dist/{bootswatch_theme.lower()}'
boostrap_url = f'{base_path}/{self.bootstrap_css_filename}'
bootstrap_url = f'{base_path}/{self.bootstrap_css_filename}'

if bootstrap_sri and not bootswatch_theme:
css = f'<link rel="stylesheet" href="{boostrap_url}" integrity="{bootstrap_sri}" crossorigin="anonymous">'
css = f'<link rel="stylesheet" href="{bootstrap_url}" integrity="{bootstrap_sri}" crossorigin="anonymous">'
else:
css = f'<link rel="stylesheet" href="{boostrap_url}">'
css = f'<link rel="stylesheet" href="{bootstrap_url}">'
return Markup(css)

def _get_js_script(self, version, name, sri, nonce):
Expand Down
Loading