Skip to content

Commit

Permalink
qa fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
thelostone-mc committed Nov 26, 2018
1 parent dfd97b2 commit 7ec3641
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
15 changes: 8 additions & 7 deletions app/grants/templates/grants/detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
<div class="grant__header py-5">
<div class="container">
<div class="row">
<div class="grant-banner col-12 col-lg-6 col-xl-5 p-0 mb-5 my-md-auto">
<div class="grant-banner col-12 col-lg-6 pr-lg-5 p-0 mb-5 my-md-auto">
<img src="{% if grant.logo and grant.logo.url %}{{ grant.logo.url }}{% else %}{% with grant_logo='v2/images/grants/logos/' id=grant.id|modulo:3 %} {% static grant_logo|addstr:id|add:'.png' %} {% endwith %} {% endif %}">
</div>
<div class="col-12 col-lg-6 offset-xl-1 col-xl-5">
<div class="col-12 col-lg-6">
<div class="row">
<div class="col-12">
<div class="grant__specs">
Expand Down Expand Up @@ -155,6 +155,7 @@ <h5 class="font-body mt-2 font-weight-semibold">
<div class="container py-5">
<div class="row">
<div class="col-12 col-md-6 pl-lg-0">
<p class="font-body sub-title">{% trans "Description" %}</p>
<p class="grant__description font-subheader pr-lg-4 mb-5">
{% if is_admin %}
<textarea id="form--input__description" class="p-0 mt-2 inline-edit" disabled>{{ grant.description }}</textarea>
Expand All @@ -169,7 +170,7 @@ <h5 class="font-body mt-2 font-weight-semibold">
<div class="grant-item__member mb-4">
{% if is_admin %}
<div class="font-body">
<p class="font-body sub-title">Team Members</p>
<p class="font-body sub-title">{% trans "Team Members" %}</p>
<div class="form__select2">
<select id="grant-members" class="form__input" name="grant-members" name="members" multiple="multiple" disabled>
{% for team_member in grant.team_members.all %}
Expand All @@ -180,7 +181,7 @@ <h5 class="font-body mt-2 font-weight-semibold">
</div>
{% else %}
{% if grant.team_members %}
<p class="font-body sub-title">Team Members ({{ grant.team_members.all|length }})</p>
<p class="font-body sub-title">{% trans "Team Members" %} ({{ grant.team_members.all|length }})</p>
<div class="grant-item__members font-body">
{% for team_member in grant.team_members.all %}
<div class="grant-item__member mr-4">
Expand Down Expand Up @@ -219,7 +220,7 @@ <h5 class="font-body mt-2 font-weight-semibold">
<div class="update-milestone pt-4">
<div class="container mt-4">
<div class="row">
<div class="col-12 order-md-2 col-md-4">
<div class="col-12 order-md-2 col-md-6">
<p>
{% trans "Milestones" %}
{% if is_admin %}<a href="{% url 'grants:milestones' grant.id grant.slug %}" class="milestones-edit">{% trans "Edit Milestones" %}</a>{% endif %}
Expand All @@ -246,10 +247,10 @@ <h5 class="font-body mt-2 font-weight-semibold">
</div>
</div>

<div class="col-12 order-md-1 col-md-8 p-md-0">
<div class="col-12 order-md-1 col-md-6 p-md-0">
<div id="tabs">
<ul>
<li><a href="#all-updates">{% trans "Updates" %}</a></li>
<li><a href="#all-updates" class="pt-md-0">{% trans "Updates" %}</a></li>
</ul>
<div id="all-updates" class="p-0">
{% if is_admin %}
Expand Down
2 changes: 1 addition & 1 deletion app/grants/templates/grants/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ <h1 class="font-title-xl">{% trans 'Provide sustainable funding for Open Source
{% blocktrans %}
Gitcoin Grants, powered by the <a target="_blank" rel="noopener noreferrer" href="http://1337alliance.com/">EIP 1337 standard</a>
, are a fast, easy and secure way to provide recurring token contributions to your favorite OSS maintainers. <br/><br/>
Show your appreciation for maintainers in your dependancy tree with a Gitcoin Grant today.
Show your appreciation for maintainers in your dependency tree with a Gitcoin Grant today.
{% endblocktrans %}
</p>
<a class="btn btn-gc-blue" href="{% url 'grants:new' %}">
Expand Down

0 comments on commit 7ec3641

Please sign in to comment.