Skip to content

Commit

Permalink
minor changes: added (gitcoinco#1538)
Browse files Browse the repository at this point in the history
- admin button: udpated color
- show how it works on explorer only
- fixed html template for admin button with no id
  • Loading branch information
thelostone-mc authored and mbeacom committed Jun 25, 2018
1 parent 7c5c841 commit 6ac6363
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 15 deletions.
4 changes: 2 additions & 2 deletions app/assets/v2/css/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -633,8 +633,8 @@ input[type=text].loading {
text-align: left;
}

.admin-only{
background-color: #800000 !important;
.admin-only {
background-color: #5495E1 !important;
color:white !important;
border: 1px solid white !important;
}
Expand Down
2 changes: 1 addition & 1 deletion app/dashboard/templates/bounty_details.html
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ <h5 class="bounty-heading">{% trans "Funder" %}</h5>

<script id="action" type="text/x-jsrender">
[[if enabled]]
<span id="[[:id]]" [[if id == 'submit']] [[if !work_started]] class="none" [[/if]] [[/if]]
<span [[if id]] id="[[:id]]" [[if id == 'submit']] [[if !work_started]] class="none" [[/if]] [[/if]] [[/if]]
title='<div class="tooltip-info tooltip-sm">[[:title]]</div>'>
[[if pending_acceptance]]
<a class="button button--primary accept" role="button" href="[[:href]]" target="[[:target]]">
Expand Down
26 changes: 14 additions & 12 deletions app/retail/templates/shared/nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,20 +55,22 @@
</div>
</div>
{% endif %}
<div class="nav-item dropdown interior">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownHow" role="button"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
How it works
</a>
<div class="dropdown-menu" id="how-it-works" aria-labelledby="navbarDropdownHow">
<a class="dropdown-item {% if active == 'how_it_works_funder' %} selected{% endif %}" href="{% url "how_it_works" "funder" %}">
{% trans "Funder" %}
</a>
<a class="dropdown-item {% if active == 'how_it_works_contributor' %} selected{% endif %}" href="{% url "how_it_works" "contributor" %}">
{% trans "Contributor" %}
{% if request.path == "/explorer" or request.path == "/dashboard" %}
<div class="nav-item dropdown interior">
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdownHow" role="button"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
How it works
</a>
<div class="dropdown-menu" id="how-it-works" aria-labelledby="navbarDropdownHow">
<a class="dropdown-item {% if active == 'how_it_works_funder' %} selected{% endif %}" href="{% url "how_it_works" "funder" %}">
{% trans "Funder" %}
</a>
<a class="dropdown-item {% if active == 'how_it_works_contributor' %} selected{% endif %}" href="{% url "how_it_works" "contributor" %}">
{% trans "Contributor" %}
</a>
</div>
</div>
</div>
{% endif %}
<a class="nav-link{% if active == 'dashboard' %} selected{% endif %} interior" href="{% url "explorer" %}">{% trans "Issue Explorer" %}</a>
{% if not user.is_authenticated %}
<a class="nav-link slack{% if active == 'slack' %} selected{% endif %}" href="{% url "slack" %}">
Expand Down

0 comments on commit 6ac6363

Please sign in to comment.