summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpnshiralkar2020-05-19 01:08:02 +0530
committerpnshiralkar2020-05-19 01:08:02 +0530
commite5f9cf202659ef01984c4726b31bf44ee70b2563 (patch)
tree03e3afe98ae4a4b78901359ab75a47e8f6117717
parent9487f85e6731147c4580c53383c24faae35ebd72 (diff)
downloadworkshop_booking-e5f9cf202659ef01984c4726b31bf44ee70b2563.tar.gz
workshop_booking-e5f9cf202659ef01984c4726b31bf44ee70b2563.tar.bz2
workshop_booking-e5f9cf202659ef01984c4726b31bf44ee70b2563.zip
Fixed footer and Terms and conditions close button, resolves #138
-rw-r--r--workshop_app/static/workshop_app/css/base.css5
-rw-r--r--workshop_app/templates/workshop_app/base.html9
-rw-r--r--workshop_app/templates/workshop_app/propose_workshop.html3
3 files changed, 10 insertions, 7 deletions
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>