Fixed Merge Issues

notes/templates/notes/meeting.html

@@ -5,7 +5,7 @@
 {% endblock css %}
 
 {% block content %}
-<div class="container">
+<div class="container mt-5">
     {{html|safe}}
 </div>
 {% endblock content %}

notes/templates/notes/test.html

@@ -4,7 +4,7 @@
     <link rel="stylesheet" type="text/css" href="{% static 'pages/css/styles.css' %}">
 {% endblock css %}
 {% block content %}
-<div class="container">
+<div class="container mt-5">
     {{html|safe}}
 </div>
 {% endblock content %}

pages/static/pages/css/styles.css

@@ -1,14 +1,14 @@
-<<<<<<< HEAD
 @import 'https://fonts.googleapis.com/css?family=Montserrat:300,400,500';
 @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 {
-    background-image: url('img/hero.png');
-    -webkit-background-size: cover;
-    -moz-background-size: cover;
-    -o-background-size: cover;
-    background-size: cover;
+    position: absolute;
+    top: 0;
+    left: 0;
+    height: 100vh;
+    width: 100vw;
+    background-image: url('img/hero.png')
 }
 .valign {
   display: flex;

pages/templates/pages/base.html

@@ -19,8 +19,8 @@
             <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="#">upgrade your browser</a> to improve your experience.</p>
         <![endif]-->
 
-        <nav class="navbar navbar-expand-lg navbar-dark bg-dark">
-            <a class="navbar-brand" href="{% url 'index' %}"><img style="width: 50px;" src="{% static 'pages/css/img/TJLogo.png' %}">&emsp;Class of 2023</a>
+        <nav class="navbar navbar-expand-lg navbar-dark bg-dark {% if animate %}animated-navbar{% endif %}">
+            <a class="navbar-brand" href="{% url 'index' %}"><img style="width: 40px;" src="{% static 'pages/css/img/TJLogo.png' %}">&emsp;Class of 2023</a>
             <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarLinks">
                 <span class="navbar-toggler-icon"></span>
             </button>

pages/templates/pages/council.html

@@ -5,7 +5,7 @@
 {% endblock css %}
 {% block content %}
 <div class="jumbotron jumbotron-fluid">
-    <div class="container">
+    <div class="container mt-5">
     <h1 class="display-4">The Class Council</h1>
     <p class="lead">We are here to serve you.</p>
     </div>

pages/templates/pages/events.html

@@ -5,7 +5,7 @@
 {% endblock css %}
 {% block content %}
 <div class="jumbotron jumbotron-fluid">
-    <div class="container">
+    <div class="container mt-5">
     <h1 class="display-4">Events</h1>
     <p class="lead">Come and join your friends!</p>
     </div>

pages/templates/pages/index.html

@@ -5,7 +5,7 @@
 {% endblock css %}
 {% block content %}
 <div class="jumbotron jumbotron-fluid">
-  <div class="container home">
+  <div class="container 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})
+    return render(request, 'pages/index.html', {'stories': stories, 'animate' : True})
 
 
 def council(request):