Skip to content

Commit ca3c4bc

Browse files
authored
Upgrade Bootstrap from version 3 to 5. (#1442)
See #1442 for commit history.
1 parent b80bd3a commit ca3c4bc

226 files changed

Lines changed: 13125 additions & 3927 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ aplus/secret_key.py
1717
*.sublime-workspace
1818

1919
venv/
20+
venv_aplus/
2021
/static/
2122
/media/
2223

aplus/settings.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
BRAND_INSTITUTION_NAME = 'Aalto University'
7979
BRAND_INSTITUTION_NAME_FI = 'Aalto-yliopisto'
8080

81-
WELCOME_TEXT = 'Welcome to A+ <small>modern learning environment</small>'
81+
WELCOME_TEXT = 'Welcome to A+ <small class="text-body-secondary">modern learning environment</small>'
8282
SHIBBOLETH_TITLE_TEXT = 'Aalto University users'
8383
SHIBBOLETH_BODY_TEXT = (
8484
'Log in with your Aalto University user account by clicking on the button below. '
@@ -100,7 +100,7 @@
100100
'For additional information, please see <a href="{privacy_url}">the privacy notice</a>.'
101101
)
102102

103-
WELCOME_TEXT_FI = 'A+ <small>verkkopohjainen oppimisympäristö</small>'
103+
WELCOME_TEXT_FI = 'A+ <small class="text-body-secondary">verkkopohjainen oppimisympäristö</small>'
104104
SHIBBOLETH_TITLE_TEXT_FI = 'Aalto-yliopiston käyttäjät'
105105
SHIBBOLETH_BODY_TEXT_FI = (
106106
'Kirjaudu palveluun Aalto-yliopiston käyttäjätunnuksella alla olevasta painikkeesta. '
@@ -166,7 +166,7 @@
166166
'django.forms',
167167

168168
# 3rd party applications
169-
'bootstrapform',
169+
'django_bootstrap5',
170170
'rest_framework',
171171
'rest_framework.authtoken',
172172
'pylti1p3.contrib.django.lti1p3_tool_config',

apps/templates/plugins/rss.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<h3>{{ title }} <small><a href="{{ feed.link }}">[www]</a> <a href="{{ plugin.feed_url }}">[rss]</a></small></h3>
1+
<h3>{{ title }} <small class="text-body-secondary"><a href="{{ feed.link }}">[www]</a> <a href="{{ plugin.feed_url }}">[rss]</a></small></h3>
22
<ul class="rss-feed">
33
{% for entry in entries %}
44
<li>

assets/css/main.css

Lines changed: 29 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/css/main.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/css/vendor/bootstrap-icons/bootstrap-icons.css

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/css/vendor/bootstrap-icons/bootstrap-icons.css.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/css/vendor/bootstrap-icons/bootstrap-icons.min.css

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/css/vendor/bootstrap-icons/bootstrap-icons.min.css.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/css/vendor/bootstrap5/bootstrap-grid.css

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)