Skip to content

Commit

Permalink
build: Bump bootstrap 4.6.7
Browse files Browse the repository at this point in the history
  • Loading branch information
@AiyionPrime
AiyionPrime committed Dec 15, 2024
1 parent 936b5da commit 2dd5a32
Show file tree
Hide file tree
Showing 36 changed files with 24,362 additions and 8,764 deletions.
16 changes: 8 additions & 8 deletions css/grayscale.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,13 @@ a:focus {
outline: none;
background-color: transparent;
}
.navbar-custom .nav li.active {
.navbar-custom .nav li:has(a.active) {
outline: none;
}
.navbar-custom .nav li.active a {
.navbar-custom .nav li a.active {
background-color: rgba(255, 255, 255, 0.3);
}
.navbar-custom .nav li.active a:hover {
.navbar-custom .nav li a.active:hover {
color: white;
}
@media (min-width: 768px) {
Expand All @@ -140,11 +140,11 @@ a:focus {
.navbar-header .fa-bars {
color: #fff;
}
.navbar-fixed-top {
.fixed-top {
padding: 0 0 0 0;
height: auto;
}
.navbar-fixed-top .navbar-collapse {
.fixed-top .navbar-collapse {
/* menu do not jump */
padding: 0 15px;
}
Expand Down Expand Up @@ -291,13 +291,13 @@ a:focus {
transition: all 0.3s ease-in-out;
border-radius: 0;
}
.btn-default {
.btn-secondary {
border: 1px solid #42DCA3;
color: #42DCA3;
background-color: transparent;
}
.btn-default:hover,
.btn-default:focus {
.btn-secondary:hover,
.btn-secondary:focus {
border: 1px solid #42DCA3;
outline: none;
color: black;
Expand Down
92 changes: 45 additions & 47 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@

</head>

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


<!-- Intro Header -->
<header class="intro">
<div class="intro-body">
<div class="container">
<div class="row">
<div class="col-md-7 col-md-offset-5 col-sm-offset-0 col-sm-12">
<div class="col-lg-7 offset-md-5 offset-sm-0 col-md-12">
<img src="img/logo_intro.png">
<p class="intro-text">Förderverein freier Netzwerke im Norden.</p>
<a href="#about" class="btn btn-circle page-scroll">
Expand All @@ -58,42 +58,40 @@
</header>

<!-- Navigation -->
<nav class="navbar navbar-custom" role="navigation">
<nav class="navbar navbar-custom navbar-expand-md" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main-collapse">
<i class="fa fa-bars"></i>
</button>
<a class="navbar-brand page-scroll" href="#page-top">
<img src="img/logo_mini.png"> <span class="light">F</span>Norden e.V.
</a>
</div>
<button type="button" class="navbar-toggler" data-toggle="collapse" data-target=".navbar-main-collapse">
<i class="fa fa-bars"></i>
</button>
<a class="navbar-brand page-scroll" href="#page-top">
<img src="img/logo_mini.png"> <span class="light">F</span>Norden e.V.
</a>

<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse navbar-right navbar-main-collapse">
<ul class="nav navbar-nav">
<div class="collapse navbar-collapse navbar-main-collapse">
<ul class="nav navbar-nav ml-auto">
<!-- Hidden li included to remove active class from about link when scrolled up past about section -->
<li class="hidden">
<a href="#page-top"></a>
<li class="hidden nav-item">
<a href="#page-top" class="nav-link"></a>
</li>
<li>
<a class="page-scroll" href="#about">Über</a>
<li class="nav-item">
<a class="page-scroll nav-link" href="#about">Über</a>
</li>
<li>
<a class="page-scroll" href="#contact">Kontakt</a>
<li class="nav-item">
<a class="page-scroll nav-link" href="#contact">Kontakt</a>
</li>
<li>
<a class="page-scroll" href="#impressum">Impressum</a>
<li class="nav-item">
<a class="page-scroll nav-link" href="#impressum">Impressum</a>
</li>
<li>
<a class="page-scroll" href="#donations">Spenden</a>
<li class="nav-item">
<a class="page-scroll nav-link" href="#donations">Spenden</a>
</li>
<li>
<a class="page-scroll"
<li class="nav-item">
<a class="page-scroll nav-link"
href="https://hannover.freifunk.net/wiki/Freifunk/Unterstuetzer">Unterstützer</a>
</li>
<li>
<a class="page-scroll" href="satzung.html">Satzung</a>
<li class="nav-item">
<a class="page-scroll nav-link" href="satzung.html">Satzung</a>
</li>
</ul>
</div>
Expand All @@ -106,7 +104,7 @@
<!-- About Section -->
<section id="about" class="container content-section text-center">
<div class="row">
<div class="col-lg-8 col-lg-offset-2">
<div class="col-xl-8 offset-lg-2">
<h2>Über <span class="light">F</span>Norden e.V.</h2>
<p>Freier Zugang zu Kommunikation, Information und Bildung</p>
<p>ist wichtiger Bestandteil unserer demokratischen Gesellschaft.</p>
Expand All @@ -119,45 +117,45 @@ <h2>Über <span class="light">F</span>Norden e.V.</h2>
<!-- Contact Section -->
<section id="contact" class="container content-section text-center">
<div class="row">
<div class="col-lg-8 col-lg-offset-2">
<div class="col-xl-8 offset-lg-2">
<h2>Kontakt <span class="light">F</span>Norden e.V.</h2>
<ul class="list-inline vorstand">
<li style="vertical-align: top;">
<li style="vertical-align: top;" class="list-inline-item">
<p>
Carsten Wiemann<br>
</p>
</li>
<li style="vertical-align: top;"><p>|</p></li>
<li style="vertical-align: top;">
<li style="vertical-align: top;" class="list-inline-item"><p>|</p></li>
<li style="vertical-align: top;" class="list-inline-item">
<p>
Bernd Schittenhelm
</p>
</li>
<li style="vertical-align: top;"><p>|</p></li>
<li style="vertical-align: top;">
<li style="vertical-align: top;" class="list-inline-item"><p>|</p></li>
<li style="vertical-align: top;" class="list-inline-item">
<p>
Manuel Kock
</p>
</li>
<li style="vertical-align: top;"><p>|</p></li>
<li style="vertical-align: top;">
<li style="vertical-align: top;" class="list-inline-item"><p>|</p></li>
<li style="vertical-align: top;" class="list-inline-item">
<p>
Jan-Niklas Burfeind
</p>
</li>
</ul>
<ul class="list-inline banner-social-buttons">
<li>
<a href="mailto:[email protected]" class="btn btn-default btn-lg"><i class="fa fa-envelope fa-fw"></i> <span class="network-name">Mail</span></a>
<li class="list-inline-item">
<a href="mailto:[email protected]" class="btn btn-secondary btn-lg"><i class="fa fa-envelope fa-fw"></i> <span class="network-name">Mail</span></a>
</li>
<li>
<a href="https://friendica.me/profile/freifunkh" class="btn btn-default btn-lg"><i class="fa fa-globe fa-fw"></i> <span class="network-name">Friendica</span></a>
<li class="list-inline-item">
<a href="https://friendica.me/profile/freifunkh" class="btn btn-secondary btn-lg"><i class="fa fa-globe fa-fw"></i> <span class="network-name">Friendica</span></a>
</li>
<li>
<a href="https://github.com/freifunkh" class="btn btn-default btn-lg"><i class="fa-brands fa-github fa-fw"></i> <span class="network-name">Github</span></a>
<li class="list-inline-item">
<a href="https://github.com/freifunkh" class="btn btn-secondary btn-lg"><i class="fa-brands fa-github fa-fw"></i> <span class="network-name">Github</span></a>
</li>
<li>
<a href="https://www.facebook.com/pages/FNorden-eV/1605175656419883" class="btn btn-default btn-lg"><i class="fa-brands fa-facebook fa-fw"></i> <span class="network-name">Facebook</span></a>
<li class="list-inline-item">
<a href="https://www.facebook.com/pages/FNorden-eV/1605175656419883" class="btn btn-secondary btn-lg"><i class="fa-brands fa-facebook fa-fw"></i> <span class="network-name">Facebook</span></a>
</li>
</ul>
</div>
Expand All @@ -170,7 +168,7 @@ <h2>Kontakt <span class="light">F</span>Norden e.V.</h2>
<!-- About Section -->
<section id="impressum" class="container content-section text-center">
<div class="row">
<div class="col-lg-8 col-lg-offset-2">
<div class="col-xl-8 offset-lg-2">
<h1>Impressum</h1>
<h2>Angaben gemäß § 5 TMG:</h2>
<p>
Expand All @@ -190,7 +188,7 @@ <h2>Registereintrag:</h2>
<!-- donation section -->
<section id="donations" class="container content-section text-center">
<div class="row">
<div class="col-lg-8 col-lg-offset-2">
<div class="col-xl-8 offset-lg-2">
<h1>Spenden</h1>
<p>... nehmen wir als gemeinnütziger Verein natürlich dankend entgegen und
arbeiten stetig daran, unser Netz mit Eurer Unterstützung noch besser zu machen.</p>
Expand Down Expand Up @@ -219,7 +217,7 @@ <h2>oder via</h2>
</section>
<section id="about" class="container content-section text-center">
<div class="row">
<div class="col-lg-8 col-lg-offset-2">
<div class="col-xl-8 offset-lg-2">
<h1>Haftungsausschluss (Disclaimer)</h1>
<h2>Haftung für Inhalte</h2>
<p>Als Diensteanbieter sind wir gemäß § 7 Abs.1 TMG für eigene Inhalte auf diesen Seiten nach den allgemeinen Gesetzen verantwortlich. Nach §§ 8 bis 10 TMG sind wir als Diensteanbieter jedoch nicht verpflichtet, übermittelte oder gespeicherte fremde Informationen zu überwachen oder nach Umständen zu forschen, die auf eine rechtswidrige Tätigkeit hinweisen. Verpflichtungen zur Entfernung oder Sperrung der Nutzung von Informationen nach den allgemeinen Gesetzen bleiben hiervon unberührt. Eine diesbezügliche Haftung ist jedoch erst ab dem Zeitpunkt der Kenntnis einer konkreten Rechtsverletzung möglich. Bei Bekanntwerden von entsprechenden Rechtsverletzungen werden wir diese Inhalte umgehend entfernen.</p>
Expand Down
4 changes: 2 additions & 2 deletions js/grayscale.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
// jQuery to collapse the navbar on scroll
$(window).scroll(function() {
if ($(window).scrollTop() > $('header').outerHeight()) {
$(".navbar-custom").addClass("navbar-fixed-top");
$(".navbar-custom").addClass("fixed-top");
$(".navbar-custom").css("background-color","rgba(0,0,0,0.61)");


} else {
$(".navbar-custom").removeClass("navbar-fixed-top");
$(".navbar-custom").removeClass("fixed-top");
$(".navbar-custom").css("background-color","rgba(0,0,0,1)");
}
});
Expand Down
36 changes: 30 additions & 6 deletions package-lock.json
View file

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
View file
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": "^3.4.1",
"bootstrap": "^4.6.2",
"jquery": "^3.7.1",
"jquery.easing": "^1.4.1",
"leaflet": "^1.9.4",
Expand Down
38 changes: 18 additions & 20 deletions satzung.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@

</head>

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


<!-- Intro Header -->
<header class="intro">
<div class="intro-body">
<div class="container">
<div class="row">
<div class="col-md-7 col-md-offset-5 col-sm-offset-0 col-sm-12">
<div class="col-lg-7 offset-md-5 offset-sm-0 col-md-12">
<img src="img/logo_intro.png">
<p class="intro-text">Förderverein freier Netzwerke im Norden.</p>
<a href="#constitution" class="btn btn-circle page-scroll">
Expand All @@ -55,29 +55,27 @@
</header>

<!-- Navigation -->
<nav class="navbar navbar-custom" role="navigation">
<nav class="navbar navbar-custom navbar-expand-md" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-main-collapse">
<i class="fa fa-bars"></i>
</button>
<a class="navbar-brand page-scroll" href="#page-top">
<img src="img/logo_mini.png"> <span class="light">F</span>Norden e.V.
</a>
</div>
<button type="button" class="navbar-toggler" data-toggle="collapse" data-target=".navbar-main-collapse">
<i class="fa fa-bars"></i>
</button>
<a class="navbar-brand page-scroll" href="#page-top">
<img src="img/logo_mini.png"> <span class="light">F</span>Norden e.V.
</a>

<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse navbar-right navbar-main-collapse">
<ul class="nav navbar-nav">
<div class="collapse navbar-collapse navbar-main-collapse">
<ul class="nav navbar-nav ml-auto">
<!-- Hidden li included to remove active class from about link when scrolled up past about section -->
<li class="hidden">
<a href="#page-top"></a>
<li class="hidden nav-item">
<a href="#page-top" class="nav-link"></a>
</li>
<li>
<a class="page-scroll" href="/">zurück zur Übersicht</a>
<li class="nav-item">
<a class="page-scroll nav-link" href="/">zurück zur Übersicht</a>
</li>
<li>
<a class="page-scroll" href="#constitution">Satzung</a>
<li class="nav-item">
<a class="page-scroll nav-link" href="#constitution">Satzung</a>
</li>
</ul>
</div>
Expand All @@ -90,7 +88,7 @@
<!-- Constitution Section -->
<section id="constitution" class="container content-section">
<div class="row">
<div class="col-lg-8 col-lg-offset-2">
<div class="col-xl-8 offset-lg-2">
<h2>Satzung <span class="light">F</span>Norden e.V.</h2>
<h3>§1 Name, Sitz, Geschäftsjahr</h3>
<p>
Expand Down
Loading

0 comments on commit 2dd5a32

Please sign in to comment.