Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump bootstrap from 4.6.2 to 5.3.3 #36

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,9 @@
<!-- leaflet -->
<link rel="stylesheet" href="vendor/leaflet/leaflet.css" />

<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
<![endif]-->

</head>

<body id="page-top" data-spy="scroll" data-target=".fixed-top">
<body id="page-top" data-bs-spy="scroll" data-bs-target=".fixed-top">


<!-- Intro Header -->
Expand All @@ -60,7 +53,7 @@
<!-- Navigation -->
<nav class="navbar navbar-custom navbar-expand-md" role="navigation">
<div class="container">
<button type="button" class="navbar-toggler" data-toggle="collapse" data-target=".navbar-main-collapse">
<button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target=".navbar-main-collapse">
<i class="fa fa-bars"></i>
</button>
<a class="navbar-brand page-scroll" href="#page-top">
Expand All @@ -69,10 +62,10 @@

<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse navbar-main-collapse">
<ul class="nav navbar-nav ml-auto">
<ul class="nav navbar-nav ms-auto">
<!-- Hidden li included to remove active class from about link when scrolled up past about section -->
<li class="hidden nav-item">
<a href="#page-top" class="nav-link"></a>
<a href="page-scroll #page-top" class="nav-link"></a>
</li>
<li class="nav-item">
<a class="page-scroll nav-link" href="#about">Über</a>
Expand Down
36 changes: 16 additions & 20 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"homepage": "https://github.com/freifunkh/fnorden.net#readme",
"devDependencies": {
"@fortawesome/fontawesome-free": "^6.7.1",
"bootstrap": "^4.6.2",
"bootstrap": "^5.3.3",
"jquery": "^3.7.1",
"jquery.easing": "^1.4.1",
"leaflet": "^1.9.4",
Expand Down
13 changes: 3 additions & 10 deletions satzung.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,9 @@
<link href="https://fonts.googleapis.com/css?family=Lora:400,700,400italic,700italic" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">

<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
<![endif]-->

</head>

<body id="page-top" data-spy="scroll" data-target=".fixed-top">
<body id="page-top" data-bs-spy="scroll" data-bs-target=".fixed-top">


<!-- Intro Header -->
Expand All @@ -57,7 +50,7 @@
<!-- Navigation -->
<nav class="navbar navbar-custom navbar-expand-md" role="navigation">
<div class="container">
<button type="button" class="navbar-toggler" data-toggle="collapse" data-target=".navbar-main-collapse">
<button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target=".navbar-main-collapse">
<i class="fa fa-bars"></i>
</button>
<a class="navbar-brand page-scroll" href="#page-top">
Expand All @@ -66,7 +59,7 @@

<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse navbar-main-collapse">
<ul class="nav navbar-nav ml-auto">
<ul class="nav navbar-nav ms-auto">
<!-- Hidden li included to remove active class from about link when scrolled up past about section -->
<li class="hidden nav-item">
<a href="#page-top" class="nav-link"></a>
Expand Down
Loading
Loading