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

fixed tasks from google sheets

Browse source
This commit is contained in:
VitaliyTr 2017-02-02 03:59:09 +07:00
parent c7c08cb41e
commit 5afdb0485e
6 changed files with 28 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
_includes/footer.html
View file

@ -3,7 +3,7 @@
{% t nav.get-dash %} {% t nav.get-dash %}
<ul> <ul>
<li><a href="{{ basenav }}/get-dash/">{% t nav.download %}</a></li> <li><a href="{{ basenav }}/get-dash/">{% t nav.download %}</a></li>
<li><a href="https://dashpay.atlassian.net/wiki/display/DOC/How+to+buy+Dash" target="_blank">{% t nav.buy %}</a></li> <li><a href="https://dashpay.atlassian.net/wiki/pages/viewpage.action?pageId=48693287" target="_blank">{% t nav.buy %}</a></li>
<li><a href="{{ basenav }}/merchants/">{% t nav.shop %}</a></li> <li><a href="{{ basenav }}/merchants/">{% t nav.shop %}</a></li>
<li><a href="https://dashpay.atlassian.net/wiki/display/DOC/Debit+Cards" target="_blank">{% t nav.debit %}</a></li> <li><a href="https://dashpay.atlassian.net/wiki/display/DOC/Debit+Cards" target="_blank">{% t nav.debit %}</a></li>
</ul> </ul>

BIN
assets/img/merchants/Ecigarttes.jpg
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Before After
Before After

23
index.html
View file

@ -313,17 +313,18 @@ description: pages.home.description
{% for post in site.posts limit:4 %} {% for post in site.posts limit:4 %}
<div class="col-sm-6 col-md-3"> <div class="col-sm-6 col-md-3">
<div class="news-post"> <div class="news-post">
<div class="news-image"> <a href="{{ basenav }}{{ post.url }}">
{% if post.image %} <div class="news-image">
<img src="{{ basenav }}/assets/img/blog/{{ post.image }}"> {% if post.image %}
{% endif %} <img src="{{ basenav }}/assets/img/blog/{{ post.image }}">
</div> {% endif %}
<div class="news-body"> </div>
<h3 class="news-title">{{ post.title }}</h3> <div class="news-body">
<div class="date">{{ post.date | date: "%b %d, %Y" }}</div> <h3 class="news-title">{{ post.title }}</h3>
<p>{{ post.excerpt | strip_html | truncate: 250 }}</p> <div class="date">{{ post.date | date: "%b %d, %Y" }}</div>
<a class="read-more" href="{{ basenav }}{{ post.url }}">Read More...</a> <p>{{ post.excerpt | strip_html | truncate: 250 }}</p>
</div> </div>
</a>
</div> </div>
</div> </div>
{% endfor %} {% endfor %}

20
merchants/index.html
View file

@ -11,7 +11,7 @@ description: pages.merchants.description
<section class="section section--intro-lead section--merchants"> <section class="section section--intro-lead section--merchants">
<div class="section__content content"> <div class="section__content content">
<div class="section__intro"> <div class="section__intro">
<h2 class="section__title">{% t pages.merchants.cards-heading %}<!-- <a class="permalink" title="Permalink" id="social"></a> --></h1> <h2 class="section__title">{% t pages.merchants.cards-heading %}<!-- <a class="permalink" title="Permalink" id="social"></a> --></h2>
</div> </div>
<ul class="member-list member-list--merchants"> <ul class="member-list member-list--merchants">
{% for merchant in site.data.merchants-cards %} {% for merchant in site.data.merchants-cards %}
@ -24,7 +24,7 @@ description: pages.merchants.description
<section class="section section--intro-lead section--merchants"> <section class="section section--intro-lead section--merchants">
<div class="section__content content"> <div class="section__content content">
<div class="section__intro"> <div class="section__intro">
<h2 class="section__title">{% t pages.merchants.email-heading %}</h1> <h2 class="section__title">{% t pages.merchants.email-heading %}</h2>
</div> </div>
<ul class="member-list member-list--merchants"> <ul class="member-list member-list--merchants">
{% for merchant in site.data.merchants-email %} {% for merchant in site.data.merchants-email %}
@ -37,7 +37,7 @@ description: pages.merchants.description
<section class="section section--intro-lead section--merchants"> <section class="section section--intro-lead section--merchants">
<div class="section__content content"> <div class="section__content content">
<div class="section__intro"> <div class="section__intro">
<h2 class="section__title">{% t pages.merchants.vpn-heading %}</h1> <h2 class="section__title">{% t pages.merchants.vpn-heading %}</h2>
</div> </div>
<ul class="member-list member-list--merchants"> <ul class="member-list member-list--merchants">
{% for merchant in site.data.merchants-vpn %} {% for merchant in site.data.merchants-vpn %}
@ -50,7 +50,7 @@ description: pages.merchants.description
<section class="section section--intro-lead section--merchants"> <section class="section section--intro-lead section--merchants">
<div class="section__content content"> <div class="section__content content">
<div class="section__intro"> <div class="section__intro">
<h2 class="section__title">{% t pages.merchants.hosting-heading %}</h1> <h2 class="section__title">{% t pages.merchants.hosting-heading %}</h2>
</div> </div>
<ul class="member-list member-list--merchants"> <ul class="member-list member-list--merchants">
{% for merchant in site.data.merchants-hosting %} {% for merchant in site.data.merchants-hosting %}
@ -63,7 +63,7 @@ description: pages.merchants.description
<section class="section section--intro-lead section--merchants"> <section class="section section--intro-lead section--merchants">
<div class="section__content content"> <div class="section__content content">
<div class="section__intro"> <div class="section__intro">
<h2 class="section__title">{% t pages.merchants.design-heading %}</h1> <h2 class="section__title">{% t pages.merchants.design-heading %}</h2>
</div> </div>
<ul class="member-list member-list--merchants"> <ul class="member-list member-list--merchants">
{% for merchant in site.data.merchants-design %} {% for merchant in site.data.merchants-design %}
@ -76,7 +76,7 @@ description: pages.merchants.description
<section class="section section--intro-lead section--merchants"> <section class="section section--intro-lead section--merchants">
<div class="section__content content"> <div class="section__content content">
<div class="section__intro"> <div class="section__intro">
<h2 class="section__title">{% t pages.merchants.gifts-heading %}</h1> <h2 class="section__title">{% t pages.merchants.gifts-heading %}</h2>
</div> </div>
<ul class="member-list member-list--merchants"> <ul class="member-list member-list--merchants">
{% for merchant in site.data.merchants-gifts %} {% for merchant in site.data.merchants-gifts %}
@ -89,7 +89,7 @@ description: pages.merchants.description
<section class="section section--intro-lead section--merchants"> <section class="section section--intro-lead section--merchants">
<div class="section__content content"> <div class="section__content content">
<div class="section__intro"> <div class="section__intro">
<h2 class="section__title">{% t pages.merchants.games-heading %}</h1> <h2 class="section__title">{% t pages.merchants.games-heading %}</h2>
</div> </div>
<ul class="member-list member-list--merchants"> <ul class="member-list member-list--merchants">
{% for merchant in site.data.merchants-games %} {% for merchant in site.data.merchants-games %}
@ -102,7 +102,7 @@ description: pages.merchants.description
<section class="section section--intro-lead section--merchants"> <section class="section section--intro-lead section--merchants">
<div class="section__content content"> <div class="section__content content">
<div class="section__intro"> <div class="section__intro">
<h2 class="section__title">{% t pages.merchants.casinos-heading %}</h1> <h2 class="section__title">{% t pages.merchants.casinos-heading %}</h2>
</div> </div>
<ul class="member-list member-list--merchants"> <ul class="member-list member-list--merchants">
{% for merchant in site.data.merchants-casinos %} {% for merchant in site.data.merchants-casinos %}
@ -115,7 +115,7 @@ description: pages.merchants.description
<section class="section section--intro-lead section--merchants"> <section class="section section--intro-lead section--merchants">
<div class="section__content content"> <div class="section__content content">
<div class="section__intro"> <div class="section__intro">
<h2 class="section__title">{% t pages.merchants.stores-heading %}</h1> <h2 class="section__title">{% t pages.merchants.stores-heading %}</h2>
</div> </div>
<ul class="member-list member-list--merchants"> <ul class="member-list member-list--merchants">
{% for merchant in site.data.merchants-stores %} {% for merchant in site.data.merchants-stores %}
@ -128,7 +128,7 @@ description: pages.merchants.description
<section class="section section--intro-lead section--merchants"> <section class="section section--intro-lead section--merchants">
<div class="section__content content"> <div class="section__content content">
<div class="section__intro"> <div class="section__intro">
<h2 class="section__title">{% t pages.merchants.metals-heading %}</h1> <h2 class="section__title">{% t pages.merchants.metals-heading %}</h2>
</div> </div>
<ul class="member-list member-list--merchants"> <ul class="member-list member-list--merchants">
{% for merchant in site.data.merchants-metals %} {% for merchant in site.data.merchants-metals %}

2
src/scss/_merchant.scss
View file

@ -12,7 +12,7 @@ $m: 'member';
} }
&__image-wrapper { &__image-wrapper {
@include overflow-image-wrapper(); @include overflow-image-wrapper();
padding-bottom: ((105/140)*100%); padding-bottom: ((106/140)*100%);
} }
&__image { &__image {

8
update/index.html
View file

@ -37,7 +37,7 @@ description: pages.update.description
<p>{% tmd pages.update.merchants-text %}</p> <p>{% tmd pages.update.merchants-text %}</p>
<a href="{{ basenav }}/get-dash/" class="btn-white-solid">{% t pages.update.merchants-btn%}</a> <a href="https://dashpay.atlassian.net/wiki/display/DOC/Dash+Payment+Processor+Overview" class="btn-white-solid" target="_blank">{% t pages.update.merchants-btn%}</a>
</div> </div>
</section> </section>
@ -125,8 +125,8 @@ description: pages.update.description
</div> </div>
<div> <div>
<a href="/merchants/" target="_blank" class="btn-blue">{% t pages.update.slack-btn %}</a> <a href="http://dash-nation-invite.herokuapp.com/" target="_blank" class="btn-blue">{% t pages.update.slack-btn %}</a>
<a href="{% t pages.home.merchants-link %}" target="_blank" class="btn-blue">{% t pages.update.forum-btn %}</a> <a href="https://www.dash.org/forum" target="_blank" class="btn-blue">{% t pages.update.forum-btn %}</a>
</div> </div>
</div> </div>
</section> </section>
@ -227,7 +227,7 @@ description: pages.update.description
{% tmd pages.update.launching-text %} {% tmd pages.update.launching-text %}
<a href="{% t pages.home.launching-link %}" target="_blank" class="btn-blue">{% t pages.update.launching-btn %}</a> <a href="http://dashvotetracker.com" target="_blank" class="btn-blue">{% t pages.update.launching-btn %}</a>
</div> </div>
<div class="col-sm-6 col-sm-pull-6 home-evolution-graphic"> <div class="col-sm-6 col-sm-pull-6 home-evolution-graphic">
<img src="/assets/img/update/lan_date.png" alt="Dash Evolution"> <img src="/assets/img/update/lan_date.png" alt="Dash Evolution">