Skip to content

Commit 7f2311f

Browse files
thelostone-mcthelostone-mc
committed
chore: indent + css fixes on ts
1 parent 3b31741 commit 7f2311f

6 files changed

Lines changed: 119 additions & 125 deletions

File tree

‎app/retail/templates/shared/activity.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@
570570
<div class="mt-1 mb-2">
571571
<div class="row align-items-center bg-light content py-3">
572572
<div class="col-12 col-md-2 text-center">
573-
<img class="logo-metacard rounded-circle" src="{% if row.grant.logo and row.grant.logo.url %}{{ row.grant.logo.url }}{% else %}{% with grant_logo='v2/images/grants/logos/' id=row.grant.id|modulo:3 %}{% static grant_logo|addstr:id|add:'.png' %}{% endwith %}{% endif %}">
573+
<img class="logo-metacard" src="{% if row.grant.logo and row.grant.logo.url %}{{ row.grant.logo.url }}{% else %}{% with grant_logo='v2/images/grants/logos/' id=row.grant.id|modulo:3 %}{% static grant_logo|addstr:id|add:'.png' %}{% endwith %}{% endif %}">
574574
</div>
575575
<div class="col-12 col-md-9 text-left">
576576
<p class="mt-2 mb-1 font-weight-bold" style="font-size: 1.2em;">{{ row.grant.title }}</p>

‎app/townsquare/templates/townsquare/index.html‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,6 @@
7979
.box-hackathons-townsquare .card-body .font-weight-semibold {
8080
margin: 0;
8181
}
82-
83-
.box-hackathons .view-all {
84-
padding: 0px 0px 0px 20px;
85-
font-weight: 700;
86-
}
8782
</style>
8883
<script src="{% static "v2/js/theme_switcher.js" %}"></script> <!-- needs to be in the head section -->
8984
</head>

‎app/townsquare/templates/townsquare/shared/feednav.html‎

Lines changed: 79 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,81 @@
1-
<div class="townsquare_nav-list my-1">
2-
<div class="townsquare_block-header" data-target="feeds" >
3-
Feeds
4-
</div>
5-
<ul id=feeds class="nav d-inline-block font-body mb-2">
6-
{% for this_tab in tabs %}
7-
{% include 'townsquare/shared/thistab.html' %}
8-
{% endfor %}
9-
</ul>
10-
{% if hackathon_tabs|length %}
11-
<div class="townsquare_block-header mt-1" data-target="hackathons">
12-
Hackathons
13-
</div>
14-
<ul id=hackathons class="nav d-inline-block font-body mb-2">
15-
{% for this_tab in hackathon_tabs %}
16-
{% include 'townsquare/shared/thistab.html' %}
17-
{% endfor %}
18-
</ul>
19-
{% endif %}
20-
<div class="townsquare_nav-list mb-1 mt-1">
21-
<div class="townsquare_block-header" data-target="filter">
22-
Filter
23-
</div>
24-
<ul id=filter class="nav d-inline-block font-body mb-2">
25-
{% for tag in tags %}
26-
{% include 'townsquare/shared/tag.html' %}
27-
{% endfor %}
28-
</ul>
29-
</div>
30-
</div>
1+
<div class="townsquare_nav-list my-3">
2+
<div class="townsquare_block-header" data-target="feeds" >
3+
Feeds
4+
</div>
5+
<ul id=feeds class="nav d-inline-block font-body mb-2">
6+
{% for this_tab in tabs %}
7+
{% include 'townsquare/shared/thistab.html' %}
8+
{% endfor %}
9+
</ul>
10+
{% if hackathon_tabs|length %}
11+
<div class="townsquare_block-header mt-2" data-target="hackathons">
12+
Hackathons
13+
</div>
14+
<ul id=hackathons class="nav d-inline-block font-caption mb-2">
15+
{% for this_tab in hackathon_tabs %}
16+
{% include 'townsquare/shared/thistab.html' %}
17+
{% endfor %}
18+
</ul>
19+
{% endif %}
20+
<div class="townsquare_nav-list my-3">
21+
<div class="townsquare_block-header" data-target="filter">
22+
Filter
23+
</div>
24+
<ul id=filter class="nav d-inline-block font-caption mb-2">
25+
{% for tag in tags %}
26+
{% include 'townsquare/shared/tag.html' %}
27+
{% endfor %}
28+
</ul>
29+
</div>
30+
</div>
3131

32-
<div class="townsquare_nav-list my-1 tribe">
33-
<div class="townsquare_block-header" data-target="tribes">
34-
Shortcuts
35-
</div>
36-
<div id="tribes">
37-
<ul class="nav d-inline-block font-body">
38-
{% for tribe in following_tribes %}
39-
<li class="nav-item">
40-
<a data-toggle="tooltip" title="@{{tribe.title}}'s Tribe" class="nav-link nav-line" href="/{{ tribe.title }}">
41-
<img src="{{tribe.avatar_url}}" class="rounded avatar">
42-
<span class="nav-title">{{tribe.title}}</span>
43-
{% if tribe.badge %}
44-
<span class="nav-badge">({{ tribe.badge }})</span>
45-
{% endif %}
46-
</a>
47-
</li>
48-
{% endfor %}
49-
</ul>
50-
<div class="townsquare_nav-list_footer font-body font-weight-semibold">
51-
<a href="{% url "tribes_directory" %}">
52-
Explore Tribes
53-
<i class="ml-1 fab fa-wpexplorer font-weight-normal"></i>
54-
</a>
55-
</div>
56-
</div>
57-
</div>
32+
<div class="townsquare_nav-list my-3 tribe">
33+
<div class="townsquare_block-header" data-target="tribes">
34+
Shortcuts
35+
</div>
36+
<div id="tribes">
37+
<ul class="nav d-inline-block font-caption">
38+
{% for tribe in following_tribes %}
39+
<li class="nav-item">
40+
<a data-toggle="tooltip" title="@{{tribe.title}}'s Tribe" class="nav-link nav-line" href="/{{ tribe.title }}">
41+
<img src="{{tribe.avatar_url}}" class="rounded-circle avatar">
42+
<span class="nav-title">{{tribe.title}}</span>
43+
{% if tribe.badge %}
44+
<span class="nav-badge">({{ tribe.badge }})</span>
45+
{% endif %}
46+
</a>
47+
</li>
48+
{% endfor %}
49+
</ul>
50+
<div class="townsquare_nav-list_footer font-body font-weight-semibold">
51+
<a href="{% url "tribes_directory" %}">
52+
Explore Tribes
53+
<i class="ml-1 fab fa-wpexplorer font-weight-normal"></i>
54+
</a>
55+
</div>
56+
</div>
57+
</div>
5858

59-
<div class="townsquare_nav-list my-2 tribe">
60-
<div class="townsquare_block-header" data-target="suggested-tribes">
61-
Suggested Tribes
62-
</div>
63-
<div id="suggested-tribes">
64-
<ul class="nav d-inline-block font-body col-sm-9 pr-2" style="padding-right: 0">
65-
{% for tribe in suggested_tribes %}
66-
<li class="nav-item d-flex justify-content-between align-items-center my-2">
67-
<a href="/profile/{{ tribe.title }}" class="d-flex nav-link nav-line pr-0 mr-0">
68-
<img src="{{tribe.avatar_url}}" class="nav_avatar mr-4" />
69-
<span class="font-caption">
70-
<span class="nav-title font-weight-semibold pt-0 mb-0 text-capitalize">{{tribe.title}}</span><br>
71-
<p class="mb-0">
72-
<i class="fas fa-user font-smaller-4 mr-1"></i>
73-
<span class="font-weight-semibold">{{ tribe.follower_count }}</span> followers
74-
</p>
75-
</span>
76-
</a>
77-
<a class="follow_tribe btn btn-sm btn-gc-blue font-weight-bold font-smaller-6 px-3" href="#" data-jointribe="{{ tribe.title }}">
78-
Follow
79-
</a>
80-
</li>
81-
{% endfor %}
82-
</ul>
83-
</div>
84-
</div>
59+
<div class="townsquare_nav-list my-3 tribe">
60+
<div class="townsquare_block-header" data-target="suggested-tribes">
61+
Suggested Tribes
62+
</div>
63+
<div id="suggested-tribes">
64+
<ul class="nav d-inline-block font-body col-sm-9 col-lg-8 pr-2" style="padding-right: 0">
65+
{% for tribe in suggested_tribes %}
66+
<li class="nav-item d-flex justify-content-between align-items-center my-1">
67+
<a href="/profile/{{ tribe.title }}" class="d-flex nav-link nav-line pr-0 mr-0">
68+
<img src="{{tribe.avatar_url}}" class="rounded-circle avatar mr-2" />
69+
<span class="font-caption">
70+
<span class="nav-title pt-0 mb-0">{{tribe.title}}</span>
71+
<span class="font-smaller-7">({{ tribe.follower_count }} followers)</span>
72+
</span>
73+
</a>
74+
<a class="follow_tribe btn btn-sm btn-gc-blue font-weight-bold font-smaller-7 px-3" href="#" data-jointribe="{{ tribe.title }}">
75+
Follow
76+
</a>
77+
</li>
78+
{% endfor %}
79+
</ul>
80+
</div>
81+
</div>

‎app/townsquare/templates/townsquare/shared/hackathons.html‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@
1414
</div>
1515

1616
<div class="card-body">
17-
<h5 class="font-subheader font-weight-semibold">
17+
<h5 class="font-body font-weight-semibold">
1818
<a href="{% url 'hackathon' hackathon.slug %}" class="text-black" target="_blank" rel="noopener noreferrer">
1919
{{ hackathon.title }}
2020
</a>
2121
</h5>
22-
<div class="font-smaller-2">
22+
<div class="font-smaller-5">
2323
<span class>From</span>
24-
<time class="font-weight-bold" datetime="{{ hackathon.start_date|date:'c' }}">
24+
<time class="font-weight-semibold" datetime="{{ hackathon.start_date|date:'c' }}">
2525
{{ hackathon.start|date:"m/d/Y" }}
2626
</time>
2727
<span>To</span>
28-
<time class="font-weight-bold" datetime="{{ hackathon.end_date|date:'c' }}">
28+
<time class="font-weight-semibold" datetime="{{ hackathon.end_date|date:'c' }}">
2929
{{ hackathon.end|date:"m/d/Y" }}
3030
</time>
3131
</div>
32-
<div class="mt-1 hackathon-actions">
32+
<div class="mt-1 font-caption">
3333
{% if hackathon.end|timesince <= "1 min" %}
3434
<a href="{% url 'hackathon_onboard' hackathon.slug %}">
3535
Join Hackathon >
@@ -40,5 +40,7 @@ <h5 class="font-subheader font-weight-semibold">
4040
</div>
4141
</div>
4242
{% endfor %}
43-
<a href="https://gitcoin.co/hackathon-list/" class="view-all">View all ></a>
43+
<p class="text-center">
44+
<a href="https://gitcoin.co/hackathon-list/" class="font-caption pb-2">VIEW ALL</a>
45+
</p>
4446
</div>

‎app/townsquare/templates/townsquare/shared/tag.html‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<li class="nav-item" {% if tag.3 %} data-toggle="tooltip" title="The {{ tag.3 }} posts in the last 24 hours in the {{tag.0}} category." {% endif %} >
2-
<a data-toggle="tooltip" class="nav-link nav-line {% if tab == tag.2 %}active{% endif %} " href="/?tab={{tag.2}}">
3-
<span class="nav-title">
4-
<i class="fas fa-{{tag.1}} mr-1"></i>
5-
{{tag.0}}
6-
{% if tag.3 %}
7-
<span class="nav-badge">({{ tag.3 }})</span>
8-
{% endif %}
9-
</span>
10-
</a>
11-
</li>
1+
<li class="nav-item" {% if tag.3 %} data-toggle="tooltip" title="The {{ tag.3 }} posts in the last 24 hours in the {{tag.0}} category." {% endif %} >
2+
<a data-toggle="tooltip" class="nav-link nav-line pb-1 {% if tab == tag.2 %}active{% endif %} " href="/?tab={{tag.2}}">
3+
<span class="nav-title">
4+
<i class="fas fa-{{tag.1}} mr-1"></i>
5+
{{tag.0}}
6+
{% if tag.3 %}
7+
<span class="nav-badge">({{ tag.3 }})</span>
8+
{% endif %}
9+
</span>
10+
</a>
11+
</li>

‎app/townsquare/templates/townsquare/shared/thistab.html‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
<li class="nav-item d-flex align-items-center">
2-
{% if this_tab.url_slug %}
3-
<a data-toggle="tooltip" title="{{this_tab.helper_text}}" href="{% url 'hackathon' this_tab.url_slug %}townsquare/?tab={{this_tab.slug}}" class="nav-link nav-line {% if tab == this_tab.slug %}active{% endif %} ">
4-
<span class="nav-title">{{ this_tab.title }}</span>
5-
{% if this_tab.badge %}
6-
<span class="nav-badge">({{ this_tab.badge }})</span>
7-
{% endif %}
8-
</a>
9-
<a href="/townsquare/?tab={{ this_tab.slug }}" data-toggle="tooltip" title="Filter {{ this_tab.title}} Posts">
10-
<i class="fas fa-filter"></i>
11-
</a>
12-
{% else %}
13-
<a data-toggle="tooltip" title="{{this_tab.helper_text}}" class="nav-link nav-line {% if tab == this_tab.slug %}active{% endif %} " href="#" data-slug="{{this_tab.slug}}">
14-
<span class="nav-title">{{this_tab.title}}</span>
15-
{% if this_tab.badge %}
16-
<span class="nav-badge">({{ this_tab.badge }})</span>
17-
{% endif %}
18-
</a>
19-
{% endif %}
20-
</li>
1+
<li class="nav-item d-flex align-items-center">
2+
{% if this_tab.url_slug %}
3+
<a data-toggle="tooltip" title="{{this_tab.helper_text}}" href="{% url 'hackathon' this_tab.url_slug %}townsquare/?tab={{this_tab.slug}}" class="nav-link nav-line pb-1 {% if tab == this_tab.slug %}active{% endif %} ">
4+
<span class="nav-title">{{ this_tab.title }}</span>
5+
{% if this_tab.badge %}
6+
<span class="nav-badge">({{ this_tab.badge }})</span>
7+
{% endif %}
8+
</a>
9+
<a href="/townsquare/?tab={{ this_tab.slug }}" data-toggle="tooltip" title="Filter {{ this_tab.title}} Posts">
10+
<i class="fas fa-filter"></i>
11+
</a>
12+
{% else %}
13+
<a data-toggle="tooltip" title="{{this_tab.helper_text}}" class="nav-link nav-line {% if tab == this_tab.slug %}active{% endif %} " href="#" data-slug="{{this_tab.slug}}">
14+
<span class="nav-title">{{this_tab.title}}</span>
15+
{% if this_tab.badge %}
16+
<span class="nav-badge">({{ this_tab.badge }})</span>
17+
{% endif %}
18+
</a>
19+
{% endif %}
20+
</li>

0 commit comments

Comments
 (0)