*: update to Bootstrap 5

This commit is contained in:
IkiWiki 2024-09-10 21:07:45 -04:00
parent 6f3374233e
commit 43f971be92
Signed by untrusted user who does not match committer: forge
GPG key ID: D62A472A4AA7D541
14 changed files with 191 additions and 206 deletions

View file

@ -30,7 +30,7 @@
<!-- Bootstrap core CSS -->
<!-- those checksums can be verified with: shasum -b -a 384 $file | xxd -r -p | base64 -->
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous" />
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
<!-- Custom styles for this template -->
<link href="<TMPL_VAR BASEURL>bootstrap.local.css" rel="stylesheet" />
@ -62,30 +62,21 @@
</head>
<body>
<nav class="navbar navbar-default navbar-fixed-top">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="<TMPL_VAR BASEURL>">
<nav class="navbar fixed-top navbar-expand-lg navbar-light bg-light border">
<div class="container-fluid">
<a class="navbar-brand me-auto" href="<TMPL_VAR BASEURL>">
<img alt="<TMPL_VAR WIKINAME>" src="<TMPL_VAR BASEURL>favicon.png" width="48" height="48" />
</a>
</div>
<div id="navbar" class="collapse navbar-collapse">
<TMPL_IF OTHERLANGUAGES>
<div class="dropdown language-switcher-top navbar-left">
<button class="btn language-switcher dropdown-toggle" type="button" id="language-menu-top" data-toggle=
"dropdown" aria-haspopup="true" aria-expanded="true">
<TMPL_VAR LANG_NAME>
<img src="<TMPL_VAR BASEURL>wikiicons/languages.png">
</button>
<ul class="dropdown-menu" aria-labelledby="language-menu-top">
<div class="dropdown ps-2 pe-2">
<button class="btn language-switcher dropdown" type="button" id="language-menu-top" data-bs-toggle="dropdown" aria-expanded="false">
<div class="collapse navbar-collapse float-end ms-1" id="navbar">
<TMPL_VAR LANG_NAME>
</div>
<img src="<TMPL_VAR BASEURL>wikiicons/languages.png">
</button>
<ul class="dropdown-menu dropdown-menu-end dropdown-menu-lg-start" aria-labelledby="language-menu-top">
<TMPL_LOOP OTHERLANGUAGES>
<li>
<a href="<TMPL_VAR URL>"><TMPL_VAR LANGUAGE></a>
@ -95,6 +86,14 @@
</div>
</TMPL_IF>
<button class="navbar-toggler collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#navbar" aria-controls="navbarScroll" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div id="navbar" class="collapse navbar-collapse">
<TMPL_IF SIDEBAR>
<TMPL_VAR SIDEBAR>
</TMPL_IF>
@ -220,19 +219,15 @@
</span>
</div>
<TMPL_IF HTML5><nav class="navbar navbar-default">
<TMPL_ELSE>
<div class="navbar navbar-default">
</TMPL_IF>
<div class="navbar-brand"><span class="glyphicon glyphicon-search" aria-hidden="true"></span></div>
<nav class="navbar navbar-expand-lg navbar-light bg-light border">
<div class="navbar-brand">
<img src="<TMPL_VAR BASEURL>wikiicons/languages.png">
</div>
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-footer" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<div class="navbar navbar-expand-lg navbar-light border">
<button class="navbar-toggler collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#navbar-footer" aria-controls="navbarScroll" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
</div>
@ -241,7 +236,7 @@
<TMPL_VAR SEARCHFORM>
</TMPL_IF>
<ul class="nav navbar-nav navbar-right">
<ul class="nav navbar-nav nav-link">
<TMPL_IF TAGS>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Tags <span class="caret"></span></a>
@ -313,7 +308,7 @@
</TMPL_UNLESS>
</div> <!-- /container -->
<footer class="footer" role="contentinfo">
<footer class="footer pb-3 pt-3" role="contentinfo">
<div class="container">
<TMPL_IF FOOTER>
@ -327,8 +322,8 @@
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="https://code.jquery.com/jquery-3.2.1.min.js" crossorigin="anonymous" integrity="sha384-xBuQ/xzmlsLoJpyjoggmTEz8OWUFM0/RC5BsqQBDX2v5cMvDHcMakNTNrHIW2I5f"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" crossorigin="anonymous" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"></script>
<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.6/dist/umd/popper.min.js" integrity="sha384-oBqDVmMz9ATKxIep9tiCxS/Z9fNfEXiDAYTujMAeBAsjFuCZSmKbSSUnQlmh/jp3" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-kenU1KFdBIe4zVF0s0G1M5b4hcpxyD9F7jL+jjXkk+Q2h455rYXK/7HAuoJl+0I4" crossorigin="anonymous"></script>
<!-- TODO: Find other ways to setup analytics
<script data-goatcounter="https://analytics.anarc.at/count" async src="//analytics.anarc.at/count.js"></script>