Merge branch 'calendarv2'

widget_princessgabi/widget_calendar/static/widget_calendar/event.css

+body {
+    height: 100vh;
+    background-color: #E9E3FE;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.event-content {
+    margin-top: auto;
+    padding: 2rem;
+    border-radius: 0.5rem;
+    background-color: white
+}
\ No newline at end of file

widget_princessgabi/widget_calendar/templates/widget_calendar/calendar.html

@@ -21,10 +21,11 @@
             </a>
             {% endfor %}
         </ol>
-        {% endblock %}
     </div>
     <a href="events/add" class="add-btn"><i class="fa fa-plus"></i> New Activity</a>
 </div>
+{% endblock %}
+
 <div class="links">
     <a href="../dashboard" class="btn-primary">Dashboard</a>
     <a href="../announcements" class="btn-primary">Announcements</a>

widget_princessgabi/widget_calendar/templates/widget_calendar/event-details.html

-{%extends 'base.html'%}
+{% extends 'base.html' %}
+{% load static %}
+{% block stylesheets %}
+<link rel="stylesheet" type="text/css" href="{% static 'widget_calendar/calendar.css' %}">
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+
+{% endblock %}
 
 {% block title %}{{ object }}{% endblock %}
 
@@ -9,14 +15,14 @@
 {% block body %}
 <div class="event-content">
     {% block content %}
-    <h4>Date and Time: {{ object.target_datetime|date:'m/d/Y' }} {{ object.target_datetime|date:'h:i A' }} </h4>
-    <h4>Estimated Hours: {{ object.estimated_hours }}</h4>
-    <h4>{{ object.course.code }} {{ object.course.title }} - {{ object.course.section }}</h4>
-    <h4>Mode: {{ object.location.mode }}</h4>
-    <h4>Venue: {{ object.location.venue }}</h4>
+    <div class="details">
+        <h4>Date and Time: {{ object.target_datetime|date:'m/d/Y' }} {{ object.target_datetime|date:'h:i A' }} </h4>
+        <h4>Estimated Hours: {{ object.estimated_hours }}</h4>
+        <h4>{{ object.course.code }} {{ object.course.title }} - {{ object.course.section }}</h4>
+        <h4>Mode: {{ object.location.mode }}</h4>
+        <h4>Venue: {{ object.location.venue }}</h4>
+    </div>
     {% endblock %}
-</div>
-<div class="links">
-    <a href="{{object.get_absolute_url}}../edit" class="btn-primary">Edit Activity</a>
+    <a href="{{object.get_absolute_url}}../edit" class="edit-btn"><i class="fa fa-edit"></i> Edit Activity</a>
 </div>
 {% endblock %}
\ No newline at end of file