From 9e8afd0090a0fbdffbe2c5e5731a38311d83d69a Mon Sep 17 00:00:00 2001 From: "mr.V" Date: Fri, 24 Feb 2017 06:19:20 +0700 Subject: [PATCH] cleaned up two pages: governance and masternode; added some minor fixes in contact page (#136) * fixed masternodes mage * cleaned up governance page; budget page=> governance page * cleaned up contact page * fixed typograph --- _i18n/en.yml | 43 ++-- _includes/hero/contact.html | 2 +- .../hero/{budget.html => governance.html} | 10 +- _includes/hero/masternodes.html | 8 +- assets/img/masternodes/evol.svg | 18 -- assets/img/masternodes/masternode.svg | 24 -- assets/img/masternodes/pay.svg | 17 -- assets/img/masternodes/private.svg | 16 -- budget/index.html | 229 ------------------ contact/index.html | 2 +- governance/index.html | 78 ++++++ masternodes/index.html | 46 +--- mining/index.html | 0 .../mining.html => npm-debug.log.2092820115 | 0 src/scss/_junk-drawer.scss | 23 +- src/scss/_section.scss | 9 +- 16 files changed, 142 insertions(+), 383 deletions(-) rename _includes/hero/{budget.html => governance.html} (52%) delete mode 100644 assets/img/masternodes/evol.svg delete mode 100644 assets/img/masternodes/masternode.svg delete mode 100644 assets/img/masternodes/pay.svg delete mode 100644 assets/img/masternodes/private.svg delete mode 100644 budget/index.html create mode 100644 governance/index.html delete mode 100644 mining/index.html rename _includes/hero/mining.html => npm-debug.log.2092820115 (100%) diff --git a/_i18n/en.yml b/_i18n/en.yml index 0b37871..5239d7d 100755 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -8,20 +8,16 @@ pages: hero-heading: Masternodes hero-text: Masternodes are computers that run a dash wallet and make decisions, such as locking transactions with InstantSend, coordinate mixing of coins, and voting on budget funding. - hero-what-btn: Buy with fiat currency - hero-how-btn: Buy with cryptocurrency - hero-network-btn: Full Exchanges Listing - hero-p2p-btn: P2P + hero-what-btn: What is a Masternode + hero-how-btn: How to Set up a Masternode + hero-network-btn: Masternode Network + hero-masternode-mining-btn: Masternode vs Mining marsternode-text: Masternodes are required to have 1000 Dash collateral, a dedicated IP address, and be able to run 24 hours a day without a more than a 1 hr connection loss. Masternodes get paid 45% of the block reward on every block, which is distributed to masternodes one at a time. Typically, around 2 dash is paid to each masternode every 7 days. what-heading: WHAT IS MASTERNODE? - what-text: | - In Evolution, you will be able to connect directly with merchants to make purchases or even setup auto debits to pay for subscription services. Every merchant that integrates Dash will be searchable on the blockchain. You’ll be able to rate purchases so the community can decide which vendors are providing quality products and services.”chain and you can rate purchases so the community can decide who’s providing a good service or not. - Masternodes are also given voting rights on proposals. Each masternode has 1 vote and this vote can be used on budget proposals or important decisions that affect Dash. For a complete list of current proposals please click here. - - earn-heading: EARN A MASTERNODE? + earn-heading: Masternode Income earn-text: | Masternodes cost money and effort to host so they are paid a share of the block reward to incentivize them. With current masternode numbers and rewards masternodes earn approximately a 11% return on 1000 Dash for the year of 2016. This reward falls off in subsequent years but as the value of Dash is rising and the supply of Dash goes down, masternodes should still be sufficiently incentivized. @@ -34,21 +30,22 @@ pages: evolution-text: a decentralized payment processor (think a decentralized Paypal). host-heading: HOST A MASTERNODE - host-text-right: | + host-text: | 1000 Dash: Arguably the hardest part. Dash can be obtained from exchanges such as Poloniex, Bittrex and Shapeshift‘s service is also an excellent way. For the full list of places to obtain Dash click here. A server or a VPS installed with Linux: For the purposes of this guide we will be used Ubuntu 14.04 LTS. We recommend cheap VPSes such as from Vultr and DigitalOcean though any decent provider will do. Generally a low specced one will do. I use the 5 USD ones from Vultr and they work fine. A dedicated IP address: These usually come with the VPS/server. - host-text-left: | A little time: When I first got into masternodes, there were only a few guides around and did not cover all the scenarios. It took days for me to figure out the best ways to do everything. However, the process now takes a few minutes. Here are a few guides that I hope will make the process a lot easier. If you can’t be bothered with setting up and maintaining your own and don’t mind paying a little extra, you can go with paid masternode hosters which will greatly simplify the process. A few good ones can be found here. host-btn: Start Masternode - host-table-heading: MasterNodes Network + hosting-services: Masternode Hosting Services + hosting-services-text: + hosting-services-btn: Masternode Hosting Services p2p-text: | Text about peer2peer Thanks to incentivization, Dash’s network has grown to 4,100 masternodes since launch in 2014, meaning Dash’s peer-to-peer network is one of the largest in the world. @@ -79,11 +76,12 @@ pages: how-btc-text: The system would work as a decentralized voting mechanism setup ipay them directly after approval of the work in a decentralized fashion. how-btc-btn: Show Video - budget: + governance: title: Dash Official Website | Dash Crypto Currency description: Dash is Digital Cash - hero-heading: Budget System + hero-heading: Decentralized Governance System + hero-text: > Decentralized Governance by Blockchain, or DGBB, is Dash's attempt to solve two important problems in cryptocurrency: governance and funding. @@ -107,9 +105,9 @@ pages: At that time, the block rewards that were not paid out (10% of each block) will be used to fund approved proposals. The network thus funds itself by reserving 10% of the block reward for budget projects. - governance-heading: Goverment Tools + governance-meaning: What is Governance and what does it mean for Dash - voting-header: How to Voting + voting-header: How to Vote voting-automatic: Automated Voting voting-automatic-text: > One of the greatest challenges of building a crypto currency platform is ensuring you create a decentralized system of governance to manage, @@ -125,14 +123,13 @@ pages: The system would work as a decentralized voting mechanism setup in the software, where budgets for specific projects are proposed, then the masternodes as a whole vote on them. Each project, if it passes, is added to the total budget and paid directly from the blockchain to the person doing the work. With this, we could hire core developers and pay them directly after approval of the work in a decentralized fashion. - decentralized-governance-link: Self-sustainable Decentralized Governance - masternode-budget-link: Masternode Budget API - using-link: > - Using Decentralized Governance: Proposals, Voting, and Budgets - dgb-link: DGBB Document templates - budget-finalization-link: Budget Finalization Procedure + generator-link: Budget Proposal Generator + dashcentral-link: DashCentral + votetracker-link: VoteTracker + budget-monitoring-link: Budget Monitoring + proposal-status-link: Proposal Status - exchange-heading: Full Exchange Listing + proposal-service: Proposal Automated Service woocommerce: title: Dash Official Website | Dash Crypto Currency diff --git a/_includes/hero/contact.html b/_includes/hero/contact.html index f0c9ab1..5404808 100644 --- a/_includes/hero/contact.html +++ b/_includes/hero/contact.html @@ -21,7 +21,7 @@
{% t pages.contact.form-pretext %}
{% t pages.contact.form-pretext-2 %} - Contact us. + Contact us.
Dash
diff --git a/_includes/hero/budget.html b/_includes/hero/governance.html similarity index 52% rename from _includes/hero/budget.html rename to _includes/hero/governance.html index e16d433..71f3050 100644 --- a/_includes/hero/budget.html +++ b/_includes/hero/governance.html @@ -11,13 +11,13 @@
-

{% t pages.budget.hero-heading %}

-

{% t pages.budget.hero-text %}

+

{% t pages.governance.hero-heading %}

+

{% t pages.governance.hero-text %}

- {% t pages.budget.hero-how-to-btn %} - {% t pages.budget.hero-guide-btn %} - {% t pages.budget.hero-pools-btn %} + {% t pages.governance.hero-how-to-btn %} + {% t pages.governance.hero-guide-btn %} + {% t pages.governance.hero-pools-btn %}
diff --git a/_includes/hero/masternodes.html b/_includes/hero/masternodes.html index 0ae1585..9039d06 100644 --- a/_includes/hero/masternodes.html +++ b/_includes/hero/masternodes.html @@ -15,10 +15,10 @@

{% t pages.masternodes.hero-text %}

- {% t pages.masternodes.hero-what-btn %} - {% t pages.masternodes.hero-how-btn %} - {% t pages.masternodes.hero-network-btn %} - {% t pages.masternodes.hero-p2p-btn %} + {% t pages.masternodes.hero-what-btn %} + {% t pages.masternodes.hero-how-btn %} + {% t pages.masternodes.hero-masternode-mining-btn%} + {% t pages.masternodes.hero-network-btn %}
diff --git a/assets/img/masternodes/evol.svg b/assets/img/masternodes/evol.svg deleted file mode 100644 index 9be41bf..0000000 --- a/assets/img/masternodes/evol.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - diff --git a/assets/img/masternodes/masternode.svg b/assets/img/masternodes/masternode.svg deleted file mode 100644 index 78fd7e0..0000000 --- a/assets/img/masternodes/masternode.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - diff --git a/assets/img/masternodes/pay.svg b/assets/img/masternodes/pay.svg deleted file mode 100644 index 87a7db9..0000000 --- a/assets/img/masternodes/pay.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - diff --git a/assets/img/masternodes/private.svg b/assets/img/masternodes/private.svg deleted file mode 100644 index 92ade72..0000000 --- a/assets/img/masternodes/private.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - diff --git a/budget/index.html b/budget/index.html deleted file mode 100644 index a55704a..0000000 --- a/budget/index.html +++ /dev/null @@ -1,229 +0,0 @@ ---- -layout: default -title: pages.budget.title -description: pages.budget.description ---- - - -{% include hero/budget.html %} -{% include base.html %} - - -
- - -
-
-
{% tmd pages.budget.description-text-hero %}
-
-

{% t pages.budget.description %}

-
-
- - - - -
-
-
-

{% t pages.community.discussion-heading %}

- - {% tmd pages.community.discussion-text %} -
-
-
- - - - -
-
-
-
-
-
-

{% t pages.budget.voting-header %}

-
-
-

{% t pages.budget.voting-automatic %}

-

{% t pages.budget.voting-automatic-text %}

- {% t pages.budget.voting-guide-btn %} - {% t pages.budget.voting-manual-btn %} - {% t pages.budget.voting-central-btn %} -
-
-

{% t pages.budget.voting-tools %}

-

{% t pages.budget.voting-tools-text %}

- {% t pages.budget.decentralized-governance-link %} - {% t pages.budget.masternode-budget-link %} - {% t pages.budget.using-link %} - {% t pages.budget.dgb-link %} - {% t pages.budget.budget-finalization-link %} -
-
-
-
- -
-

{% t pages.budget.exchange-heading %}

- - - - - - - - - - - - - -
HeightBlock TimeTransactionsValue OutDifficulty
-
-
- diff --git a/contact/index.html b/contact/index.html index 6dbb523..010bfd8 100644 --- a/contact/index.html +++ b/contact/index.html @@ -20,7 +20,7 @@ description: pages.contact.description -
+

{% t pages.contact.mail-list-heading %}

diff --git a/governance/index.html b/governance/index.html new file mode 100644 index 0000000..5fe0853 --- /dev/null +++ b/governance/index.html @@ -0,0 +1,78 @@ +--- +layout: default +title: pages.governance.title +description: pages.governance.description +--- + + +{% include hero/governance.html %} +{% include base.html %} + + +
+ + +
+
+
{% tmd pages.governance.description-text-hero %}
+
+

{% t pages.governance.description %}

+
+
+ +
+
+

{% t pages.governance.governance-meaning %}

+
+
+ +
+
+
+
+ + +
+
+

{% t pages.governance.voting-header %}

+
+
+

{% t pages.governance.voting-automatic %}

+

{% t pages.governance.voting-automatic-text %}

+ + {% t pages.governance.voting-guide-btn %} + + + {% t pages.governance.voting-manual-btn %} + + + {% t pages.governance.voting-central-btn %} + +
+
+

{% t pages.governance.voting-tools %}

+

{% t pages.governance.voting-tools-text %}

+ {% t pages.governance.generator-link %} + {% t pages.governance.dashcentral-link %} + {% t pages.governance.votetracker-link %} + {% t pages.governance.budget-monitoring-link %} + {% t pages.governance.proposal-status-link %} +
+
+
+
+ +
+
+
+

{% t pages.governance.proposal-service %}

+ +
+ +
+
+
diff --git a/masternodes/index.html b/masternodes/index.html index 3c03d4e..9476a28 100644 --- a/masternodes/index.html +++ b/masternodes/index.html @@ -21,11 +21,11 @@ description: pages.budget.description
-

{% t pages.masternodes.what-heading %}

-

{% t pages.masternodes.what-text %}

+

{% t pages.masternodes.what-heading %}

+
-

{% t pages.masternodes.earn-heading %}

+

{% t pages.masternodes.earn-heading %}

{% t pages.masternodes.earn-text %}

@@ -45,43 +45,19 @@ description: pages.budget.description -
-
-
-
- Instant -

InstantSend

-

{% t pages.masternodes.instantiend-text %}

-
-
- Private -

PrivateSend

-

{% t pages.masternodes.private-send-text %}

-
-
- Secure -

Decentralised
Governance

-

{% t pages.masternodes.governance-text %}

-
-
- Secure -

Dash Evolution

-

{% t pages.masternodes.evolution-text %}

-
-
-
-
-

{% t pages.masternodes.host-heading %}

- {% tmd pages.masternodes.host-text-right %} +

{% t pages.masternodes.host-heading %}

+
{% tmd pages.masternodes.host-text %}
+ {% t pages.masternodes.host-btn %}
-
{% tmd pages.masternodes.host-text-left %}
- {% t pages.masternodes.host-btn %} +

{% t pages.masternodes.hosting-services %}

+
{% tmd pages.masternodes.hosting-services-text %}
+ {% t pages.masternodes.hosting-services-btn %}
@@ -111,11 +87,11 @@ description: pages.budget.description
-

P2P

+

P2P

{% tmd pages.masternodes.p2p-text %}
- {% t pages.masternodes.p2p-btn %} + {% t pages.masternodes.p2p-btn %}
diff --git a/mining/index.html b/mining/index.html deleted file mode 100644 index e69de29..0000000 diff --git a/_includes/hero/mining.html b/npm-debug.log.2092820115 similarity index 100% rename from _includes/hero/mining.html rename to npm-debug.log.2092820115 diff --git a/src/scss/_junk-drawer.scss b/src/scss/_junk-drawer.scss index 40cfe73..30963ba 100755 --- a/src/scss/_junk-drawer.scss +++ b/src/scss/_junk-drawer.scss @@ -479,12 +479,19 @@ a.blog_link { font-weight: $font-weight-bold; } -.section__title{ - font-weight: 300; - font-size: 3.35294rem; - line-height: 1.2; - letter-spacing: -0.015em; - margin-bottom: 10px; - text-align: center; - margin-bottom: 40px; +.mailboxes-bg{ + background-image: url(../../assets/img/hero/mailboxes.jpg); + position: relative; + background-size: cover; + z-index: 1; + &:after { + content: ''; + background-image: $gradient-default-overlay-blue; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: -1; + } } diff --git a/src/scss/_section.scss b/src/scss/_section.scss index ee787be..22d940f 100644 --- a/src/scss/_section.scss +++ b/src/scss/_section.scss @@ -10,7 +10,12 @@ $m: 'section'; padding: 0 20px; margin: 0 auto; } - + &__title{ + @include font-title-xlarge(); + margin-bottom: 10px; + text-align: center; + margin-bottom: 40px; + } &--intro-lead { text-align: center; .#{$m} { @@ -111,7 +116,7 @@ $m: 'section'; @include mq($to: 600px) { // optical & > * { width: 100%; - text-align: center; + text-align: center; } } }