Skip to content

Commit

Permalink
chore: indent + css fixes on ts
Browse files Browse the repository at this point in the history
  • Loading branch information
@thelostone-mc
thelostone-mc committed Jul 5, 2020
1 parent b6623e2 commit 829c44d
Show file tree
Hide file tree
Showing 4 changed files with 111 additions and 114 deletions.
2 changes: 1 addition & 1 deletion app/retail/templates/shared/activity.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@
<div class="mt-1 mb-2">
<div class="row align-items-center bg-light content py-3">
<div class="col-12 col-md-2 text-center">
<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 %}">
<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 %}">
</div>
<div class="col-12 col-md-9 text-left">
<p class="mt-2 mb-1 font-weight-bold" style="font-size: 1.2em;">{{ row.grant.title }}</p>
Expand Down
161 changes: 79 additions & 82 deletions app/townsquare/templates/townsquare/shared/feednav.html
View file
Original file line number Diff line number Diff line change
@@ -1,84 +1,81 @@
<div class="townsquare_nav-list my-1">
<div class="townsquare_block-header" data-target="feeds" >
Feeds
</div>
<ul id=feeds class="nav d-inline-block font-body mb-2">
{% for this_tab in tabs %}
{% include 'townsquare/shared/thistab.html' %}
{% endfor %}
</ul>
{% if hackathon_tabs|length %}
<div class="townsquare_block-header mt-1" data-target="hackathons">
Hackathons
</div>
<ul id=hackathons class="nav d-inline-block font-body mb-2">
{% for this_tab in hackathon_tabs %}
{% include 'townsquare/shared/thistab.html' %}
{% endfor %}
</ul>
{% endif %}
<div class="townsquare_nav-list mb-1 mt-1">
<div class="townsquare_block-header" data-target="filter">
Filter
</div>
<ul id=filter class="nav d-inline-block font-body mb-2">
{% for tag in tags %}
{% include 'townsquare/shared/tag.html' %}
{% endfor %}
</ul>
</div>
</div>
<div class="townsquare_nav-list my-3">
<div class="townsquare_block-header" data-target="feeds" >
Feeds
</div>
<ul id=feeds class="nav d-inline-block font-caption mb-2">
{% for this_tab in tabs %}
{% include 'townsquare/shared/thistab.html' %}
{% endfor %}
</ul>
{% if hackathon_tabs|length %}
<div class="townsquare_block-header mt-2" data-target="hackathons">
Hackathons
</div>
<ul id=hackathons class="nav d-inline-block font-caption mb-2">
{% for this_tab in hackathon_tabs %}
{% include 'townsquare/shared/thistab.html' %}
{% endfor %}
</ul>
{% endif %}
<div class="townsquare_nav-list my-3">
<div class="townsquare_block-header" data-target="filter">
Filter
</div>
<ul id=filter class="nav d-inline-block font-caption mb-2">
{% for tag in tags %}
{% include 'townsquare/shared/tag.html' %}
{% endfor %}
</ul>
</div>
</div>

<div class="townsquare_nav-list my-1 tribe">
<div class="townsquare_block-header" data-target="tribes">
Shortcuts
</div>
<div id="tribes">
<ul class="nav d-inline-block font-body">
{% for tribe in following_tribes %}
<li class="nav-item">
<a data-toggle="tooltip" title="@{{tribe.title}}'s Tribe" class="nav-link nav-line" href="/{{ tribe.title }}">
<img src="{{tribe.avatar_url}}" class="rounded avatar">
<span class="nav-title">{{tribe.title}}</span>
{% if tribe.badge %}
<span class="nav-badge">({{ tribe.badge }})</span>
{% endif %}
</a>
</li>
{% endfor %}
</ul>
<div class="townsquare_nav-list_footer font-body font-weight-semibold">
<a href="{% url "tribes_directory" %}">
Explore Tribes
<i class="ml-1 fab fa-wpexplorer font-weight-normal"></i>
</a>
</div>
</div>
</div>
<div class="townsquare_nav-list my-3 tribe">
<div class="townsquare_block-header" data-target="tribes">
Shortcuts
</div>
<div id="tribes">
<ul class="nav d-inline-block font-caption">
{% for tribe in following_tribes %}
<li class="nav-item">
<a data-toggle="tooltip" title="@{{tribe.title}}'s Tribe" class="nav-link nav-line" href="/{{ tribe.title }}">
<img src="{{tribe.avatar_url}}" class="rounded-circle avatar">
<span class="nav-title">{{tribe.title}}</span>
{% if tribe.badge %}
<span class="nav-badge">({{ tribe.badge }})</span>
{% endif %}
</a>
</li>
{% endfor %}
</ul>
<div class="townsquare_nav-list_footer font-body font-weight-semibold">
<a href="{% url "tribes_directory" %}">
Explore Tribes
<i class="ml-1 fab fa-wpexplorer font-weight-normal"></i>
</a>
</div>
</div>
</div>

<div class="townsquare_nav-list my-2 tribe">
<div class="townsquare_block-header" data-target="suggested-tribes">
Suggested Tribes
</div>
<div id="suggested-tribes">
<ul class="nav d-inline-block font-body col-sm-9 pr-2" style="padding-right: 0">
{% for tribe in suggested_tribes %}
<li class="nav-item d-flex justify-content-between align-items-center my-2">
<a href="/profile/{{ tribe.title }}" class="d-flex nav-link nav-line pr-0 mr-0">
<img src="{{tribe.avatar_url}}" class="nav_avatar mr-4" />
<span class="font-caption">
<span class="nav-title font-weight-semibold pt-0 mb-0 text-capitalize">{{tribe.title}}</span><br>
<p class="mb-0">
<i class="fas fa-user font-smaller-4 mr-1"></i>
<span class="font-weight-semibold">{{ tribe.follower_count }}</span> followers
</p>
</span>
</a>
<a class="follow_tribe btn btn-sm btn-gc-blue font-weight-bold font-smaller-6 px-3" href="#" data-jointribe="{{ tribe.title }}">
Follow
</a>
</li>
{% endfor %}
</ul>
</div>
</div>
<div class="townsquare_nav-list my-3 tribe">
<div class="townsquare_block-header" data-target="suggested-tribes">
Suggested Tribes
</div>
<div id="suggested-tribes">
<ul class="nav d-inline-block font-body col-sm-9 col-lg-8 pr-2" style="padding-right: 0">
{% for tribe in suggested_tribes %}
<li class="nav-item d-flex justify-content-between align-items-center my-1">
<a href="/profile/{{ tribe.title }}" class="d-flex nav-link nav-line pr-0 mr-0">
<img src="{{tribe.avatar_url}}" class="rounded-circle avatar mr-2" />
<span class="font-caption">
<span class="nav-title pt-0 mb-0">{{tribe.title}}</span>
<span class="font-smaller-7">({{ tribe.follower_count }} followers)</span>
</span>
</a>
<a class="follow_tribe btn btn-sm btn-gc-blue font-weight-bold font-smaller-7 px-3" href="#" data-jointribe="{{ tribe.title }}">
Follow
</a>
</li>
{% endfor %}
</ul>
</div>
</div>
22 changes: 11 additions & 11 deletions app/townsquare/templates/townsquare/shared/tag.html
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<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 %} >
<a data-toggle="tooltip" class="nav-link nav-line {% if tab == tag.2 %}active{% endif %} " href="/?tab={{tag.2}}">
<span class="nav-title">
<i class="fas fa-{{tag.1}} mr-1"></i>
{{tag.0}}
{% if tag.3 %}
<span class="nav-badge">({{ tag.3 }})</span>
{% endif %}
</span>
</a>
</li>
<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 %} >
<a data-toggle="tooltip" class="nav-link nav-line pb-1 {% if tab == tag.2 %}active{% endif %} " href="/?tab={{tag.2}}">
<span class="nav-title">
<i class="fas fa-{{tag.1}} mr-1"></i>
{{tag.0}}
{% if tag.3 %}
<span class="nav-badge">({{ tag.3 }})</span>
{% endif %}
</span>
</a>
</li>
40 changes: 20 additions & 20 deletions app/townsquare/templates/townsquare/shared/thistab.html
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<li class="nav-item d-flex align-items-center">
{% if this_tab.url_slug %}
<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 %} ">
<span class="nav-title">{{ this_tab.title }}</span>
{% if this_tab.badge %}
<span class="nav-badge">({{ this_tab.badge }})</span>
{% endif %}
</a>
<a href="/townsquare/?tab={{ this_tab.slug }}" data-toggle="tooltip" title="Filter {{ this_tab.title}} Posts">
<i class="fas fa-filter"></i>
</a>
{% else %}
<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}}">
<span class="nav-title">{{this_tab.title}}</span>
{% if this_tab.badge %}
<span class="nav-badge">({{ this_tab.badge }})</span>
{% endif %}
</a>
{% endif %}
</li>
<li class="nav-item d-flex align-items-center">
{% if this_tab.url_slug %}
<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 %} ">
<span class="nav-title">{{ this_tab.title }}</span>
{% if this_tab.badge %}
<span class="nav-badge">({{ this_tab.badge }})</span>
{% endif %}
</a>
<a href="/townsquare/?tab={{ this_tab.slug }}" data-toggle="tooltip" title="Filter {{ this_tab.title}} Posts">
<i class="fas fa-filter"></i>
</a>
{% else %}
<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}}">
<span class="nav-title">{{this_tab.title}}</span>
{% if this_tab.badge %}
<span class="nav-badge">({{ this_tab.badge }})</span>
{% endif %}
</a>
{% endif %}
</li>

0 comments on commit 829c44d

Please sign in to comment.