]> 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: f929df7)
Revert "Use background image for donation page, too"
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 1 Aug 2018 14:48:40 +0000 (15:48 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 1 Aug 2018 14:48:40 +0000 (15:48 +0100)
This reverts commit d4105f965a4f228a4b642e17a606448407e3997b.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/scss/style.scss 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 a2e88ffc2f10bf3741fe25f64cec168d2e321e1b..8f6476f7e20c75165fd6be4b74d90b4a7b6f95ad 100644 (file)
--- a/src/scss/style.scss
+++ b/src/scss/style.scss
@@ -43,13 +43,6 @@ body {
 
        min-height: 75rem;
        padding-top: 6rem;
-
-       &.background {
-               background-image: url("img/header-background.jpg");
-               background-position: center top;
-               background-repeat: no-repeat;
-               background-size: contain;
-       }
 }
 
 // Buttons
@@ -149,7 +142,15 @@ footer {
        }
 
        section.intro {
+               // Make it cover the navbar, too
+               margin-top: -6rem;
+               padding-top: 6rem;
+
                min-height: 100vh;
+               background-image: url('img/header-background.jpg');
+               background-size: cover;
+               background-attachment: fixed;
+               background-position: center top;
                position: relative;
 
                .branding {
@@ -301,7 +302,7 @@ footer {
        display: block;
        visibility: visible;
        position: absolute;
-       bottom: 164px;
+       bottom: 48px;
        left: 50%;
        transform: translateX(-50%);
        .btn {
diff --git a/src/templates/base.html b/src/templates/base.html
index 7f819fdf9b5808550741a832d80abf9ad40c066a..2b509911066a8bdb976474da6c8a77511bf19c4f 100644 (file)
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -15,7 +15,7 @@
                {% block head %}{% end block %}
        </head>
 
-       <body id="page-top" class="{% if request.host in ("www.ipfire.org", "dev.ipfire.org") and request.path in ("/", "/donate") %}background{% end %}">
+       <body id="page-top">
                <nav class="navbar navbar-expand-lg fixed-top">
                        <div class="container">
                                <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar"
The website of ipfire.org.