Skip to content

Commit

Permalink
Update to Bootstrap 5.3.3 (#33)
Browse files Browse the repository at this point in the history
* Update to Bootstrap 5.3.3
* Remove support for python 3.9
  • Loading branch information
daniviga authored Apr 9, 2024
1 parent 4b74a69 commit b37f542
Show file tree
Hide file tree
Showing 12 changed files with 28 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/django.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
max-parallel: 2
matrix:
python-version: ['3.9', '3.10', '3.11', '3.12']
python-version: ['3.10', '3.11', '3.12']

steps:
- uses: actions/checkout@v3
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ __pycache__/
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ It has been developed with:

## Requirements

- Python 3.9+
- Python 3.10+
- A USB port when running Arduino hardware (and adaptors if you have a Mac)

## Web portal installation
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/*!
* Bootstrap Icons v1.11.1 (https://icons.getbootstrap.com/)
* Copyright 2019-2023 The Bootstrap Authors
* Bootstrap Icons v1.11.3 (https://icons.getbootstrap.com/)
* Copyright 2019-2024 The Bootstrap Authors
* Licensed under MIT (https://github.com/twbs/icons/blob/main/LICENSE)
*/

@font-face {
font-display: block;
font-family: "bootstrap-icons";
src: url("./fonts/bootstrap-icons.woff2?2820a3852bdb9a5832199cc61cec4e65") format("woff2"),
url("./fonts/bootstrap-icons.woff?2820a3852bdb9a5832199cc61cec4e65") format("woff");
src: url("./fonts/bootstrap-icons.woff2?dd67030699838ea613ee6dbda90effa6") format("woff2"),
url("./fonts/bootstrap-icons.woff?dd67030699838ea613ee6dbda90effa6") format("woff");
}

.bi::before,
Expand Down
Binary file not shown.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions ram/portal/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
<link rel="icon" href="{% static "favicon.png" %}" sizes="any">
<link rel="icon" href="{% static "favicon.svg" %}" type="image/svg+xml">
{% if site_conf.use_cdn %}
<link href="https://cdn.jsdelivr.net/npm/[email protected].2/dist/css/bootstrap.min.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/npm/[email protected].1/font/bootstrap-icons.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/npm/[email protected].3/dist/css/bootstrap.min.css" rel="stylesheet">
<link href="https://cdn.jsdelivr.net/npm/[email protected].3/font/bootstrap-icons.css" rel="stylesheet">
{% else %}
<link href="{% static "[email protected].2/dist/css/bootstrap.min.css" %}" rel="stylesheet">
<link href="{% static "[email protected].1/font/bootstrap-icons.css" %}" rel="stylesheet">
<link href="{% static "[email protected].3/dist/css/bootstrap.min.css" %}" rel="stylesheet">
<link href="{% static "[email protected].3/font/bootstrap-icons.css" %}" rel="stylesheet">
{% endif %}
<link href="{% static "css/main.css" %}?v={{ site_conf.version }}" rel="stylesheet">
<style>
Expand Down Expand Up @@ -216,9 +216,9 @@ <h1 class="fw-light">{{ title }}</h1>
</main>
{% include 'includes/footer.html' %}
{% if site_conf.use_cdn %}
<script src="https://cdn.jsdelivr.net/npm/[email protected].2/dist/js/bootstrap.bundle.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected].3/dist/js/bootstrap.bundle.min.js"></script>
{% else %}
<script src="{% static "[email protected].2/dist/js/bootstrap.bundle.min.js" %}"></script>
<script src="{% static "[email protected].3/dist/js/bootstrap.bundle.min.js" %}"></script>
{% endif %}
</body>
</html>
2 changes: 1 addition & 1 deletion ram/ram/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from ram.utils import git_suffix

__version__ = "0.11.0"
__version__ = "0.11.1"
__version__ += git_suffix(__file__)

0 comments on commit b37f542

Please sign in to comment.