diff --git a/README.md b/README.md index 87646900..039758bb 100644 --- a/README.md +++ b/README.md @@ -166,6 +166,10 @@ Contributing
Vinay Singh (@vinay13)
Rahul Arora (@rahulxxarora) + + +
Dishant Sethi (@dishantsethi) + 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[\w-]+)/remove-vote/$', votes_views.proposal_vote_remove, name='proposal-vote-remove'), url(r'^(?P[\w-]+)/vote/$', votes_views.proposal_reviewer_vote, name='proposal-reviewer-vote'), url(r'^(?P[\w-]+)/second-vote/$', votes_views.proposal_reviewer_secondary_vote, - name='proposal-reviewer-secondary-vote'), + name='proposal-reviewer-secondary-vote') ] 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') 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 @@ -