Skip to content

Commit de96d8d

Browse files
octavioamugdixonthelostone-mc
authored
New brand styles integration (#8368)
* 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 Co-authored-by: Graham Dixon <[email protected]> Co-authored-by: Aditya Anand M C <[email protected]>
1 parent bab8be6 commit de96d8d

File tree

259 files changed

+5832
-3136
lines changed

Some content is hidden

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

259 files changed

+5832
-3136
lines changed

.stylelintignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,7 @@ app/assets/v2/css/bootstrap-vue.min.css
44
app/assets/v2/js/lib/tweenlite.js
55
app/assets/v2/js/abi.js
66
app/assets/v2/css/lib/*
7+
8+
app/assets/v2/scss/jquery.select2.min.scss
9+
app/assets/v2/scss/vue-innersearch.scss
10+
app/assets/v2/scss/lib/*

.stylelintrc

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"extends": "stylelint-config-recommended",
33
"rules": {
4+
"no-descending-specificity": null,
45
"at-rule-no-unknown": [
56
true, {
67
"ignoreAtRules": [
@@ -25,7 +26,11 @@
2526
"vh",
2627
"pt",
2728
"vmin",
28-
"fr"
29+
"fr",
30+
"turn"
2931
]
30-
}
32+
},
33+
"plugins": [
34+
"stylelint-scss"
35+
],
3136
}

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ jobs:
4747
- pip install -r requirements/test.txt
4848
- npm run eslint
4949
- npm run stylelint
50+
- (cd app; python3 ./manage.py collectstatic --noinput --disable-collectfast)
5051
- pytest -p no:ethereum -p no:warnings
5152
# Generate Markdown documentation and static docs page.
5253
- pydocmd build

app/app/settings.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,10 @@
208208
]
209209
# number of demicals allowed in sass numbers
210210
LIBSASS_PRECISION = 8
211-
# minify sass output in production
211+
# minify sass output in production (offline)
212212
if ENV not in ['local', 'test', 'staging', 'preview']:
213+
# compress offline (use './manage.py compress' to build manifest.json)
214+
COMPRESS_OFFLINE = True
213215
# drop line comments
214216
LIBSASS_SOURCE_COMMENTS = False
215217
# minification of sass output

app/app/templates/search/search.html

Lines changed: 109 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,32 @@
11
{% comment %}
2-
Copyright (C) 2020 Gitcoin Core
2+
Copyright (C) 2020 Gitcoin Core
33

4-
This program is free software: you can redistribute it and/or modify
5-
it under the terms of the GNU Affero General Public License as published
6-
by the Free Software Foundation, either version 3 of the License, or
7-
(at your option) any later version.
4+
This program is free software: you can redistribute it and/or modify
5+
it under the terms of the GNU Affero General Public License as published
6+
by the Free Software Foundation, either version 3 of the License, or
7+
(at your option) any later version.
88

9-
This program is distributed in the hope that it will be useful,
10-
but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
GNU Affero General Public License for more details.
13-
14-
You should have received a copy of the GNU Affero General Public License
15-
along with this program. If not, see <http://www.gnu.org/licenses/>.
9+
This program is distributed in the hope that it will be useful,
10+
but WITHOUT ANY WARRANTY; without even the implied warranty of
11+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12+
GNU Affero General Public License for more details.
1613

14+
You should have received a copy of the GNU Affero General Public License
15+
along with this program. If not, see <http://www.gnu.org/licenses/>.
1716
{% endcomment %}
18-
{% load i18n static email_obfuscator add_url_schema avatar_tags %}
17+
{% load i18n static email_obfuscator add_url_schema avatar_tags compress %}
1918
<!DOCTYPE html>
20-
<html lang="en">
19+
<html lang="en">
2120

2221
<head>
2322
{% include 'shared/head.html' %}
2423
{% include 'shared/cards.html' %}
25-
<link rel="stylesheet" href={% static "v2/css/users.css" %} />
26-
<link rel="stylesheet" href={% static "v2/css/tag.css" %} />
27-
<link rel="stylesheet" href={% static "v2/css/rating.css" %} />
28-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/default-innersearch-theme.min.css">
24+
{% compress css file search %}
25+
<link rel="stylesheet" type="text/x-scss" href={% static "v2/scss/users.scss" %} />
26+
<link rel="stylesheet" type="text/x-scss" href={% static "v2/scss/tag.scss" %} />
27+
<link rel="stylesheet" type="text/x-scss" href={% static "v2/scss/rating.scss" %} />
28+
<link rel="stylesheet" type="text/x-scss" href={% static "v2/scss/vue-innersearch.scss" %}>
29+
{% endcompress %}
2930
</head>
3031

3132
<body id="{{ explore }}" class="interior {{active}} g-font-muli">
@@ -38,39 +39,39 @@
3839
<h2>Search</h2>
3940

4041
<form method="get" action="">
41-
<table>
42-
{{ form.as_table }}
43-
<tr>
44-
<td>&nbsp;</td>
45-
<td>
46-
<input type="submit" value="Search">
47-
</td>
48-
</tr>
49-
</table>
50-
51-
{% if query %}
52-
<h3>Results</h3>
53-
54-
{% for result in page.object_list %}
55-
<p>
56-
<a href="{{ result.object.get_absolute_url }}">{{ result.object.title }}</a>
57-
</p>
58-
{% empty %}
59-
<p>No results found.</p>
60-
{% endfor %}
61-
62-
{% if page.has_previous or page.has_next %}
63-
<div>
64-
{% if page.has_previous %}<a href="?q={{ query }}&amp;page={{ page.previous_page_number }}">{% endif %}&laquo; Previous{% if page.has_previous %}</a>{% endif %}
65-
|
66-
{% if page.has_next %}<a href="?q={{ query }}&amp;page={{ page.next_page_number }}">{% endif %}Next &raquo;{% if page.has_next %}</a>{% endif %}
67-
</div>
68-
{% endif %}
69-
{% else %}
70-
{# Show some example queries to run, maybe query syntax, something else? #}
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>
7169
{% endif %}
70+
{% else %}
71+
{# Show some example queries to run, maybe query syntax, something else? #}
72+
{% endif %}
7273
</form>
73-
{% endblock %}
74+
{% endblock %}
7475
<div id="gc-users-directory" v-cloak>
7576

7677
<section>
@@ -79,71 +80,71 @@ <h1 class='is-title'>Hacky User Directory</h1>
7980
<hr class='is-line' />
8081

8182
<div class="filters" style="width : 90%; margin : 0 auto;">
82-
<tag-filter :for="'searchbox'"></tag-filter>
83-
<tag-filter :for="'searchdatalist'">
84-
<template slot-scope="{ data }">
85-
[[ data._source.keywords ]]
86-
</template>
87-
</tag-filter>
88-
<tag-filter :for="'nlf'">
89-
<template slot-scope="{ data }">
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 }">
9091
Number of Hacks Joined: [[ data._source.keywords ]]
9192
</template>
92-
</tag-filter>
93+
</tag-filter>
9394
</div>
9495

9596
<div class="is-columns">
96-
<div class="is-column is-one-fifth">
97-
<div>
98-
<numeric-list-filter :id="'nlf'" :field="'num_hacks_joined'">
99-
<template slot="header">
100-
<h3 class="is-nlf-title">Number of Hacks Joined : </h3>
101-
</template>
102-
</numeric-list-filter>
103-
</div>
97+
<div class="is-column is-one-fifth">
98+
<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>
104+
</div>
105+
</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>
129+
</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>
104144
</div>
105-
<div class="is-column">
106-
<div>
107-
<searchbox :id="'searchbox'" :autofocus="true" :realtime="true" :timeout="200" :field="['keywords', 'handle', 'persona']" :placeholder="'Search by keyword'"></searchbox>
108-
<search-datalist :id="'searchdatalist'" :realtime="true" :field="'keywords'" :suggestion="['keywords']">
109-
<template slot="items" slot-scope="{ item, value }">
110-
[[ value ]] [[ item._source.keywords ]]
111-
</template>
112-
113-
<template slot="nosuggestion" slot-scope="{ value }">
114-
Sorry, "[[ value ]]" doesn't exist... :(
115-
</template>
116-
117-
<template slot="suggestions" slot-scope="{ suggestion }">
118-
<span v-html="suggestion.highlight.first_name ? suggestion.highlight.first_name[0] : suggestion._source.first_name"></span>
119-
<span v-html="suggestion.highlight.last_name ? suggestion.highlight.last_name[0] : suggestion._source.last_name"></span>
120-
<span v-html="suggestion.highlight.handle ? suggestion.highlight.handle[0] : suggestion._source.handle"></span>
121-
<span v-html="suggestion.highlight.persona ? suggestion.highlight.persona[0] : suggestion._source.persona"></span>
122-
</template>
123-
</search-datalist>
124-
125-
<div style="margin: 20px auto;width: 90%">
126-
<search-button></search-button>
127-
<reset-button :emptyHits="false"></reset-button>
128-
</div>
129-
<hits>
130-
<template slot="hits" slot-scope="{ hits }">
131-
<div class="is-score is-hits">
132-
<strong v-if="hits.score === 0">No result found</strong>
133-
<strong v-else-if="hits.score === 1">1 result found</strong>
134-
<strong v-else-if="hits.score > 1">[[ hits.score ]] results found</strong>
135-
</div>
136-
<div v-for="item in hits.items" :item="item">
137-
<div><strong>Identity (firstname, lastname) :</strong> ([[ item._source.first_name ]] [[ item._source.last_name ]] )</div>
138-
</div>
139-
</template>
140-
</hits>
141-
142-
<paginate :previousText="'&#x2B9C; Previous page'" :nextText="'Next page &#x2B9E;'" :size="10"></paginate>
143-
</div>
144-
</div>
145+
</div>
145146
</div>
146-
</section>
147+
</section>
147148
</div>
148149

149150
<script type="text/x-template" id="select2-template">
@@ -154,7 +155,7 @@ <h3 class="is-nlf-title">Number of Hacks Joined : </h3>
154155

155156
{% csrf_token %}
156157
{% include 'shared/analytics.html' %}
157-
{% include 'shared/footer_scripts.html' %}
158+
{% include 'shared/footer_scripts.html' with slim=1 %}
158159
{% include 'shared/footer.html' %}
159160
<script src="https://cdn.jsdelivr.net/npm/[email protected]/innersearch.min.js"></script>
160161

app/app/templates/shared/tip_dependancies.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@
1414
You should have received a copy of the GNU Affero General Public License
1515
along with this program. If not, see <http://www.gnu.org/licenses/>.
1616
{% endcomment %}
17-
{% load static %}
18-
<script src="{% static "v2/js/tokens.js" %}"></script>
17+
{% load static compress %}
18+
1919
<script src="/dynamic/js/tokens_dynamic.js"></script>
2020
<script src="{% static "v2/js/lib/ipfs-api.js" %}"></script>
21+
{% compress js file tip_dependancies %}
22+
<script src="{% static "v2/js/tokens.js" %}"></script>
2123
<script src="{% static "v2/js/ipfs.js" %}"></script>
2224
<script src="{% static "v2/js/lib/secrets.min.js" %}"></script>
2325
<script src="{% static "v2/js/ethereumjs-accounts.js" %}"></script>
2426
<script src="{% static "onepager/js/send.js" %}"></script>
25-
<script src="{% static "v2/js/truncate-hash.js" %}"></script>
27+
{% endcompress %}
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11

22
.floating{
3-
animation: floating 3s ease-in-out infinite;
3+
animation: floating 3s ease-in-out infinite;
44
}
55

66
.floating2{
7-
animation: floating2 3s ease-in-out infinite;
7+
animation: floating2 3s ease-in-out infinite;
88
}
99

1010
@keyframes floating {
11-
0% { transform: translate(0, 0px); }
12-
50% { transform: translate(0, 15px); }
13-
100% { transform: translate(0, 0px); }
11+
0% { transform: translate(0, 0px); }
12+
50% { transform: translate(0, 15px); }
13+
100% { transform: translate(0, 0px); }
1414
}
1515

1616
@keyframes floating2 {
17-
0% { transform: translate(0, 15px); }
18-
50% { transform: translate(0, 0px); }
19-
100% { transform: translate(0, 15px); }
17+
0% { transform: translate(0, 15px); }
18+
50% { transform: translate(0, 0px); }
19+
100% { transform: translate(0, 15px); }
2020
}

app/assets/landingpage/breakpoints.scss

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,27 @@ $phone: "(max-width: 688px)";
55

66

77
@media #{$desktop} {
8-
:root{
9-
--device: "desktop";
10-
}
8+
:root{
9+
--device: "desktop";
10+
}
1111
}
1212

1313
@media #{$laptop} {
14-
:root{
15-
--device: "laptop";
16-
}
14+
:root{
15+
--device: "laptop";
16+
}
1717
}
1818

1919
@media #{$tablet} {
20-
:root{
21-
--device: "tablet";
22-
}
20+
:root{
21+
--device: "tablet";
22+
}
2323
}
2424

2525
@media #{$phone} {
26-
:root{
27-
--device: "phone";
28-
}
26+
:root{
27+
--device: "phone";
28+
}
2929
}
3030

3131

0 commit comments

Comments
 (0)