Skip to content

Commit 8b8cf60

Browse files
octavioamugdixon
andauthored
Gpg/new components (#8381)
* Install django-libsass - implement test .scss on grants page * Replaces bootstrap.min.css with bootstrap.scss * Replaces bootstrap-vue.min.css with an import to bootstrap-vue/index.scss * Replaces vue-select.css with vue-select.scss * Drops main.scss example from grants page * Adds minification rules * Moves bootstrap, bootstrap-vue, vue-select to v3/lib * Updates bootstrap v4.3.1 -> v4.6.0 * move files * Move all scss libs to scss/lib/* * remove old files * Copies all css to scss and sets fileTypes * Updates css href's -> scss (app/retail/templates/shared/head.html) * Internalises vue-innersearch.css (v0.0.12) * Updates css href's -> scss (app/app/templates/search/search.html) * Updates css href's -> scss (app/dashboard/templates/bulk_payout_bounty.html) * Updates css href's -> scss (app/dashboard/templates/labs.html) * Updates css href's -> scss (app/dashboard/templates/process_bounty.html) * Updates css href's -> scss (app/dashboard/templates/quickstart.html) * Updates css href's -> scss (app/dashboard/templates/request_payment.html) * Updates css href's -> scss (app/dashboard/templates/board/index.html) * Updates css href's -> scss (app/dashboard/templates/bounty/change.html) * Updates css href's -> scss (app/dashboard/templates/bounty/details.html) * Updates css href's -> scss (app/dashboard/templates/bounty/details2.html) * Updates css href's -> scss (app/dashboard/templates/bounty/fullfill.html) * Updates css href's -> scss (app/dashboard/templates/bounty/increase.html) * Updates css href's -> scss (app/dashboard/templates/bounty/new_bounty.html) * Updates css href's -> scss (app/dashboard/templates/dashboard/explorer.html) * Updates css href's -> scss (app/dashboard/templates/dashboard/index-vue.html) * Updates css href's -> scss (app/dashboard/templates/dashboard/index.html) * Updates css href's -> scss (app/dashboard/templates/dashboard/sponsers.html) * Updates css href's -> scss (app/dashboard/templates/dashboard/user-elastic.html) * Updates css href's -> scss (app/dashboard/templates/dashboard/users.html) * Updates css href's -> scss (app/dashboard/templates/dashboard/hackathon/hackathons.html) * Updates css href's -> scss (app/dashboard/templates/dashboard/hackathon/index.html) * Updates css href's -> scss (app/dashboard/templates/dashboard/hackathon/project_page.html) * Updates css href's -> scss (app/dashboard/templates/dashboard/hackathon/projects.html) * Internalises quill.*.css (renaming to .scss) (v1.3.6) * Updates css href's -> scss (app/dashboard/templates/ftux/onboard.html) * Copies onepage css to scss and sets fileTypes * Updates css href's -> scss (app/dashboard/templates/onepager/base.html) * Updates css href's -> scss (app/dashboard/templates/onepager/send2.html) * Updates css href's -> scss (app/dashboard/templates/profiles/profile.html) * Updates css href's -> scss (app/dashboard/templates/profiles/tribes-vue.html) * Updates css href's -> scss (app/dashboard/templates/shared/newsletter.html) * Updates css href's -> scss (app/dashboard/templates/shared/search_bar.html) * Updates css href's -> scss (app/dataviz/templates/cohort.html) * Copies admin/css/dashboard to scss and sets fileTypes * Updates css href's -> scss (app/dataviz/templates/funnel.html) * Updates css href's -> scss (app/dashboard/templates/dashboard/hackathon/onboard.html) * Updates css href's -> scss (app/dashboard/templates/profiles/tribes-vue.html) * Updates css href's -> scss (app/dataviz/templates/dataviz/admin_graph.html) * Updates css href's -> scss (app/dataviz/templates/dataviz/circles.html) * Updates css href's -> scss (app/dataviz/templates/dataviz/draggable.html) * Updates css href's -> scss (app/dataviz/templates/dataviz/graph.html) * Updates css href's -> scss (app/dataviz/templates/dataviz/heatmap.html) * Updates css href's -> scss (app/dataviz/templates/dataviz/index.html) * Updates css href's -> scss (app/dataviz/templates/dataviz/mesh.html) * Updates css href's -> scss (app/dataviz/templates/dataviz/spiral.html) * Updates css href's -> scss (app/dataviz/templates/dataviz/steamgraph.html) * Updates css href's -> scss (app/dataviz/templates/dataviz/sunburst.html) * Updates css href's -> scss (app/dataviz/templates/stats.html) * Updates css href's -> scss (app/faucet/templates/bulk_DM.html) * Updates css href's -> scss (app/faucet/templates/bulk_email.html) * Updates css href's -> scss (app/faucet/templates/process_faucet_request.html) * Updates css href's -> scss (app/grants/templates/grants/_new.html) * Updates css href's -> scss (app/grants/templates/grants/cancel.html) * Updates css href's -> scss (app/grants/templates/grants/cart-vue.html) * Updates css href's -> scss (app/grants/templates/grants/detail/_index.html) * Updates css href's -> scss (app/grants/templates/grants/detail/index.html) * Updates css href's -> scss (app/grants/templates/grants/faq.html) * Updates css href's -> scss (app/grants/templates/grants/index.html) * Updates css href's -> scss (app/grants/templates/grants/ingest-contributions.html) * Updates css href's -> scss (app/grants/templates/grants/new-whitelabel.html) * Updates css href's -> scss (app/grants/templates/grants/new.html) * Updates css href's -> scss (app/grants/templates/grants/new_match.html) * Updates css href's -> scss (app/grants/templates/grants/quickstart.html) * Updates css href's -> scss (app/kudos/templates/kudos_about.html) * Updates css href's -> scss (app/kudos/templates/kudos_details.html) * Updates css href's -> scss (app/kudos/templates/kudos_marketplace.html) * Updates css href's -> scss (app/kudos/templates/transaction/base.html) * Updates css href's -> scss (app/kudos/templates/receive_bulk.html) * Updates css href's -> scss (app/ptokens/templates/buy_a_token.html) * Updates css href's -> scss (app/ptokens/templates/personal_tokens.html) * Updates css href's -> scss (app/ptokens/templates/ptokens_buy_faq.html) * Updates css href's -> scss (app/ptokens/templates/ptokens_faq.html) * Updates css href's -> scss (app/ptokens/templates/ptokens_make_faq.html) * Updates css href's -> scss (app/quests/templates/quests/base.html) * Updates css href's -> scss (app/quests/templates/quests/new.html) * Updates css href's -> scss (app/quests/templates/quests/types/example.html) * Updates css href's -> scss (app/quests/templates/quests/types/quiz_style.html) * Updates css href's -> scss (app/retail/templates/about.html) * Updates css href's -> scss (app/retail/templates/activity.html) * Updates css href's -> scss (app/retail/templates/admin/base.html) * Updates css href's -> scss (app/retail/templates/admin/index.html) * Updates css href's -> scss (app/retail/templates/avatar_landing.html) * Updates css href's -> scss (app/retail/templates/base.html) * Updates css href's -> scss (app/retail/templates/bounties/contributor.html) * Updates css href's -> scss (app/retail/templates/bounties/contributor/activity.html) * Updates css href's -> scss (app/retail/templates/bounties/contributor/explorer.html) * Updates css href's -> scss (app/retail/templates/bounties/funder.html) * Updates css href's -> scss (app/retail/templates/emails_unsubscribed.html) * Updates css href's -> scss (app/retail/templates/emails/recap/weekly_founder_recap.html) * Updates css href's -> scss (app/retail/templates/emails/shared_template_head.html) * Updates css href's -> scss (app/retail/templates/home/index.html) * Updates css href's -> scss (app/retail/templates/home/index2020.html) * Updates css href's -> scss (app/retail/templates/how_it_works/index.html) * Updates css href's -> scss (app/retail/templates/leaderboard.html) * Updates css href's -> scss (app/retail/templates/mission.html) * Updates css href's -> scss (app/retail/templates/newkudos.html) * Updates css href's -> scss (app/retail/templates/newtoken.html) * Updates css href's -> scss (app/retail/templates/presskit.html) * Updates css href's -> scss (app/retail/templates/process_accesscode_request.html) * Updates css href's -> scss (app/retail/templates/products.html) * Updates css href's -> scss (app/retail/templates/resend_tip.html) * Updates css href's -> scss (app/retail/templates/results.html) * Updates css href's -> scss (app/retail/templates/tribes/landing.html) * Updates css href's -> scss (app/retail/templates/vision.html) * Updates css href's -> scss (app/townsquare/templates/townsquare/index.html) * Updates css href's -> scss (app/townsquare/templates/townsquare/new.html) * Updates css href's -> scss (app/townsquare/templates/townsquare/offer.html) * Renames quill-snow.scss -> quill.snow.scss * Adds misc .css (as .scss) from other locations * Adds stylelint-scss * Runs stylelint --fix * Updates stylelint * Drops preload * Drops .css from test case * Inline typography.scss (but still exclude from premailer) * Restore mocked_requests param * Drop .scss from admin * merge * Adds collectstatic to travis * Drop typography.scss from email templates * Adds collectstatic again but with --disable-collectfast flag * remove css files * Adds missing stylesheet * Fixes global btn override on quests * Fixes class name * Drops missing stylesheet * Extends block * Compress stylesheets offline in production * bundle js files and cleanup * remove duplicates * avoid using jquery-old in most pages * fix jsrender where is used * move select2 to jquery extras * Tidy up * Fixes indentation * Fixes indentation * sass variables overwrites and cleanup * sass variables overwrites and cleanup * start nav styles * nav icons * add custom variables * Fixes footer to the bottom of the screen (using flexbox) * Hides #top_nav_notification until .ready (stops el from showing empty before removal) * Fixes linting * fix wallet icon * Fixes naming convention for variables/mixins * Adds new fonts (Libre Franklin & Miriam Libre) * Updates the remaining nav's, replaces logos and makes provider-icon responsive * Override bootstrap font definitions * Drops Futura and Muli font definitions and files * Implements hot-module-reloading * Moves livereload to requirements/test.txt * Moves dj_static to requirements/test.txt * Fixes indentation * Fixes closing tags and adds footer to base * add font variants support * fix font type * move typography and css cleanup * Fixes page overflowing on profile * Tidies up navs * Fixes fonts, colours and containers * Fixes gh-login position on landingpage * Fixes spacing of gh-login on main nav * Re-enables cart and switches styles to regular (fas->far) * Adds button variables and assigns colors * First batch of btn replacements * Second batch of btn replacements * Drops .btn definitions that conflict with bootstrap * font base increase * fix funder page * Changes more .btn-gc-*'s over to .btn-* * Tidy up variables * Adds labels to navbar icons in mobile view * Makes notification dot responsive (em->rem) * Drops surplus container * Updates townsquare (mobile and darkmode) * Makes 'find a tribe' button more responsive * Fixes <a> tag colors * Fixes Join Hackathon 401 error (missing mailchimp config in staging) * Updates to products page * Drops line-height definition on p tag's * Use a version of the animated logo for townsquare/mission nav (dirty/quickfix) * Ensures logo is initially white during load (for dark-mode) * Fixes positioning of townsquare logo for mobile view * Darkens modal background for hackathons onboarding * Updates colors on townsquare (text/onboarding modal) * Fixes grants collapse icon positioning and truncates long category names * Changes "Search Grant" -> "Filter Grants" on sidebar searchKeyword input Co-authored-by: Graham Dixon <graham@gdixon.co.uk>
1 parent b912875 commit 8b8cf60

File tree

361 files changed

+18311
-14912
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

361 files changed

+18311
-14912
lines changed

app/app/settings.py

+1
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
'django.contrib.messages',
9292
'collectfast', # Collectfast | static file collector
9393
'django.contrib.staticfiles',
94+
'livereload',
9495
'cacheops',
9596
'storages',
9697
'social_django',

app/app/templates/search/search.html

+122-120
Original file line numberDiff line numberDiff line change
@@ -30,133 +30,135 @@
3030
</head>
3131

3232
<body id="{{ explore }}" class="interior {{active}} g-font-muli">
33-
{% include 'shared/tag_manager_2.html' %}
34-
<div class="container-fluid header dash">
35-
{% include 'shared/top_nav.html' with class='d-md-flex' %}
36-
{% include 'home/nav.html' %}
37-
</div>
38-
{% block content %}
39-
<h2>Search</h2>
40-
41-
<form method="get" action="">
42-
<table>
43-
{{ form.as_table }}
44-
<tr>
45-
<td>&nbsp;</td>
46-
<td>
47-
<input type="submit" value="Search">
48-
</td>
49-
</tr>
50-
</table>
51-
52-
{% if query %}
53-
<h3>Results</h3>
54-
55-
{% for result in page.object_list %}
56-
<p>
57-
<a href="{{ result.object.get_absolute_url }}">{{ result.object.title }}</a>
58-
</p>
59-
{% empty %}
60-
<p>No results found.</p>
61-
{% endfor %}
62-
63-
{% if page.has_previous or page.has_next %}
64-
<div>
65-
{% if page.has_previous %}<a href="?q={{ query }}&amp;page={{ page.previous_page_number }}">{% endif %}&laquo; Previous{% if page.has_previous %}</a>{% endif %}
66-
|
67-
{% if page.has_next %}<a href="?q={{ query }}&amp;page={{ page.next_page_number }}">{% endif %}Next &raquo;{% if page.has_next %}</a>{% endif %}
68-
</div>
69-
{% endif %}
70-
{% else %}
71-
{# Show some example queries to run, maybe query syntax, something else? #}
72-
{% endif %}
73-
</form>
74-
{% endblock %}
75-
<div id="gc-users-directory" v-cloak>
76-
77-
<section>
78-
<h1 class='is-title'>Hacky User Directory</h1>
79-
80-
<hr class='is-line' />
81-
82-
<div class="filters" style="width : 90%; margin : 0 auto;">
83-
<tag-filter :for="'searchbox'"></tag-filter>
84-
<tag-filter :for="'searchdatalist'">
85-
<template slot-scope="{ data }">
86-
[[ data._source.keywords ]]
87-
</template>
88-
</tag-filter>
89-
<tag-filter :for="'nlf'">
90-
<template slot-scope="{ data }">
91-
Number of Hacks Joined: [[ data._source.keywords ]]
92-
</template>
93-
</tag-filter>
94-
</div>
95-
96-
<div class="is-columns">
97-
<div class="is-column is-one-fifth">
33+
<div class="content__main min-vh-100 d-md-flex flex-column">
34+
{% include 'shared/tag_manager_2.html' %}
35+
<div class="container-fluid header dash">
36+
{% include 'shared/top_nav.html' with class='d-md-flex' %}
37+
{% include 'home/nav.html' %}
38+
</div>
39+
{% block content %}
40+
<h2>Search</h2>
41+
42+
<form method="get" action="">
43+
<table>
44+
{{ form.as_table }}
45+
<tr>
46+
<td>&nbsp;</td>
47+
<td>
48+
<input type="submit" value="Search">
49+
</td>
50+
</tr>
51+
</table>
52+
53+
{% if query %}
54+
<h3>Results</h3>
55+
56+
{% for result in page.object_list %}
57+
<p>
58+
<a href="{{ result.object.get_absolute_url }}">{{ result.object.title }}</a>
59+
</p>
60+
{% empty %}
61+
<p>No results found.</p>
62+
{% endfor %}
63+
64+
{% if page.has_previous or page.has_next %}
9865
<div>
99-
<numeric-list-filter :id="'nlf'" :field="'num_hacks_joined'">
100-
<template slot="header">
101-
<h3 class="is-nlf-title">Number of Hacks Joined : </h3>
102-
</template>
103-
</numeric-list-filter>
66+
{% if page.has_previous %}<a href="?q={{ query }}&amp;page={{ page.previous_page_number }}">{% endif %}&laquo; Previous{% if page.has_previous %}</a>{% endif %}
67+
|
68+
{% if page.has_next %}<a href="?q={{ query }}&amp;page={{ page.next_page_number }}">{% endif %}Next &raquo;{% if page.has_next %}</a>{% endif %}
10469
</div>
70+
{% endif %}
71+
{% else %}
72+
{# Show some example queries to run, maybe query syntax, something else? #}
73+
{% endif %}
74+
</form>
75+
{% endblock %}
76+
<div id="gc-users-directory" v-cloak>
77+
78+
<section>
79+
<h1 class='is-title'>Hacky User Directory</h1>
80+
81+
<hr class='is-line' />
82+
83+
<div class="filters" style="width : 90%; margin : 0 auto;">
84+
<tag-filter :for="'searchbox'"></tag-filter>
85+
<tag-filter :for="'searchdatalist'">
86+
<template slot-scope="{ data }">
87+
[[ data._source.keywords ]]
88+
</template>
89+
</tag-filter>
90+
<tag-filter :for="'nlf'">
91+
<template slot-scope="{ data }">
92+
Number of Hacks Joined: [[ data._source.keywords ]]
93+
</template>
94+
</tag-filter>
10595
</div>
106-
<div class="is-column">
107-
<div>
108-
<searchbox :id="'searchbox'" :autofocus="true" :realtime="true" :timeout="200" :field="['keywords', 'handle', 'persona']" :placeholder="'Search by keyword'"></searchbox>
109-
<search-datalist :id="'searchdatalist'" :realtime="true" :field="'keywords'" :suggestion="['keywords']">
110-
<template slot="items" slot-scope="{ item, value }">
111-
[[ value ]] [[ item._source.keywords ]]
112-
</template>
113-
114-
<template slot="nosuggestion" slot-scope="{ value }">
115-
Sorry, "[[ value ]]" doesn't exist... :(
116-
</template>
117-
118-
<template slot="suggestions" slot-scope="{ suggestion }">
119-
<span v-html="suggestion.highlight.first_name ? suggestion.highlight.first_name[0] : suggestion._source.first_name"></span>
120-
<span v-html="suggestion.highlight.last_name ? suggestion.highlight.last_name[0] : suggestion._source.last_name"></span>
121-
<span v-html="suggestion.highlight.handle ? suggestion.highlight.handle[0] : suggestion._source.handle"></span>
122-
<span v-html="suggestion.highlight.persona ? suggestion.highlight.persona[0] : suggestion._source.persona"></span>
123-
</template>
124-
</search-datalist>
125-
126-
<div style="margin: 20px auto;width: 90%">
127-
<search-button></search-button>
128-
<reset-button :emptyHits="false"></reset-button>
96+
97+
<div class="is-columns">
98+
<div class="is-column is-one-fifth">
99+
<div>
100+
<numeric-list-filter :id="'nlf'" :field="'num_hacks_joined'">
101+
<template slot="header">
102+
<h3 class="is-nlf-title">Number of Hacks Joined : </h3>
103+
</template>
104+
</numeric-list-filter>
105+
</div>
106+
</div>
107+
<div class="is-column">
108+
<div>
109+
<searchbox :id="'searchbox'" :autofocus="true" :realtime="true" :timeout="200" :field="['keywords', 'handle', 'persona']" :placeholder="'Search by keyword'"></searchbox>
110+
<search-datalist :id="'searchdatalist'" :realtime="true" :field="'keywords'" :suggestion="['keywords']">
111+
<template slot="items" slot-scope="{ item, value }">
112+
[[ value ]] [[ item._source.keywords ]]
113+
</template>
114+
115+
<template slot="nosuggestion" slot-scope="{ value }">
116+
Sorry, "[[ value ]]" doesn't exist... :(
117+
</template>
118+
119+
<template slot="suggestions" slot-scope="{ suggestion }">
120+
<span v-html="suggestion.highlight.first_name ? suggestion.highlight.first_name[0] : suggestion._source.first_name"></span>
121+
<span v-html="suggestion.highlight.last_name ? suggestion.highlight.last_name[0] : suggestion._source.last_name"></span>
122+
<span v-html="suggestion.highlight.handle ? suggestion.highlight.handle[0] : suggestion._source.handle"></span>
123+
<span v-html="suggestion.highlight.persona ? suggestion.highlight.persona[0] : suggestion._source.persona"></span>
124+
</template>
125+
</search-datalist>
126+
127+
<div style="margin: 20px auto;width: 90%">
128+
<search-button></search-button>
129+
<reset-button :emptyHits="false"></reset-button>
130+
</div>
131+
<hits>
132+
<template slot="hits" slot-scope="{ hits }">
133+
<div class="is-score is-hits">
134+
<strong v-if="hits.score === 0">No result found</strong>
135+
<strong v-else-if="hits.score === 1">1 result found</strong>
136+
<strong v-else-if="hits.score > 1">[[ hits.score ]] results found</strong>
137+
</div>
138+
<div v-for="item in hits.items" :item="item">
139+
<div><strong>Identity (firstname, lastname) :</strong> ([[ item._source.first_name ]] [[ item._source.last_name ]] )</div>
140+
</div>
141+
</template>
142+
</hits>
143+
144+
<paginate :previousText="'&#x2B9C; Previous page'" :nextText="'Next page &#x2B9E;'" :size="10"></paginate>
129145
</div>
130-
<hits>
131-
<template slot="hits" slot-scope="{ hits }">
132-
<div class="is-score is-hits">
133-
<strong v-if="hits.score === 0">No result found</strong>
134-
<strong v-else-if="hits.score === 1">1 result found</strong>
135-
<strong v-else-if="hits.score > 1">[[ hits.score ]] results found</strong>
136-
</div>
137-
<div v-for="item in hits.items" :item="item">
138-
<div><strong>Identity (firstname, lastname) :</strong> ([[ item._source.first_name ]] [[ item._source.last_name ]] )</div>
139-
</div>
140-
</template>
141-
</hits>
142-
143-
<paginate :previousText="'&#x2B9C; Previous page'" :nextText="'Next page &#x2B9E;'" :size="10"></paginate>
144146
</div>
145147
</div>
146-
</div>
147-
</section>
148+
</section>
149+
</div>
150+
151+
<script type="text/x-template" id="select2-template">
152+
<select>
153+
<slot></slot>
154+
</select>
155+
</script>
156+
157+
{% csrf_token %}
158+
{% include 'shared/analytics.html' %}
159+
{% include 'shared/footer_scripts.html' with slim=1 %}
160+
{% include 'shared/footer.html' %}
148161
</div>
149-
150-
<script type="text/x-template" id="select2-template">
151-
<select>
152-
<slot></slot>
153-
</select>
154-
</script>
155-
156-
{% csrf_token %}
157-
{% include 'shared/analytics.html' %}
158-
{% include 'shared/footer_scripts.html' with slim=1 %}
159-
{% include 'shared/footer.html' %}
160162
<script src="https://cdn.jsdelivr.net/npm/vue-innersearch@0.0.12/innersearch.min.js"></script>
161163

162164

app/app/templates/shared/hackathon-list.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -52,26 +52,26 @@ <h5 class="font-subheader font-weight-semibold">
5252

5353
<div class="mt-3 hackathon-actions">
5454
{% if event.end_date|timesince_fromisoformat <= "1 min" %}
55-
<a href="{% url 'hackathon_onboard' event.slug %}" class="btn {% if force_color %}no-pink{% endif %} btn-gc-blue font-caption font-weight-semibold px-3 mb-2">
55+
<a href="{% url 'hackathon_onboard' event.slug %}" class="btn {% if force_color %}no-pink{% endif %} btn-primary font-caption px-3 mb-2">
5656
<i class="fas fa-user-plus mr-2 d-none d-sm-inline"></i>
5757
Join
5858
</a>
5959
{% endif %}
6060
{% if event.display_showcase %}
61-
<a href="{% url 'hackathon_showcase_proxy' event.slug %}" class="btn {% if force_color %}no-pink{% endif %} btn-gc-blue font-caption font-weight-semibold px-3 mb-2">
61+
<a href="{% url 'hackathon_showcase_proxy' event.slug %}" class="btn {% if force_color %}no-pink{% endif %} btn-primary font-caption px-3 mb-2">
6262
<i class="fas fa-star d-none d-sm-inline" style="font-size:6.5px;position:relative;top:0.2rem;left:0.2rem;"></i>
6363
<i class="fas fa-star mr-1 d-none d-sm-inline"></i>
6464
Showcase
6565
</a>
6666
{% endif %}
6767
{% if event.start_date|timesince_fromisoformat >= "1 min" and event.end_date|timesince_fromisoformat <= "1 min"%}
68-
<a href="{% url 'hackathon_prizes' event.slug %}" class="btn {% if force_color %}no-pink{% endif %} button--secondary font-caption font-weight-semibold px-3 mb-2">
68+
<a href="{% url 'hackathon_prizes' event.slug %}" class="btn {% if force_color %}no-pink{% endif %} btn-outline-primary font-caption px-3 mb-2">
6969
<i class="fas fa-trophy mr-2 d-none d-sm-inline"></i>
7070
Prizes
7171
</a>
7272
{% endif %}
7373
{% if event.show_results %}
74-
<a href="{% url 'hackathon_projects' event.slug %}" class="btn {% if force_color %}no-pink{% endif %} button--secondary font-caption font-weight-semibold px-3 mb-2">
74+
<a href="{% url 'hackathon_projects' event.slug %}" class="btn {% if force_color %}no-pink{% endif %} btn-outline-primary font-caption px-3 mb-2">
7575
<i class="fas fa-dharmachakra mr-2 d-none d-sm-inline"></i>
7676
Projects
7777
</a>

app/app/wsgi.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,5 @@
2727
from raven.contrib.django.raven_compat.middleware.wsgi import Sentry
2828
application = Sentry(get_wsgi_application())
2929
else:
30-
application = get_wsgi_application()
30+
from dj_static import Cling
31+
application = Cling(get_wsgi_application())

app/assets/onepager/css/main.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ body #main a.no-pink:hover {
553553
color: var(--gc-blue-hover);
554554
}
555555

556-
body #main a.no-pink.btn-gc-blue {
556+
body #main a.no-pink.btn-primary {
557557
color: #ffffff;
558558
}
559559

-24.9 KB
Binary file not shown.

app/assets/v2/fonts/futura/font1.ttf

-46.1 KB
Binary file not shown.

app/assets/v2/fonts/futura/font2.ttf

-42.1 KB
Binary file not shown.

app/assets/v2/fonts/futura/font3.ttf

-42.1 KB
Binary file not shown.

app/assets/v2/fonts/futura/font4.ttf

-50.3 KB
Binary file not shown.

app/assets/v2/fonts/futura/font5.ttf

-56.2 KB
Binary file not shown.

app/assets/v2/fonts/futura/font6.ttf

-72.7 KB
Binary file not shown.

app/assets/v2/fonts/futura/font7.ttf

-39.6 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)