Skip to content

Commit

Permalink
Merge pull request #310 from PanderMusubi/bootstrap-531
Browse files Browse the repository at this point in the history
  • Loading branch information
greyli authored Sep 17, 2023
2 parents 0533edb + 6cd4ef8 commit 02093bf
Show file tree
Hide file tree
Showing 107 changed files with 44,958 additions and 15,503 deletions.
2 changes: 2 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ Changelog

Release date: -

- Upgrade to Bootstrap 5.3.1 and Bootswatch 5.3.1


2.3.0
-----
Expand Down
50 changes: 25 additions & 25 deletions examples/bootstrap5/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,31 +97,31 @@ class BootswatchForm(FlaskForm):
default='default',
choices=[
('default', 'none'),
('cerulean', 'Cerulean 5.1.3'),
('cosmo', 'Cosmo 5.1.3'),
('cyborg', 'Cyborg 5.1.3'),
('darkly', 'Darkly 5.1.3'),
('flatly', 'Flatly 5.1.3'),
('journal', 'Journal 5.1.3'),
('litera', 'Litera 5.1.3'),
('lumen', 'Lumen 5.1.3'),
('lux', 'Lux 5.1.3'),
('materia', 'Materia 5.1.3'),
('minty', 'Minty 5.1.3'),
('morph', 'Morph 5.1.3'),
('pulse', 'Pulse 5.1.3'),
('quartz', 'Quartz 5.1.3'),
('sandstone', 'Sandstone 5.1.3'),
('simplex', 'Simplex 5.1.3'),
('sketchy', 'Sketchy 5.1.3'),
('slate', 'Slate 5.1.3'),
('solar', 'Solar 5.1.3'),
('spacelab', 'Spacelab 5.1.3'),
('superhero', 'Superhero 5.1.3'),
('united', 'United 5.1.3'),
('vapor', 'Vapor 5.1.3'),
('yeti', 'Yeti 5.1.3'),
('zephyr', 'Zephyr 5.1.3'),
('cerulean', 'Cerulean 5.3.1'),
('cosmo', 'Cosmo 5.3.1'),
('cyborg', 'Cyborg 5.3.1'),
('darkly', 'Darkly 5.3.1'),
('flatly', 'Flatly 5.3.1'),
('journal', 'Journal 5.3.1'),
('litera', 'Litera 5.3.1'),
('lumen', 'Lumen 5.3.1'),
('lux', 'Lux 5.3.1'),
('materia', 'Materia 5.3.1'),
('minty', 'Minty 5.3.1'),
('morph', 'Morph 5.3.1'),
('pulse', 'Pulse 5.3.1'),
('quartz', 'Quartz 5.3.1'),
('sandstone', 'Sandstone 5.3.1'),
('simplex', 'Simplex 5.3.1'),
('sketchy', 'Sketchy 5.3.1'),
('slate', 'Slate 5.3.1'),
('solar', 'Solar 5.3.1'),
('spacelab', 'Spacelab 5.3.1'),
('superhero', 'Superhero 5.3.1'),
('united', 'United 5.3.1'),
('vapor', 'Vapor 5.3.1'),
('yeti', 'Yeti 5.3.1'),
('zephyr', 'Zephyr 5.3.1'),
]
)
submit = SubmitField()
Expand Down
6 changes: 3 additions & 3 deletions flask_bootstrap/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -259,10 +259,10 @@ def create_app():
.. versionadded:: 2.0.0
"""
bootstrap_version = '5.3.0'
bootstrap_version = '5.3.1'
popper_version = '2.11.8'
bootstrap_css_integrity = 'sha384-9ndCyUaIbzAi2FUVXJi0CjmCapSmO7SnpJef0486qhLnuZ2cdeRhO02iuK6FUUVM'
bootstrap_js_integrity = 'sha384-fbbOQedDUMZZ5KreZpsbe1LCZPVmfTnH7ois6mU1QK+m14rQ1l2bGBq41eYeM/fS'
bootstrap_css_integrity = 'sha384-4bw+/aepP/YC94hEpVNVgiZdgIC5+VKNBQNGCHeKRQN+PtmoHDEXuppvnDJzQIu9'
bootstrap_js_integrity = 'sha384-Rx+T1VzGupg4BHQYs2gCW9It+akI2MM/mndMCy36UVfodzcJcF0GGLxZIzObiEfa'
popper_integrity = 'sha384-I7E8VVD/ismYTF4hNIPjVp/Zjvgyol6VFvRkX/vR+Vc4jQkC+hVqc2pM8ODewa9r'
popper_name = '@popperjs/core'
static_folder = 'bootstrap5'
Expand Down
4 changes: 2 additions & 2 deletions flask_bootstrap/static/bootstrap5/css/bootstrap.min.css

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
// Cerulean 5.2.2
// Cerulean 5.3.1
// Bootswatch


// Variables

$text-shadow: 0 1px 0 rgba(0, 0, 0, .05) !default;

:root {
color-scheme: light;
}

// Mixins

@mixin btn-shadow($color){
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Cerulean 5.2.2
// Cerulean 5.3.1
// Bootswatch

$theme: "cerulean" !default;
Expand Down
Loading

0 comments on commit 02093bf

Please sign in to comment.