]> git.ipfire.org Git - ipfire.org.git/commitdiff
projects / ipfire.org.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b6e5215)
Make the navbar static and dark all the time
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 14 Oct 2018 18:32:44 +0000 (19:32 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 14 Oct 2018 18:32:44 +0000 (19:32 +0100)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/scss/style.scss patch | blob | blame | history
src/static/js/site.js patch | blob | blame | history
src/templates/base.html patch | blob | blame | history

diff --git a/src/scss/style.scss b/src/scss/style.scss
index be65acbb9bb9fd480518b42bfaab01df0d63fc31..9c30a52c11d96b1b8cec9004e69a588d4cd8b3ac 100644 (file)
--- a/src/scss/style.scss
+++ b/src/scss/style.scss
@@ -49,7 +49,6 @@ html {
 }
 
 body {
-       padding-top: 6rem;
        margin-bottom: $footer-height;
 }
 
@@ -80,14 +79,6 @@ body {
 }
 
 .navbar {
-       &.scrolled {
-               @extend .inverse;
-
-               transition: background-color 200ms linear;
-
-               border-bottom: 2px solid $body-bg;
-       }
-
        .navbar-brand {
                color: inherit;
        }
diff --git a/src/static/js/site.js b/src/static/js/site.js
index 25d08dc59e006a4450732e0634b5275db7f857cb..ad94ee07a29b708abdd24699f782c3a323de29de 100644 (file)
--- a/src/static/js/site.js
+++ b/src/static/js/site.js
@@ -1,20 +1,3 @@
-$(document).ready(function () {        
-    $(document).scroll(function () {
-               var nav = $(".navbar");
-               nav.toggleClass("scrolled", $(this).scrollTop() >= 1);
-       });
-
-    //* Menu *//
-       $('.navbar-toggler-left').click(function() {
-               $('#navbarSupportedContent, #mask').addClass('open');
-               $('.scrolled').addClass('fadeout');
-       });
-       $('#mask').click(function() {
-               $('#navbarSupportedContent, #mask').removeClass('open');
-               $('.scrolled').removeClass('fadeout');
-       });
-});
-
 $.query = function(name){
        var results = new RegExp('[\\?&]' + name + '=([^&#]*)').exec(window.location.href);
        return results[1] || 0;
diff --git a/src/templates/base.html b/src/templates/base.html
index 7963215cc9fc5804e42f79458ed826d90afbaeb0..b03b67a26d3f60ecd104265b0f48bc27f3c9848e 100644 (file)
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -16,7 +16,7 @@
        </head>
 
        <body id="page-top">
-               <nav class="navbar navbar-expand-lg fixed-top">
+               <nav class="navbar navbar-dark navbar-expand-lg">
                        <div class="container">
                                <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar"
                                                aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
The website of ipfire.org.