[tor-commits] [lego/develop] Modify css and templates

[hiro at torproject.org]

commit d110f07b4e4abea653b88d112587a929fe433099
Author: hiro <hiro at torproject.org>
Date:   Mon Oct 28 17:36:31 2019 +0100

    Modify css and templates
---
 assets/static/css/eoy.css | 11 +++++++----
 templates/navbar.html     | 15 ++++++++-------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/assets/static/css/eoy.css b/assets/static/css/eoy.css
index fe51de5..c007402 100644
--- a/assets/static/css/eoy.css
+++ b/assets/static/css/eoy.css
@@ -11,6 +11,11 @@
   src: url('fonts/LeagueGothic/LeagueGothic-Italic.otf');
 }
 
+/* Don't move down content w banner. Navbar isn't fixed. */
+.page {
+  padding-top: 0 !important; }
+
+
 .banner {
   background-color: #000000;
   z-index: 100000000000000 !important;
@@ -72,18 +77,16 @@
 }
 
 .banner__containter {
-
-    position: fixed;
+    position: relative
     right: 0;
     left: 0;
-    bottom: 0;
+    top: 0;
     padding: 1.25rem 1.25rem 2rem;
     width: 100%;
     background-image: url('../images/home/png/take-back at 3x.png');
     background-position: bottom 10% right 45%;
     background-repeat: no-repeat;
     background-size: contain;
-
 }
 
 .eoy-sr-only {
diff --git a/templates/navbar.html b/templates/navbar.html
index 287e178..4474fa8 100644
--- a/templates/navbar.html
+++ b/templates/navbar.html
@@ -1,18 +1,19 @@
+{% include 'bottom_banner.html' %}
 {% if not this.color %}
-<div class="container bg-primary">
-  <nav class="navbar no-background navbar-expand-lg navbar-dark fixed-top bg-primary p-4">
+<div class="container-fluid bg-primary">
+  <nav class="navbar no-background navbar-expand-lg navbar-dark bg-primary p-4">
 {% elif this.color == 'primary' %}
-<div class="container bg-primary">
-  <nav class="navbar no-background navbar-expand-lg navbar-dark fixed-top bg-primary p-4">
+<div class="container-fluid bg-primary">
+  <nav class="navbar no-background navbar-expand-lg navbar-dark bg-primary p-4">
 {% else %}
-<div class="container bg-dark">
-  <nav class="navbar no-background navbar-expand-lg navbar-dark fixed-top bg-dark p-4">
+<div class="container-fluid bg-dark">
+  <nav class="navbar no-background navbar-expand-lg navbar-dark bg-dark p-4">
 {% endif %}
     <a class="navbar-brand" href="{{ '/'|url(alt=this.alt) }}">
       <img alt="{{ 'The Tor Project' }}" src="{{ '/static/images/tor-logo at 2x.png'|asseturl }}" >
       <span class="sr-only">Tor Logo</span>
     </a>
-   
+
     <a href="https://donate.torproject.org/{{ '/'|url(alt=this.alt) }}" title="{{ _("Donate") }}"><h4><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></h4></a>
 
     <label for="nav-toggle">