Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hackathon: prettify #4230

Merged
merged 5 commits into from
Apr 22, 2019
Merged

hackathon: prettify #4230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
64f210f
hackathon: prettify
thelostone-mc Apr 18, 2019
a440cbc
addressed review comments
thelostone-mc Apr 19, 2019
f8eaeee
bug: hackathon bounty detail back -> hackathon page
thelostone-mc Apr 19, 2019
b8f5e70
Merge branch 'master' into prettify
thelostone-mc Apr 20, 2019
bc60667
Merge branch 'master' into prettify
SaptakS Apr 22, 2019
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
6 changes: 5 additions & 1 deletion app/dashboard/templates/bounty/details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@
<div class="row no-gutter">
<div class="col-12 col-lg-2 left-rails text-center" style="background: #F2F6F9;">
<div class="explorer font-body">
<a href="{% url 'explorer' %}"><i class="fas fa-chevron-left"></i> {% trans "Back to Issue Explorer" %}</a>
{% if event %}
<a href="/hackathon/{{ event }}"><i class="fas fa-chevron-left"></i> {% trans "Back to Event Issue Explorer" %}</a>
{% else %}
<a href="{% url 'explorer' %}"><i class="fas fa-chevron-left"></i> {% trans "Back to Issue Explorer" %}</a>
{% endif %}
</div>
</div>

Expand Down
19 changes: 6 additions & 13 deletions app/dashboard/templates/dashboard/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
<link rel="stylesheet" href={% static "v2/css/tag.css" %}>
<link rel="stylesheet" href={% static "v2/css/scroll-carousel.css" %}>
</head>

<body class="interior {{active}} g-font-muli">
{% include 'shared/tag_manager_2.html' %}
<div class="container-fluid header dash">
Expand All @@ -36,18 +35,16 @@
</div>
{% if hackathon %}
<div class="row pt-5 pb-5 text-center" style="
background: rgb(25, 0, 63);
background-image: url({% static 'v2/images/header-bg.png' %});
background-size: cover;
background: linear-gradient(161deg, rgba(55,27,181,1) 37%, rgba(255,51,117,1) 100%);
">
<div class="col g-font-muli">
<span class="d-block font-title-xl text-white">{{ hackathon.name }}</span>
<span class="d-block font-title-xl text-white font-weight-bold">{{ hackathon.name }}</span>
{% if hackathon.logo_svg %}
<img class="d-block mx-auto my-4" max-width="364" src="{{ hackathon.logo_svg.url }}"/>
{% elif hackathon.logo %}
<img class="d-block mx-auto my-4" max-width="364" src="{{ hackathon.logo.url }}"/>
{% endif %}
<span class="d-block font-title-xl text-white font-weight-300" style="white-space: nowrap;">
<span class="d-block font-title-lg text-white font-weight-semibold" style="white-space: nowrap;">
{{ hackathon.start_date|date:"M j, Y" }} - {{ hackathon.end_date|date:"M j, Y" }}
</span>
</div>
Expand All @@ -63,14 +60,10 @@
{% include 'dashboard/sidebar_search_hackathon.html' %}
</div>
<div class="col-12 col-lg-9 col-xl-10 body">
<div class="container p-2" id="bounties">
<div id="dashboard-title" class="hidden">
{% include 'shared/search_bar.html' %}
</div>
<div class="col-12 col-lg-12 pl-2 pb-1 title-row">
<span class="font-title ml-1 text-highlight-gc-blue">{% trans 'Bounties' %}</span>
<div class="container-fluid p-2" id="bounties">
<div id="dashboard-title" class="hidden">
{% include 'shared/search_bar.html' %}
</div>
<div style="clear: right;"></div>
{% else %}
<div class="col-12 col-lg-3 col-xl-2 invisible" id="sidebar_container" style="background: #F2F6F9;">
{% include 'dashboard/sidebar_search.html' %}
Expand Down
14 changes: 0 additions & 14 deletions app/dashboard/templates/dashboard/sidebar_search.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,20 +295,6 @@
<div class="col">
<div class="col-12 subheading">{% trans "Network" %}</div>
<div class="col-12 options">
<div class="checkbox_container">
<input name="network" id="local" type="checkbox" value="local" val-ui='Custom Network' />
<span class="checkbox"></span>
<div class="filter-label">
<label for=local>{% trans "Custom" %}</label>
</div>
</div>
<div class="checkbox_container">
<input name="network" id="ropsten" type="checkbox" value="ropsten" val-ui='Ropsten' />
<span class="checkbox"></span>
<div class="filter-label">
<label for=ropsten>{% trans "Ropsten" %}</label>
</div>
</div>
<div class="checkbox_container">
<input name="network" id="rinkeby" type="checkbox" value="rinkeby" val-ui='Rinkeby' />
<span class="checkbox"></span>
Expand Down
62 changes: 31 additions & 31 deletions app/dashboard/templates/dashboard/sidebar_search_hackathon.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,54 +16,54 @@
{% endcomment %}
{% load i18n static %}
<link rel="stylesheet" href={% static "v2/css/sidebar_search.css" %}>
<style>
form .col:first-child {
border-top: none;
}

.sidebar_search {
padding: 20px 3rem;
}
</style>
<div class="sidebar_search font-body">

<form>
<div class="col">
<div class="col-12 subheading">
{% trans "Status" %}
{% trans "Sponsors" %}
</div>
<div class="col-12 options" id="list-orgs">

<div class="form__radio option mb-2">
<input name="org" id="any_org" type="radio" value="any" checked/>
<label class="filter-label" for=any_org>{% trans "All" %}</label>
</div>

</div>
</div>
<div class="col">
<div class="col-12 subheading">{% trans "Network" %}</div>
<div class="col-12 options">
<div class="checkbox_container">
<input name="network" id="local" type="checkbox" value="local" val-ui='Custom Network' />
<span class="checkbox"></span>
<div class="filter-label">
<label for=local>{% trans "Custom" %}</label>
</div>
</div>
<div class="checkbox_container">
<input name="network" id="ropsten" type="checkbox" value="ropsten" val-ui='Ropsten' />
<span class="checkbox"></span>
<div class="filter-label">
<label for=ropsten>{% trans "Ropsten" %}</label>
</div>
</div>
<div class="checkbox_container">
<input name="network" id="rinkeby" type="checkbox" value="rinkeby" val-ui='Rinkeby' />
<span class="checkbox"></span>
<div class="filter-label">
<label for=rinkeby>{% trans "Rinkeby" %}</label>
</div>

<div class="col" id="network-filter" style="display: hidden;">
<div class="col-12 subheading">{% trans "Network" %}</div>
<div class="col-12 options">
<div class="checkbox_container">
<input name="network" id="rinkeby" type="checkbox" value="rinkeby" val-ui='Rinkeby' />
<span class="checkbox"></span>
<div class="filter-label">
<label for=rinkeby>{% trans "Rinkeby" %}</label>
</div>
<div class="checkbox_container">
<input name="network" id="mainnet" type="checkbox" value="mainnet" val-ui='Mainnet' checked />
<span class="checkbox"></span>
<div class="filter-label">
<label for=mainnet>{% trans "Mainnet" %}</label>
</div>
</div>
<div class="checkbox_container">
<input name="network" id="mainnet" type="checkbox" value="mainnet" val-ui='Mainnet' checked />
<span class="checkbox"></span>
<div class="filter-label">
<label for=mainnet>{% trans "Mainnet" %}</label>
</div>
</div>
</div>
</div>
</form>
</div>

<script>
if(location.hostname === 'localhost') $('#network-filter').show();
</script>
22 changes: 19 additions & 3 deletions app/dashboard/templates/shared/hackathon_sponsors.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
margin: 1em;
align-items: center;
display: flex;
transition: transform .45s ease-in-out;
}

.img-holder--dark {
Expand All @@ -41,10 +42,25 @@
height: 75px;
padding: 0.8em;
}

.img-holder:hover {
transform:rotate(360deg)
}

.ui-tooltip {
padding-top: 6px;
padding-bottom: 6px;
}

.ui-tooltip-content {
font-size: 0.75rem;
font-weight: 600;
}

</style>
<div class="col-12 sponsors text-white mt-3 mb-5">
Supported by
<div class="big-sponsors d-flex flex-wrap justify-content-center mt-4">
<div class="col-12 sponsors text-white my-5">
<p class="font-weight-semibold font-subheader mb-2">SUPPORTED BY</p>
<div class="big-sponsors d-flex flex-wrap justify-content-center">
<div class="img-holder rounded-circle img-holder--dark">
<img src="{% static 'v2/images/hackathon-sponsors/big/quorum.svg' %}" alt="Quorum" title="Quorum" class="mw-100 mh-100 img-cover" width="113" height="113">
</div>
Expand Down
3 changes: 3 additions & 0 deletions app/dashboard/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1481,6 +1481,9 @@ def bounty_details(request, ghuser='', ghrepo='', ghissue=0, stdbounties_id=None
params['title'] = params['card_title']
params['card_desc'] = ellipses(bounty.issue_description_text, 255)

if bounty.event and bounty.event.slug:
params['event'] = bounty.event.slug

params['bounty_pk'] = bounty.pk
params['network'] = bounty.network
params['stdbounties_id'] = bounty.standard_bounties_id if not stdbounties_id else stdbounties_id
Expand Down