Skip to content

Commit

Permalink
Move donate button (resolves #1734) (#1748)
Browse files Browse the repository at this point in the history
* Convert Donate and Store links to buttons

* Revert Gemfile.lock

* Use standard Bootstrap for button color + refresh Gemfile.lock

* Move donate button + add donate and store links to dropdown on small screens
  • Loading branch information
ianroberts131 authored and jywarren committed Dec 11, 2017
1 parent f6fe2ea commit 16e7279
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions app/views/layouts/_header.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
<% end %>
<li><a href="/questions">Ask a question</a></li>
<li><a href="/post">Post your work</a></li>
<li class="hidden-lg hidden-xl"><a href="/donate">Donate</a></li>
</ul>

</li>
Expand Down Expand Up @@ -88,14 +89,12 @@
<li class="divider"></li>
<li><a href="/media"><%= t('layout._header.about.press_and_media') %></a></li>
<li><a href="/wiki/contact"><%= t('layout._header.about.contact') %></a></li>
<li class="hidden-lg hidden-xl"><a href="//store.publiclab.org"><%= t('layout._header.store') %></a></li>
</ul>
</li>

<li class="nav-button-wrapper hidden-xs hidden-sm hidden-md">
<a class="btn btn-sm nav-button-donate" href="/donate"><%= t('layout._header.donate') %></a>
</li>
<li class="nav-button-wrapper hidden-xs hidden-sm hidden-md">
<a class="btn btn-sm btn-default nav-button-store" href="//store.publiclab.org"><%= t('layout._header.store') %></a>
<button class="btn btn-sm btn-default nav-button-store"><a href="//store.publiclab.org"><%= t('layout._header.store') %></a></button>
</li>
</ul>

Expand All @@ -107,7 +106,9 @@
</div>

<% unless current_user %><a rel="tooltip" title="<%= t('layout._header.become_part_community') %>" data-placement="bottom" style="margin-left:14px;" href="/signup" class="btn btn-primary navbar-btn navbar-right hidden-xs"><%= t('layout._header.join') %></a><% end %>

<div class="nav-button-wrapper hidden-xs hidden-sm hidden-md navbar-right">
<button class="btn btn-sm nav-button-donate"><a href="/donate"><%= t('layout._header.donate') %></a></button>
</div>
<% unless params[:action] == "register" || params[:action] == "signup" %>
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
Expand Down Expand Up @@ -197,7 +198,6 @@
</ul>
<% end %>
</div>

</div>
</nav>

Expand Down

0 comments on commit 16e7279

Please sign in to comment.