diff --git a/.gitignore b/.gitignore index 6d526935..479c74b2 100644 --- a/.gitignore +++ b/.gitignore @@ -105,3 +105,6 @@ ENV/ # VSCode .vscode/ + +# Other +.DS_Store diff --git a/CHANGES.rst b/CHANGES.rst index f08537f2..5feb483d 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -9,7 +9,13 @@ Release date: - - Drop Python 2 and 3.5 support. - Combine ``class`` argument of ``render_field`` or ``field.render_kw.class`` with Bootstrap classes - (`#159 `__). + (`#159 `__). +- Add initial support for Bootstrap 5 (`#161 `__): + - Add ``Bootstrap4`` class and deprecate ``Bootstrap``. + - Add ``Bootstrap5`` class for Bootstrap 5 support. + - Move Bootstrap 4-related files to ``bootstrap4`` subfolder, and deprecate template path ``bootstrap/``. + - Bootstrap 4 macros are in the ``bootstrap4/`` template folder, and Bootstrap 5 macros are in ``bootstrap5/``. + - Add seperate tests, templates, static files, and examples for Bootstrap 5. 1.8.0 diff --git a/README.md b/README.md index 8ea410af..3d70b7e4 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![Build status](https://github.com/greyli/bootstrap-flask/workflows/build/badge.svg)](https://github.com/greyli/bootstrap-flask/actions) [![Coverage Status](https://coveralls.io/repos/github/greyli/bootstrap-flask/badge.svg?branch=master)](https://coveralls.io/github/greyli/bootstrap-flask?branch=master) -Bootstrap 4 helper for Flask/Jinja2. +Bootstrap-Flask is a collection of Jinja macros for Bootstrap and Flask. It helps you to render Flask-related objects and data to Bootstrap HTML more easily. If you come from Flask-Bootstrap, check out [this tutorial](https://bootstrap-flask.readthedocs.io/en/stable/migrate.html) on how to migrate to this extension. @@ -22,5 +22,3 @@ If you come from Flask-Bootstrap, check out [this tutorial](https://bootstrap-fl This project is licensed under the MIT License (see the `LICENSE` file for details). - -Some macros were part of [Flask-Bootstrap](https://github.com/mbr/flask-bootstrap) and were modified under the terms of its BSD License. diff --git a/docs/_templates/sidebarintro.html b/docs/_templates/sidebarintro.html index f2a81275..43f1b08e 100644 --- a/docs/_templates/sidebarintro.html +++ b/docs/_templates/sidebarintro.html @@ -1,8 +1,6 @@

About

- Bootstrap 4 helper for Flask/Jinja2. - Based on Flask-Bootstrap, -but lighter and better. + Bootstrap helper for Flask.

Useful Links