diff --git a/_i18n/en.yml b/_i18n/en.yml index 7a053a2..813eaf5 100755 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -146,7 +146,7 @@ pages: execution-btn: Learn More execution-link: https://www.dash.org/forum/threads/january-2017-budget-report.12601/ - update-heading: EVOLUTION UPDATE + update-heading: Sentinel update-text: Lead evolution developer Andy Freer has been locked away producing huge amounts of documentation for the various concepts of Evolution. This comes after months of conversations between Andy and Dash Lead Developer Evan Duffield about how each component of Evolution works, then reimagining it and improving the components and designs systematically. @@ -223,6 +223,7 @@ pages: social-text-heading: Visit DashTalk social-text: For technical support or troubleshooting with wallets, mining, or other general questions, please visit DashTalk or one of the many other community resources. volunteer-heading: Volunteer + join-btn: Join home: title: Dash Official Website | Dash Crypto Currency diff --git a/_includes/hero/contact.html b/_includes/hero/contact.html index 3174a96..9d2375f 100644 --- a/_includes/hero/contact.html +++ b/_includes/hero/contact.html @@ -53,7 +53,46 @@
{% t pages.contact.mail-list-heading %}
- {% t pages.contact.mail-list-text %} +
{% t pages.contact.mail-list-text %}
+
+
+ +
+
+ + + + + + +
+
diff --git a/assets/img/evolution/bigwallet.png b/assets/img/evolution/bigwallet.png index 61d7d9c..a844532 100755 Binary files a/assets/img/evolution/bigwallet.png and b/assets/img/evolution/bigwallet.png differ diff --git a/assets/img/evolution/merchants.png b/assets/img/evolution/merchants.png new file mode 100755 index 0000000..e44d9a2 Binary files /dev/null and b/assets/img/evolution/merchants.png differ diff --git a/assets/img/update/lan_date.png b/assets/img/update/lan_date.png new file mode 100755 index 0000000..54b4f5f Binary files /dev/null and b/assets/img/update/lan_date.png differ diff --git a/assets/img/update/research.png b/assets/img/update/research.png index 6a21b33..76ee5f0 100755 Binary files a/assets/img/update/research.png and b/assets/img/update/research.png differ diff --git a/evolution/index.html b/evolution/index.html index 8b501c5..748576b 100755 --- a/evolution/index.html +++ b/evolution/index.html @@ -230,7 +230,7 @@ description: pages.evolution.description {% t pages.evolution.merchants-plugin-btn %}
- {% t pages.evolution.merchants-heading %} + {% t pages.evolution.merchants-heading %}
diff --git a/src/js/contacts.js b/src/js/contacts.js new file mode 100755 index 0000000..3583043 --- /dev/null +++ b/src/js/contacts.js @@ -0,0 +1,9 @@ +;(function ($) { + 'use strict'; + $(document).ready(function () { + $('.js-subscribe').on('click',function () { + $(this).toggleClass('hidden'); + $('.js-mailing-form').toggleClass('hidden'); + }); + }); +}(jQuery)); diff --git a/src/scss/_junk-drawer.scss b/src/scss/_junk-drawer.scss index c1131ba..a62bb5c 100644 --- a/src/scss/_junk-drawer.scss +++ b/src/scss/_junk-drawer.scss @@ -11,6 +11,10 @@ you're in a hurry or lost or you just need to Make It Work© display: block; } +.hidden{ + display: none !important; +} + .bottom-space { margin-bottom: 3%; } @@ -378,10 +382,18 @@ a.blog_link { background-color: #ffffff; } } + .text-word-wrap{ word-wrap: break-word; } + .color-article{ float: left; margin-left: 15px; } + +#mc_embed_signup{ + background:transparent; + clear:left; + font:14px Helvetica,Arial,sans-serif; +} diff --git a/update/index.html b/update/index.html index 4933dad..0de02ae 100755 --- a/update/index.html +++ b/update/index.html @@ -230,7 +230,7 @@ description: pages.update.description {% t pages.update.launching-btn %}
- Dash Evolution + Dash Evolution