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

Merge remote-tracking branch 'dashpay/master'

Browse source
This commit is contained in:
tungfa 2017-02-02 18:10:19 +08:00
commit d319b2c460
10 changed files with 46 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
README.md
View file

@ -106,3 +106,10 @@ image: /assets/images/2016/05/Node40-banner.jpg
title: New website for Node40 title: New website for Node40
description: Check out the new website for Node40 description: Check out the new website for Node40
``` ```
###Blog Post Images
Image paths for blogs are currently relative to /{language}/assets/img/blog by default. If we replaced the image path from the front matter above with:
```
image: MyImage.jpg
```
... will look for `"MyImage.jpg"` in the `/assets/img/blog` folder.

2
_i18n/pt/_posts/2017-02-01-copaypt.md
View file

@ -1,7 +1,7 @@
--- ---
author: tungfa author: tungfa
layout: post layout: post
image: image: #CoPayWalletcopy.jpg #not currently working with language posts. Needs resolution.
title: "Copay-Dash Wallet (Testnet só / RC 0.1)" title: "Copay-Dash Wallet (Testnet só / RC 0.1)"
--- ---
Estou feliz em anunciar uma versão “Release Candidate” da Copay-Dash, uma carteira Copay que foi desenvolvida pela Bitpay. Estou feliz em anunciar uma versão “Release Candidate” da Copay-Dash, uma carteira Copay que foi desenvolvida pela Bitpay.

2
_includes/hero/merchants.html
View file

@ -14,7 +14,7 @@
<p class="hero__lead">{% t pages.merchants.hero-text %}</p> <p class="hero__lead">{% t pages.merchants.hero-text %}</p>
<div class="hero__buttons"> <div class="hero__buttons">
<a href="https://mapme.com/dash-merchants" target="_blank" class="btn-white-solid">{% t pages.merchants.hero-map-btn %}</a> <a href="https://www.zeemaps.com/map?group=2357566#" target="_blank" class="btn-white-solid">{% t pages.merchants.hero-map-btn %}</a>
<a href="https://dashpay.atlassian.net/wiki/display/DOC/Merchants" target="_blank" class="btn-white-solid">{% t pages.merchants.hero-integrate-btn %}</a> <a href="https://dashpay.atlassian.net/wiki/display/DOC/Merchants" target="_blank" class="btn-white-solid">{% t pages.merchants.hero-integrate-btn %}</a>
<a href="mailto:robert@dash.org" class="btn-white-solid">{% t pages.merchants.hero-getlisted-btn %}</a> <a href="mailto:robert@dash.org" class="btn-white-solid">{% t pages.merchants.hero-getlisted-btn %}</a>
</div> </div>

6
_includes/hero/wallets.html
View file

@ -15,9 +15,9 @@
<h1 class="hero__title">{% t pages.wallets.hero-heading %}</h1> <h1 class="hero__title">{% t pages.wallets.hero-heading %}</h1>
<div class="hero__buttons"> <div class="hero__buttons">
<a href="#" class="btn-white-solid">{% t pages.wallets.hero-wallets-btn %}</a> <a href="#wallets" class="btn-white-solid">{% t pages.wallets.hero-wallets-btn %}</a>
<a href="#" class="btn-white-solid">{% t pages.wallets.hero-guide-btn %}</a> <a href="https://dashpay.atlassian.net/wiki/pages/viewpage.action?pageId=1146941" target="_blank" class="btn-white-solid">{% t pages.wallets.hero-guide-btn %}</a>
<a href="#" class="btn-white-solid">{% t pages.wallets.hero-security-btn %}</a> <a href="https://dashpay.atlassian.net/wiki/pages/viewpage.action?pageId=31326247" target="_blank" class="btn-white-solid">{% t pages.wallets.hero-security-btn %}</a>
</div> </div>
</div> </div>

25
_posts/README.md
View file

@ -6,3 +6,28 @@ Where YEAR is a four-digit number, MONTH and DAY are both two-digit numbers, and
2011-12-31-new-years-eve-is-awesome.md 2011-12-31-new-years-eve-is-awesome.md
2011-12-31-new-years-eve-is-awesome.html 2011-12-31-new-years-eve-is-awesome.html
2012-09-12-how-to-write-a-blog.textile 2012-09-12-how-to-write-a-blog.textile
## Writing a Blog Post
Blog posts can be written in MarkDown (*.md) or HTML (*.html).
Posts need to be saved in the `_posts` directory and the filename must always start with YYYY-MM-DD-
For example: `2016-05-12-new-website.md`
###Front matter
The top page of every post should contain the following (Example):
```
author: perry
layout: post
image: Node40-banner.jpg
title: New website for Node40
description: Check out the new website for Node40
```
###Blog Post Images
Image paths for blogs are currently relative to {language}/assets/img/blog by default. If we replaced the image path from the front matter above with:
```
image: MyImage.jpg
```
... will look for `"MyImage.jpg"` in the `/{language}/assets/img/blog` folder.

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

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 41 KiB

Before After
Before After

1
src/scss/_member.scss
View file

@ -92,6 +92,7 @@ $m: 'member';
&__image-wrapper { &__image-wrapper {
padding-bottom: ((281/500)*100%); padding-bottom: ((281/500)*100%);
border: 1px solid #ebebea;
} }
&__name { &__name {

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: ((106/140)*100%); padding-bottom: ((105/140)*100%);
} }
&__image { &__image {

7
update/index.html
View file

@ -36,8 +36,11 @@ description: pages.update.description
<h2>{% t pages.update.merchants-heading %}</h2> <h2>{% t pages.update.merchants-heading %}</h2>
<p>{% tmd pages.update.merchants-text %}</p> <p>{% tmd pages.update.merchants-text %}</p>
<div>
<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> <a href="https://dashpay.atlassian.net/wiki/x/j5AxBg" class="btn-white-solid" target="_blank">{% t pages.update.merchants-btn%}</a>
<a href="https://dashpay.atlassian.net/wiki/x/sZAxBg" class="btn-white-solid" target="_blank">{% t pages.update.masternodes-btn%}</a>
<a href="https://dashpay.atlassian.net/wiki/x/yJAxBg" class="btn-white-solid" target="_blank">{% t pages.update.exchanges-btn%}</a>
</div>
</div> </div>
</section> </section>

2
wallets/index.html
View file

@ -24,7 +24,7 @@ description: pages.wallets.description
<div class="page page--wallets"> <div class="page page--wallets">
<section class="section"> <section class="section">
<div class="section__content"> <div class="section__content">
<h3>{% t pages.wallets.wallets-desktop-header %}</h3> <h3 id="wallets">{% t pages.wallets.wallets-desktop-header %}</h3>
<p>{% t pages.wallets.wallets-desktop-subtitle %}</p> <p>{% t pages.wallets.wallets-desktop-subtitle %}</p>
<ul id="wallet-os-tabs" class="nav2 nav-tabs"> <ul id="wallet-os-tabs" class="nav2 nav-tabs">
{% for os-sequence in desktop-os-order-list %} {% for os-sequence in desktop-os-order-list %}