From 516406e48daeea1adecd68785042241350874938 Mon Sep 17 00:00:00 2001
From: Rushil Umaretiya <2023rumareti@tjhsst.edu>
Date: Tue, 20 Oct 2020 15:15:54 -0400
Subject: [PATCH] fixed spacing and anim

---
 manage.py                          |  0
 notes/templates/notes/meeting.html |  2 +-
 notes/templates/notes/test.html    |  2 +-
 pages/static/pages/css/styles.css  | 61 ++++++++++++++++--------------
 pages/templates/pages/base.html    |  4 +-
 pages/templates/pages/council.html |  2 +-
 pages/templates/pages/events.html  |  2 +-
 pages/templates/pages/index.html   | 26 ++++++-------
 pages/views.py                     |  2 +-
 9 files changed, 52 insertions(+), 49 deletions(-)
 mode change 100644 => 100755 manage.py

diff --git a/manage.py b/manage.py
old mode 100644
new mode 100755
diff --git a/notes/templates/notes/meeting.html b/notes/templates/notes/meeting.html
index 886fdf7..7445b06 100644
--- a/notes/templates/notes/meeting.html
+++ b/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 %}
\ No newline at end of file
diff --git a/notes/templates/notes/test.html b/notes/templates/notes/test.html
index 6db2367..0f33fc2 100644
--- a/notes/templates/notes/test.html
+++ b/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 %}
\ No newline at end of file
diff --git a/pages/static/pages/css/styles.css b/pages/static/pages/css/styles.css
index 00bdc26..d90f01a 100644
--- a/pages/static/pages/css/styles.css
+++ b/pages/static/pages/css/styles.css
@@ -1,30 +1,33 @@
-html {
-    overflow-x: hidden;
-}
-
-nav {
-    transform: translateY(-70px);
-    z-index: 10;
-    animation: nav-slide 0.75s ease-in-out forwards;
-    animation-delay: 1s;
-}
-
-@keyframes nav-slide {
-    0% {
-         transform: translateY(-70px);
-    }
-
-    100% {
-         transform: translateY(0px);
-    }
-}
-
-
-.jumbotron {
-    position: absolute;
-    top: 0;
-    left: 0;
-    height: 100vh;
-    width: 100vw;
-    background-image: url('img/hero.png')
+html {
+    overflow-x: hidden;
+}
+
+nav {
+    z-index: 10;
+}
+
+.animated-navbar {
+    transform: translateY(-70px);
+    animation: nav-slide 0.75s ease-in-out forwards;
+    animation-delay: 1s;
+}
+
+@keyframes nav-slide {
+    0% {
+         transform: translateY(-70px);
+    }
+
+    100% {
+         transform: translateY(0px);
+    }
+}
+
+
+.jumbotron {
+    position: absolute;
+    top: 0;
+    left: 0;
+    height: 100vh;
+    width: 100vw;
+    background-image: url('img/hero.png')
 }
\ No newline at end of file
diff --git a/pages/templates/pages/base.html b/pages/templates/pages/base.html
index d8fae87..1fdb3b2 100644
--- a/pages/templates/pages/base.html
+++ b/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>
diff --git a/pages/templates/pages/council.html b/pages/templates/pages/council.html
index 6cd8f50..7621759 100644
--- a/pages/templates/pages/council.html
+++ b/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>
diff --git a/pages/templates/pages/events.html b/pages/templates/pages/events.html
index d29660e..d49fc76 100644
--- a/pages/templates/pages/events.html
+++ b/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>
diff --git a/pages/templates/pages/index.html b/pages/templates/pages/index.html
index a0eb1f4..b922b74 100644
--- a/pages/templates/pages/index.html
+++ b/pages/templates/pages/index.html
@@ -1,13 +1,13 @@
-{% extends 'pages/base.html' %}
-{% load static %}
-{% block css %}
-    <link rel="stylesheet" type="text/css" href="{% static 'pages/css/styles.css' %}">
-{% endblock css %}
-{% block content %}
-<div class="jumbotron jumbotron-fluid">
-  <div class="container">
-    <h1 class="display-4">2023 Class Council</h1>
-    <p class="lead">We work for you.</p>
-  </div>
-</div>
-{% endblock content %}
+{% extends 'pages/base.html' %}
+{% load static %}
+{% block css %}
+    <link rel="stylesheet" type="text/css" href="{% static 'pages/css/styles.css' %}">
+{% endblock css %}
+{% block content %}
+<div class="jumbotron jumbotron-fluid">
+  <div class="container mt-5">
+    <h1 class="display-4">2023 Class Council</h1>
+    <p class="lead">We work for you.</p>
+  </div>
+</div>
+{% endblock content %}
diff --git a/pages/views.py b/pages/views.py
index 2fa34e7..d1a5d78 100644
--- a/pages/views.py
+++ b/pages/views.py
@@ -3,7 +3,7 @@ from django.shortcuts import render
 
 # Create your views here.
 def index(request):
-    return render(request, 'pages/index.html')
+    return render(request, 'pages/index.html', context={'animate': True})
 
 
 def council(request):