Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>


Expand Down
2 changes: 1 addition & 1 deletion junction/proposals/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
]
1 change: 0 additions & 1 deletion junction/proposals/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
24 changes: 20 additions & 4 deletions junction/static/css/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -1570,6 +1570,8 @@ pre code {
overflow-y: scroll;
}
.container {
position: relative;
min-height: 100%;
margin-right: auto;
margin-left: auto;
padding-left: 15px;
Expand All @@ -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;
Expand Down Expand Up @@ -6487,7 +6499,7 @@ button.close {
.pager:after,
.panel-body:after,
.modal-header:after,
.modal-footer:after {
.modal-footer:after{
clear: both;
}
.center-block {
Expand Down Expand Up @@ -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;
Expand Down
5 changes: 5 additions & 0 deletions junction/static/less/base.less
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ html {
body {
font-family: 'Open Sans', sans-serif;
color: #333;
height: 100%;
min-height: 100%;
}

html, body {
Expand All @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions junction/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->

Expand Down