Upgrade to Bootstrap 5 #458
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sea-kelp
commented
Jun 17, 2024
| @@ -82,7 +82,7 @@ repos: | |||
| - --quiet | |||
|
|
|||
| - repo: https://github.com/PyCQA/flake8 | |||
| rev: 6.0.0 | |||
| rev: 7.0.0 | |||
There was a problem hiding this comment.
Needed since the old version was incorrectly flagging correct f-string syntax
| @@ -60,7 +60,7 @@ def before_request(): | |||
| and not current_user.confirmed | |||
| and request.endpoint | |||
| and request.endpoint[:5] != "auth." | |||
| and request.endpoint != "static" | |||
| and request.endpoint not in ["static", "bootstrap.static"] | |||
There was a problem hiding this comment.
Exclude the bootstrap.static folder (used by the new bootstrap-flask dependency to serve assets) so stylesheets and scripts load correctly when the user is unconfirmed
| @@ -23,6 +23,7 @@ | |||
| class BaseConfig: | |||
| def __init__(self): | |||
| # App Settings | |||
| self.BOOTSTRAP_SERVE_LOCAL = True | |||
There was a problem hiding this comment.
Serve Bootstrap assets locally instead of from a CDN
Comment on lines
+25
to
+26
| <div id="step-1" | ||
| class="card mb-5" |
There was a problem hiding this comment.
Replacing the step-by-step dialogue in favor with a fully laid-out form since the old version was broken by the upgrade and this reduces user clicks and increases form completion
3 tasks
AetherUnbound
approved these changes
Jun 22, 2024
michplunkett
pushed a commit
to lucyparsons/OpenOversight
that referenced
this pull request
Jun 25, 2024
## Description of Changes *This change is cherry-picked from OrcaCollective#458 Upgrade to Bootstrap 5 in preparation for upcoming changes. Everything looks slightly different due to changes in the bootstrap framework. ## Notes for Deployment None ## Screenshots (if appropriate)  ## Tests and Linting Manually checked that all pages look roughly reasonably similar to the previous look - [x] This branch is up-to-date with the `develop` branch. - [x] `pytest` passes on my local development environment. - [x] `pre-commit` passes on my local development environment.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of Changes
Upgrade to Bootstrap 5 in preparation for upcoming changes. Everything looks slightly different due to changes in the bootstrap framework.
Notes for Deployment
None
Screenshots (if appropriate)
Tests and linting
Manually checked that all pages look roughly reasonably similar to the previous look
I have rebased my changes on
mainjust lintpassesjust testpasses