Commit 2629fd853c638d417c2e57c43b40dc10a05c6c28
1 parent
9734364e
Exists in
master
and in
1 other branch
remove explicit popper.js dependency and use bootstrap.bundle instead
Showing
6 changed files
with
11 additions
and
12 deletions
Show diff stats
package.json
| @@ -3,12 +3,11 @@ | @@ -3,12 +3,11 @@ | ||
| 3 | "email": "mjsb@uevora.pt", | 3 | "email": "mjsb@uevora.pt", |
| 4 | "dependencies": { | 4 | "dependencies": { |
| 5 | "@fortawesome/fontawesome-free": "^5.15.1", | 5 | "@fortawesome/fontawesome-free": "^5.15.1", |
| 6 | - "bootstrap": "^4.5.3", | 6 | + "bootstrap": "^4.5", |
| 7 | "codemirror": "^5.58.1", | 7 | "codemirror": "^5.58.1", |
| 8 | "datatables": "^1.10", | 8 | "datatables": "^1.10", |
| 9 | "jquery": "^3.5.1", | 9 | "jquery": "^3.5.1", |
| 10 | "mathjax": "^3.1.2", | 10 | "mathjax": "^3.1.2", |
| 11 | - "popper.js": "^1.16.1", | ||
| 12 | "underscore": "^1.11.0" | 11 | "underscore": "^1.11.0" |
| 13 | } | 12 | } |
| 14 | } | 13 | } |
perguntations/templates/admin.html
| @@ -21,9 +21,9 @@ | @@ -21,9 +21,9 @@ | ||
| 21 | 21 | ||
| 22 | <!-- Scripts --> | 22 | <!-- Scripts --> |
| 23 | <script src="/static/jquery/jquery.min.js"></script> | 23 | <script src="/static/jquery/jquery.min.js"></script> |
| 24 | - <script defer src="/static/popper.js/popper.min.js"></script> | 24 | + <!-- <script defer src="/static/popper.js/popper.min.js"></script> --> |
| 25 | <script defer src="/static/fontawesome-free/js/all.min.js"></script> | 25 | <script defer src="/static/fontawesome-free/js/all.min.js"></script> |
| 26 | - <script defer src="/static/bootstrap/js/bootstrap.min.js"></script> | 26 | + <script defer src="/static/bootstrap/js/bootstrap.bundle.min.js"></script> |
| 27 | <script defer src="/static/datatables/js/jquery.dataTables.min.js"></script> | 27 | <script defer src="/static/datatables/js/jquery.dataTables.min.js"></script> |
| 28 | <script defer src="/static/underscore/underscore-min.js"></script> | 28 | <script defer src="/static/underscore/underscore-min.js"></script> |
| 29 | <script defer src="/static/js/admin.js"></script> | 29 | <script defer src="/static/js/admin.js"></script> |
perguntations/templates/grade.html
| @@ -13,9 +13,9 @@ | @@ -13,9 +13,9 @@ | ||
| 13 | 13 | ||
| 14 | <!-- Scripts --> | 14 | <!-- Scripts --> |
| 15 | <script src="/static/jquery/jquery.min.js"></script> | 15 | <script src="/static/jquery/jquery.min.js"></script> |
| 16 | - <script defer src="/static/popper.js/popper.min.js"></script> | 16 | + <!-- <script defer src="/static/popper.js/popper.min.js"></script> --> |
| 17 | <script defer src="/static/fontawesome-free/js/all.min.js"></script> | 17 | <script defer src="/static/fontawesome-free/js/all.min.js"></script> |
| 18 | - <script defer src="/static/bootstrap/js/bootstrap.min.js"></script> | 18 | + <script defer src="/static/bootstrap/js/bootstrap.bundle.min.js"></script> |
| 19 | </head> | 19 | </head> |
| 20 | <!-- ================================================================= --> | 20 | <!-- ================================================================= --> |
| 21 | <body> | 21 | <body> |
perguntations/templates/login.html
| @@ -12,9 +12,9 @@ | @@ -12,9 +12,9 @@ | ||
| 12 | 12 | ||
| 13 | <!-- Scripts --> | 13 | <!-- Scripts --> |
| 14 | <script src="/static/jquery/jquery.min.js"></script> | 14 | <script src="/static/jquery/jquery.min.js"></script> |
| 15 | - <script defer src="/static/popper.js/popper.min.js"></script> | 15 | + <!-- <script defer src="/static/popper.js/popper.min.js"></script> --> |
| 16 | <script defer src="/static/fontawesome-free/js/all.min.js"></script> | 16 | <script defer src="/static/fontawesome-free/js/all.min.js"></script> |
| 17 | - <script defer src="/static/bootstrap/js/bootstrap.min.js"></script> | 17 | + <script defer src="/static/bootstrap/js/bootstrap.bundle.min.js"></script> |
| 18 | 18 | ||
| 19 | </head> | 19 | </head> |
| 20 | <!-- =================================================================== --> | 20 | <!-- =================================================================== --> |
perguntations/templates/review.html
| @@ -28,9 +28,9 @@ | @@ -28,9 +28,9 @@ | ||
| 28 | 28 | ||
| 29 | <!-- Scripts --> | 29 | <!-- Scripts --> |
| 30 | <script src="/static/jquery/jquery.min.js"></script> | 30 | <script src="/static/jquery/jquery.min.js"></script> |
| 31 | - <script defer src="/static/popper.js/popper.min.js"></script> | 31 | + <!-- <script defer src="/static/popper.js/popper.min.js"></script> --> |
| 32 | <script defer src="/static/fontawesome-free/js/all.min.js"></script> | 32 | <script defer src="/static/fontawesome-free/js/all.min.js"></script> |
| 33 | - <script defer src="/static/bootstrap/js/bootstrap.min.js"></script> | 33 | + <script defer src="/static/bootstrap/js/bootstrap.bundle.min.js"></script> |
| 34 | </head> | 34 | </head> |
| 35 | <!-- ===================================================================== --> | 35 | <!-- ===================================================================== --> |
| 36 | <body> | 36 | <body> |
perguntations/templates/test.html
| @@ -21,9 +21,9 @@ | @@ -21,9 +21,9 @@ | ||
| 21 | 21 | ||
| 22 | <!-- Scripts --> | 22 | <!-- Scripts --> |
| 23 | <script src="/static/jquery/jquery.min.js"></script> | 23 | <script src="/static/jquery/jquery.min.js"></script> |
| 24 | - <script defer src="/static/popper.js/popper.min.js"></script> | 24 | + <!-- <script defer src="/static/popper.js/popper.min.js"></script> --> |
| 25 | <script defer src="/static/fontawesome-free/js/all.min.js"></script> | 25 | <script defer src="/static/fontawesome-free/js/all.min.js"></script> |
| 26 | - <script defer src="/static/bootstrap/js/bootstrap.min.js"></script> | 26 | + <script defer src="/static/bootstrap/js/bootstrap.bundle.min.js"></script> |
| 27 | <script defer src="/static/underscore/underscore-min.js"></script> | 27 | <script defer src="/static/underscore/underscore-min.js"></script> |
| 28 | <script src="/static/codemirror/lib/codemirror.js"></script> | 28 | <script src="/static/codemirror/lib/codemirror.js"></script> |
| 29 | <script src="/static/codemirror/addon/selection/active-line.js"></script> | 29 | <script src="/static/codemirror/addon/selection/active-line.js"></script> |