From e5f9cf202659ef01984c4726b31bf44ee70b2563 Mon Sep 17 00:00:00 2001
From: pnshiralkar
Date: Tue, 19 May 2020 01:08:02 +0530
Subject: Fixed footer and Terms and conditions close button, resolves #138

---
 workshop_app/static/workshop_app/css/base.css             | 5 +++++
 workshop_app/templates/workshop_app/base.html             | 9 +++++----
 workshop_app/templates/workshop_app/propose_workshop.html | 3 ---
 3 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'workshop_app')

diff --git a/workshop_app/static/workshop_app/css/base.css b/workshop_app/static/workshop_app/css/base.css
index 0cd1f7a..5ad36b2 100644
--- a/workshop_app/static/workshop_app/css/base.css
+++ b/workshop_app/static/workshop_app/css/base.css
@@ -37,10 +37,15 @@
     color: white;
 }
 
+.content{
+    margin-bottom:60px;
+}
+
 /**
  * Footer Styles
  */
 
+
 .footer {
     position: fixed;
     right: 0;
diff --git a/workshop_app/templates/workshop_app/base.html b/workshop_app/templates/workshop_app/base.html
index ae404e7..e8b9329 100644
--- a/workshop_app/templates/workshop_app/base.html
+++ b/workshop_app/templates/workshop_app/base.html
@@ -91,10 +91,11 @@
     </nav>
 {% endblock %}
 
-{% block content %}
-    <h1>Base Template Content. Please override me</h1>
-{% endblock %}
-
+<div class="content">
+    {% block content %}
+        <h1>Base Template Content. Please override me</h1>
+    {% endblock %}
+</div>
 
 </body>
 <footer class="footer">
diff --git a/workshop_app/templates/workshop_app/propose_workshop.html b/workshop_app/templates/workshop_app/propose_workshop.html
index 5ebc435..8b704f1 100644
--- a/workshop_app/templates/workshop_app/propose_workshop.html
+++ b/workshop_app/templates/workshop_app/propose_workshop.html
@@ -112,9 +112,6 @@
                 <div class="modal-body">
 
                 </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-                </div>
             </div>
         </div>
     </div>
-- 
cgit