Fixed more merge issues (all of them hopefully)

pages/static/pages/css/styles.css

@@ -2,14 +2,12 @@
 @import 'https://fonts.googleapis.com/css?family=Josefin+Slab:700';
 @import 'https://fonts.googleapis.com/css?family=Arapey:400,600';
 @import url('https://fonts.googleapis.com/css2?family=Hind:wght@300&display=swap');
-
 .jumbotron {
-    position: absolute;
+    background-image: url('img/hero.png');
-    top: 0;
+    -webkit-background-size: cover;
-    left: 0;
+    -moz-background-size: cover;
-    height: 100vh;
+    -o-background-size: cover;
-    width: 100vw;
+    background-size: cover;
-    background-image: url('img/hero.png')
 }
 .valign {
   display: flex;
@@ -29,45 +27,6 @@ body {
   color: #444;
 }
 
-.navigation {
-  width: 100vw;
-  height: 118px;
-  background-color: #FFF;
-  z-index: 2;
-}
-@media only screen and (max-width: 640px) {
-  .navigation {
-    height: 56px;
-  }
-}
-.navigation .logo {
-  height: 90px;
-  margin-right: 50px;
-  float: left;
-  text-align: left;
-}
-@media only screen and (max-width: 800px) {
-  .navigation .logo {
-    margin-right: 10px;
-  }
-}
-@media only screen and (max-width: 640px) {
-  .navigation .logo {
-    display: none;
-  }
-}
-.navigation .socials {
-  display: flex;
-  width: auto;
-  float: right;
-  text-align: right;
-}
-@media only screen and (max-width: 800px) {
-  .navigation .socials {
-    display: none;
-  }
-}
-
 .seperate {
   display: flex;
   justify-content: space-between;
@@ -81,50 +40,6 @@ body {
   color: #444;
 }
 
-nav {
-  display: flex;
-  float: left;
-  text-align: left;
-  font-size: 12px;
-  flex-wrap: wrap;
-  margin: 0px;
-}
-nav ul {
-  list-style-image: none;
-  list-style-type: none;
-  display: flex;
-  flex-direction: row;
-  margin: 0px;
-  padding: 0px;
-}
-nav ul li a {
-  padding: 6px;
-  text-decoration: none;
-  color: #444;
-  font-family: "Montserrat", "Helvetica", "Arial", sans-serif;
-  text-transform: uppercase;
-  letter-spacing: 1.2px;
-  line-height: 14.4px;
-  font-weight: 400;
-}
-@media only screen and (max-width: 800px) {
-  nav ul li a {
-    margin: 2px;
-    padding: 0px;
-  }
-}
-nav ul li:hover > a {
-  color: #38A3BD;
-}
-nav ul li:hover > .submenu {
-  display: flex;
-}
-@media only screen and (max-width: 640px) {
-  nav {
-    display: none;
-  }
-}
-
 .submenu {
   display: none;
   float: left;
@@ -871,8 +786,11 @@ html {
 }
 
 nav {
-    transform: translateY(-70px);
     z-index: 10;
+}
+
+.animated-navbar {
+    transform: translateY(-70px);
     animation: nav-slide 0.75s ease-in-out forwards;
     animation-delay: 1s;
 }

pages/templates/pages/index.html

@@ -5,7 +5,7 @@
 {% endblock css %}
 {% block content %}
 <div class="jumbotron jumbotron-fluid">
-  <div class="container mt-5">
+  <div class="container home mt-5">
       <br>
       <h1 class="display-4"><strong>TJHSST Class of 2023</strong></h1>
     <p class="lead">We are the class to beat!</p>

pages/views.py

@@ -9,7 +9,7 @@ def index(request):
         stories = stories[:3]
     except Exception:
         stories = []
-    return render(request, 'pages/index.html', {'stories': stories, 'animate' : True})
+    return render(request, 'pages/index.html', {'stories': stories, 'animate': True})
 
 
 def council(request):