Skip to content

Commit

Permalink
Merge pull request #221 from mbari-org/revert-219-ksalamy-smdb
Browse files Browse the repository at this point in the history
Revert "Fixing an overwrite of Mike's changes today downgrading Bootstrap to 4."
  • Loading branch information
MBARIMike authored May 21, 2024
2 parents f9d8a5d + ad2277c commit f657fdd
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions smdb/smdb/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<link rel="icon" type="image/png" href="{% static 'images/favicons/smdb_favicon_ship.ico' %}">

{% block css %}
{# Other Django packages depend on Bootstrap 4 #}
<link href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
{# Latest compiled and minified Bootstrap CSS #}
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
{# Add leaflet CSS #}
<link rel="stylesheet" type="text/css" href="https://unpkg.com/[email protected]/dist/leaflet.css">
<link rel="stylesheet" href="https://unpkg.com/@geoman-io/leaflet-geoman-free@latest/dist/leaflet-geoman.css">
Expand All @@ -49,8 +49,8 @@
integrity="sha384-7+zCNj/IqJ95wo16oMtfsKbZ9ccEh31eOz1HGyDuCQ6wgnyJNSYdrPa03rtR1zdB"
crossorigin="anonymous"></script>

<script defer src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"
integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js"
integrity="sha384-QJHtvGhmr9XOIpI6YVutG+2QOK9T+ZnN4kzFN1RtK3zEFEIsxhlmWl5/YESvpZ13"
crossorigin="anonymous"></script>

{# Your stuff: Third-party javascript libraries go here #}
Expand Down

0 comments on commit f657fdd

Please sign in to comment.