joshua/dash-website
1
0
Fork 0
mirror of https://github.com/seigler/dash-website synced 2025-07-27 07:16:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source 
interim merge for commit (hooking up contact form)
This commit is contained in:
Madeleine Shang 2017-02-05 22:46:26 +00:00
commit 15aeb408c6
8 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
_includes/nav-desktop.html
View file

@ -22,7 +22,7 @@
<li class="nav__item"><a href="{{ basenav }}/community/" class="nav__link">{% t nav.community %}</a></li>
<li class="nav__item"><a href="{{ basenav }}/team" class="nav__link">{% t nav.team %}</a></li>
<li class="nav__item"><a href="{{ basenav }}/blog/" class="nav__link">{% t nav.blog %}</a></li>
<li class="nav__item"><a href="{{ basenav }}/evolution/" class="nav__link">{% t nav.evolution %}</a></li>
{% if page.layout != 'post' %}
<li class="nav__item nav__item--languages">
<a href="#" class="nav__link" style="text-transform:uppercase;"><span class="flag {% if 'en' == site.lang %}gb{% else %}{{site.lang}}{% endif %}"></span></a>

2
_includes/nav-mobile.html
View file

@ -13,7 +13,7 @@
<li class="overlay-menu__item"><a href="{{ basenav }}/community/" class="overlay-menu__link">{% t nav.community %}</a></li>
<li class="overlay-menu__item"><a href="{{ basenav }}/team" class="overlay-menu__link">{% t nav.team %}</a></li>
<li class="overlay-menu__item"><a href="{{ basenav }}/blog/" class="overlay-menu__link">{% t nav.blog %}</a></li>
<li class="overlay-menu__item"><a href="{{ basenav }}/evolution/" class="overlay-menu__link">{% t nav.evolution %}</a></li>
{% if page.layout != 'post' %}
<li class="overlay-menu__item overlay-menu__item--languages">
<ul class="overlay-menu__sublist">

BIN
assets/img/blog/12.1-2.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 208 KiB

Before After
Before After

BIN
assets/img/blog/BringDashtoyourlocalATM.jpg
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 92 KiB

After

Width:  |  Height:  |  Size: 95 KiB

Before After
Before After

BIN
assets/img/blog/CoPayWalletcopy.jpg
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 240 KiB

After

Width:  |  Height:  |  Size: 128 KiB

Before After
Before After

BIN
assets/img/blog/RyanTaylorimagevideo.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 430 KiB

After

Width:  |  Height:  |  Size: 359 KiB

Before After
Before After

BIN
assets/img/merchants/bolehvpn.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 204 KiB

Before After
Before After

2
network/index.html
View file

@ -42,7 +42,7 @@ description: pages.currency.description
<a href="http://dashvotetracker.com/" target="_blank" class="btn-blue-solid">DashVoteTracker</a>
<a href="https://www.dashcentral.org/" target="_blank" class="btn-blue-solid">DashCentral</a>
<a href="https://www.dashninja.pl/budgets.html" target="_blank" class="btn-blue-solid">DashNinja</a>
<a href="http://govobject-proposal.slayer.work/" target="_blank" class="btn-blue-solid">Proposal Generator</a>
<a href="https://proposal.dash.org/" target="_blank" class="btn-blue-solid">Proposal Generator</a>
</div>
<table id="budgets">