Skip to content

Commit cdbcd2a

Browse files
authored
Merge branch 'main' into serve_exaples_locally
2 parents 441747e + c7b935f commit cdbcd2a

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

CHANGES.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
Changelog
22
=========
33

4-
- Serve examples locally for faster and offline development.
54
- Upgrade to Bootstrap Icons 1.11.3.
65

7-
86
2.4.1
97
-----
108

@@ -68,7 +66,7 @@ Release date: 2022/11/20
6866

6967
- Drop Python 3.6 support, and test against Python 3.10.
7068
- Add support for strict Content Security Policy (CSP) (`#252 <https://github.com/helloflask/bootstrap-flask/pull/252>`__)
71-
- Upgrade to Bootstrap 5.2.2, Popper 2.11.6, Bootswatch 5.2.2, and Boostrap Icons 1.9.1.
69+
- Upgrade to Bootstrap 5.2.2, Popper 2.11.6, Bootswatch 5.2.2, and Bootstrap Icons 1.9.1.
7270
- Fix Flask-SQLAlchemy ``paginate`` named parameters in tests and examples.
7371
- Support to preview available Bootswatch theme in the example application.
7472
- Remove ``.DS_Store`` files from the distribution files.

flask_bootstrap/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,18 +108,18 @@ def load_css(self, version=None, bootstrap_sri=None, bootswatch_theme=None):
108108
base_path = 'css'
109109
else:
110110
base_path = f'css/bootswatch/{bootswatch_theme.lower()}'
111-
boostrap_url = url_for('bootstrap.static', filename=f'{base_path}/{self.bootstrap_css_filename}')
111+
bootstrap_url = url_for('bootstrap.static', filename=f'{base_path}/{self.bootstrap_css_filename}')
112112
else:
113113
if not bootswatch_theme:
114114
base_path = f'{CDN_BASE}/bootstrap@{version}/dist/css'
115115
else:
116116
base_path = f'{CDN_BASE}/bootswatch@{version}/dist/{bootswatch_theme.lower()}'
117-
boostrap_url = f'{base_path}/{self.bootstrap_css_filename}'
117+
bootstrap_url = f'{base_path}/{self.bootstrap_css_filename}'
118118

119119
if bootstrap_sri and not bootswatch_theme:
120-
css = f'<link rel="stylesheet" href="{boostrap_url}" integrity="{bootstrap_sri}" crossorigin="anonymous">'
120+
css = f'<link rel="stylesheet" href="{bootstrap_url}" integrity="{bootstrap_sri}" crossorigin="anonymous">'
121121
else:
122-
css = f'<link rel="stylesheet" href="{boostrap_url}">'
122+
css = f'<link rel="stylesheet" href="{bootstrap_url}">'
123123
return Markup(css)
124124

125125
def _get_js_script(self, version, name, sri, nonce):

0 commit comments

Comments
 (0)