Merge pulls #802, #809, and #810

* 802: Advapay payments event with Armory presenting
* 809: Fixes the position of the nav icon when resizeing the
  window on Chrome
* 810: Style fix on dev docs page
This commit is contained in:
David A. Harding 2015-04-07 18:22:01 -04:00
commit 3dd445c911
No known key found for this signature in database
GPG key ID: 4B29C30FF29EC4B7
2 changed files with 2 additions and 1 deletions

View file

@ -40,8 +40,8 @@
</ul>
</li>
</ul>
<a class="logo" href="/{{ page.lang }}/"><img src="/img/icons/logotop.svg" alt="Bitcoin"></a>
<a id="menumobile" class="menumobile" onclick="mobileMenuShow(event);" href="#"></a>
<a class="logo" href="/{{ page.lang }}/"><img src="/img/icons/logotop.svg" alt="Bitcoin"></a>
<div id="langselect" class="langselect"><select onchange="window.location=this.value;">
{% for lang in site.langsorder %}{% assign active = ''%}{% if lang == page.lang %}{% assign active = ' selected="selected"'%}{% endif %}
<option value="/{{ lang }}/{% translate {{page.id}} url {{lang}} %}"{{ active }}>{{ site.langs[lang] }}</option>

View file

@ -1098,6 +1098,7 @@ table td,table th{
.resources .resourcesext{
margin-top:5px;
min-height:0;
display: inline-block;
}
.resources .resourcesext p{
padding-left:24px;