From 1a3104d72a32d9a0fe63711106e861f016f45fa8 Mon Sep 17 00:00:00 2001
From: dishantsethi <dishantsethi14@gmail.com>
Date: Sun, 7 Jul 2019 01:09:47 +0530
Subject: [PATCH 1/3] Solve issue #538

---
 README.md                      |  4 ++++
 junction/static/css/app.css    | 24 ++++++++++++++++++++----
 junction/static/less/base.less |  5 +++++
 junction/templates/base.html   |  6 +++---
 4 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 87646900..039758bb 100644
--- a/README.md
+++ b/README.md
@@ -166,6 +166,10 @@ Contributing
     <td align=center><img width=100 src=https://avatars.githubusercontent.com/u/6693374?v=3><br>Vinay Singh (<a href=https://github.com/vinay13>@vinay13</a>)</td>
     <td align=center><img width=100 src=https://avatars.githubusercontent.com/u/7351791?v=3><br>Rahul Arora (<a href=https://github.com/rahulxxarora>@rahulxxarora</a>)</td>
   </tr>
+
+  <tr>
+  <td align=center><img width=100 src=https://avatars.githubusercontent.com/dishantsethi><br>Dishant Sethi (<a href=https://github.com/dishantsethi>@dishantsethi</a>)</td>
+  </tr>
 </table>
 
 
diff --git a/junction/static/css/app.css b/junction/static/css/app.css
index 2cf6a13a..cd21dc7a 100644
--- a/junction/static/css/app.css
+++ b/junction/static/css/app.css
@@ -1570,6 +1570,8 @@ pre code {
   overflow-y: scroll;
 }
 .container {
+  position: relative;
+  min-height: 100%;
   margin-right: auto;
   margin-left: auto;
   padding-left: 15px;
@@ -1595,6 +1597,16 @@ pre code {
   margin-left: auto;
   padding-left: 15px;
   padding-right: 15px;
+  position: relative;
+  bottom: 0;
+  width: 100%;
+  min-height: 80%;
+}
+.row-fluid{
+    margin-right: auto;
+    margin-left: auto;
+    padding-left: 15px;
+    padding-right: 15px;
 }
 .row {
   margin-left: -15px;
@@ -6487,7 +6499,7 @@ button.close {
 .pager:after,
 .panel-body:after,
 .modal-header:after,
-.modal-footer:after {
+.modal-footer:after{
   clear: both;
 }
 .center-block {
@@ -8684,12 +8696,16 @@ body {
 html,
 body {
   height: 100%;
+  min-height: 100%;
 }
 footer {
   padding: 20px 0;
-  background-color: #FFF7F8;
-  border-top: 1px solid #ffdee2;
-  border-bottom: 1px solid #ffdee2;
+  background-color: rgb(248, 232, 234);
+  border-top: 1px solid rgb(248, 232, 234);
+  border-bottom: 1px solid rgb(248, 232, 234);
+  position: relative;
+  bottom: 0;
+  width: 100%;
 }
 .navbar-default {
   border-top: none;
diff --git a/junction/static/less/base.less b/junction/static/less/base.less
index 87ecbe65..975069fd 100644
--- a/junction/static/less/base.less
+++ b/junction/static/less/base.less
@@ -5,6 +5,8 @@ html {
 body {
   font-family: 'Open Sans', sans-serif;
   color: #333;
+  height: 100%;
+  min-height: 100%;
 }
 
 html, body {
@@ -18,6 +20,9 @@ footer {
   background-color: @bg-color;
   border-top: 1px solid darken(@bg-color, 5%);
   border-bottom: 1px solid darken(@bg-color, 5%);
+  position: relative;
+  bottom: 0;
+  width: 100%;
 }
 
 .navbar-default {
diff --git a/junction/templates/base.html b/junction/templates/base.html
index 7ca43821..35abe4b4 100644
--- a/junction/templates/base.html
+++ b/junction/templates/base.html
@@ -144,14 +144,14 @@
     </div>
 
     <!-- Footer -->
-    <footer>
+    <footer      >
         <div class="container-fluid">
             <div class="row-fluid">
                 <div class="col-xs-12 text-center">
-                    <p class="push-half-top clear-margin">{{ SITE_INFO.footer|safe }} • Powered by <a href="https://github.com/pythonindia/junction">Junction</a></p>
+                    <p class="clear-margin">{{ SITE_INFO.footer|safe }} • Powered by <a href="https://github.com/pythonindia/junction">Junction</a></p>
                 </div>
             </div><!-- /.row -->
-        </div>
+        </div>    
     </footer>
     <!-- /.container -->
 

From f7801c14f164b3d4c7153846ca59a96d0744c056 Mon Sep 17 00:00:00 2001
From: dishantsethi <dishantsethi14@gmail.com>
Date: Tue, 9 Jul 2019 00:47:54 +0530
Subject: [PATCH 2/3] travis issue resolved

---
 junction/proposals/views.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/junction/proposals/views.py b/junction/proposals/views.py
index c94aca08..91ab4fa4 100644
--- a/junction/proposals/views.py
+++ b/junction/proposals/views.py
@@ -292,7 +292,6 @@ def proposals_to_review(request, conference_slug):
     if not permissions.is_proposal_reviewer(request.user, conference):
         raise PermissionDenied
 
-
     proposals_qs = Proposal.objects.select_related(
         'proposal_type', 'proposal_section', 'conference', 'author',
     ).filter(conference=conference).filter(status=ProposalStatus.PUBLIC).order_by('created_at')

From 14e53bf5a5bf888fea9a3c1f0f5fe1f524dd693a Mon Sep 17 00:00:00 2001
From: dishantsethi <dishantsethi14@gmail.com>
Date: Wed, 4 Sep 2019 22:20:39 +0530
Subject: [PATCH 3/3] flake8 solved

---
 junction/proposals/urls.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/junction/proposals/urls.py b/junction/proposals/urls.py
index eeb05717..f3dd8411 100644
--- a/junction/proposals/urls.py
+++ b/junction/proposals/urls.py
@@ -43,5 +43,5 @@
     url(r'^(?P<proposal_slug>[\w-]+)/remove-vote/$', votes_views.proposal_vote_remove, name='proposal-vote-remove'),
     url(r'^(?P<proposal_slug>[\w-]+)/vote/$', votes_views.proposal_reviewer_vote, name='proposal-reviewer-vote'),
     url(r'^(?P<proposal_slug>[\w-]+)/second-vote/$', votes_views.proposal_reviewer_secondary_vote,
-        name='proposal-reviewer-secondary-vote'),
+        name='proposal-reviewer-secondary-vote')
 ]