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 commit 'dfbeb339fc'

Browse source 
* commit 'dfbeb339fc':
  hard reset; deleted modification then added back
  added styles
This commit is contained in:
Chuck Williams 2017-02-03 15:56:23 -07:00
commit 6ce6fbd32b
12 changed files with 371 additions and 336 deletions
Download patch file Download diff file Expand all files Collapse all files

1
_i18n/en.yml
View file

@ -222,6 +222,7 @@ pages:
mail-list-heading: Mailing List
mail-list-text: Have trouble keeping up-to-date? Join our mailing list.
social-text-heading: VISIT DASH FORUM
forum-btn: Visit Forums
social-text: For technical support or troubleshooting with wallets, mining, or other general questions, please visit DASH FORUM or one of the many other community resources.
volunteer-heading: Volunteer
join-btn: Join

55
_includes/hero/contact.html
View file

@ -24,11 +24,13 @@
</div>
</div>
<div class="row">
<div class="col-xs-6">
<div class="col-xs-12">
<input class="input-block" placeholder="Email" type="text">
</div>
<div class="col-xs-6">
<select class="form-control" placeholder="category">
</div>
<div class="row">
<div class="col-xs-12">
<select class="form-control input-block" placeholder="category">
<option value="">Category</option>
<option value="feedback">Feedback</option>
</select>
@ -41,7 +43,7 @@
</div>
<div class="row">
<div class="col-xs-12">
<input class="submit" type="submit" value="Send Message">
<input class="btn-blue-solid" type="submit" value="Send Message">
</div>
</div>
</form>
@ -50,51 +52,6 @@
</div>
<div class="hero__content">
<section class="section section--cta">
<h5>{% t pages.contact.mail-list-heading %}</h5>
<div class="bottom-space">{% t pages.contact.mail-list-text %}</div>
<div class="row">
<div class="col-xs-12">
<button class="btn-white-solid js-subscribe">{% t pages.contact.join-btn %}</button>
</div>
<div class="col-xs-12 ">
<!-- Begin MailChimp Signup Form -->
<link href="//cdn-images.mailchimp.com/embedcode/classic-10_7.css" rel="stylesheet" type="text/css">
<div id="mc_embed_signup" class="js-mailing-form hidden">
<form action="//dash.us10.list-manage.com/subscribe/post?u=24325ade3f458f5d1004b6c23&amp;id=8ecd7e9bb7" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate>
<div id="mc_embed_signup_scroll">
<h2>Subscribe to our mailing list</h2>
<div class="indicates-required"><span class="asterisk">*</span> indicates required</div>
<div class="mc-field-group">
<label for="mce-EMAIL">Email Address <span class="asterisk">*</span>
</label>
<input type="email" value="" name="EMAIL" class="required email" id="mce-EMAIL">
</div>
<div class="mc-field-group input-group">
<strong>Subscriptions </strong>
<ul><li><input type="checkbox" value="1" name="group[9869][1]" id="mce-group[9869]-9869-0"><label for="mce-group[9869]-9869-0">Technical Updates and Alerts</label></li>
<li><input type="checkbox" value="2" name="group[9869][2]" id="mce-group[9869]-9869-1"><label for="mce-group[9869]-9869-1">Monthly Newsletter</label></li>
<li><input type="checkbox" value="4" name="group[9869][4]" id="mce-group[9869]-9869-2"><label for="mce-group[9869]-9869-2">Weekly Content Digest from Dash.org</label></li>
</ul>
</div>
<p class="bottom-space"><a href="http://us10.campaign-archive2.com/home/?u=24325ade3f458f5d1004b6c23&id=8ecd7e9bb7" title="View previous campaigns" >View previous campaigns.</a></p>
<div id="mce-responses" class="clear">
<div class="response" id="mce-error-response" style="display:none"></div>
<div class="response" id="mce-success-response" style="display:none"></div>
</div> <!-- real people should not fill this in and expect good things - do not remove this or risk form bot signups-->
<div style="position: absolute; left: -5000px;" aria-hidden="true"><input type="text" name="b_24325ade3f458f5d1004b6c23_8ecd7e9bb7" tabindex="-1" value=""></div>
<div class="clear"><input type="submit" value="Subscribe" name="subscribe" id="mc-embedded-subscribe" class="button"></div>
</div>
</form>
</div>
<script type='text/javascript' src='//s3.amazonaws.com/downloads.mailchimp.com/js/mc-validate.js'></script><script type='text/javascript'>(function($) {window.fnames = new Array(); window.ftypes = new Array();fnames[0]='EMAIL';ftypes[0]='email';fnames[1]='FNAME';ftypes[1]='text';fnames[2]='LNAME';ftypes[2]='text';fnames[6]='MMERGE6';ftypes[6]='dropdown';fnames[3]='MMERGE3';ftypes[3]='text';fnames[5]='MMERGE5';ftypes[5]='text';}(jQuery));var $mcj = jQuery.noConflict(true);</script>
<!--End mc_embed_signup-->
</div>
</div>
</section>
</div>
<!-- Hero stripe -->
<div class="hero__stripe"></div>

BIN
assets/img/graphics/dash_logo_s.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Before After
Before After

BIN
assets/img/update/backend.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

Before After
Before After

BIN
assets/img/update/bg2.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 1.4 MiB

Before After
Before After

BIN
assets/img/update/execution.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 128 KiB

After

Width:  |  Height:  |  Size: 100 KiB

Before After
Before After

BIN
assets/img/update/netw.png Executable file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
assets/img/update/updateevo.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 83 KiB

After

Width:  |  Height:  |  Size: 75 KiB

Before After
Before After

58
contact/index.html
View file

@ -11,7 +11,63 @@ description: pages.contact.description
<section class="section section--cta">
<div class="section__content">
<h3 >{% t pages.contact.social-text-heading %}</h3>
{% tmd pages.contact.social-text %}
<div class="bottom-space">{% tmd pages.contact.social-text %}</div>
<div class="bottom-space">
<a href="https://www.dash.org/forum" class="btn-blue-solid" target="_blank" >
{% t pages.contact.forum-btn %}
</a>
</div>
</div>
</section>
<section class="section section--cta section--colored">
<div class="section__content">
<h3>{% t pages.contact.mail-list-heading %}</h3>
<div class="bottom-space">{% t pages.contact.mail-list-text %}</div>
<div class="row">
<div class="col-xs-12">
<button class="btn-white-solid js-subscribe">{% t pages.contact.join-btn %}</button>
</div>
</div>
<div class="row">
<div class="col-xs-12 ">
<!-- Begin MailChimp Signup Form -->
<link href="//cdn-images.mailchimp.com/embedcode/classic-10_7.css" rel="stylesheet" type="text/css">
<div id="mc_embed_signup" class="js-mailing-form hidden">
<form action="//dash.us10.list-manage.com/subscribe/post?u=24325ade3f458f5d1004b6c23&amp;id=8ecd7e9bb7" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate>
<div id="mc_embed_signup_scroll">
<h2>Subscribe to our mailing list</h2>
<div class="indicates-required"><span class="asterisk">*</span> indicates required</div>
<div class="mc-field-group">
<label for="mce-EMAIL">Email Address <span class="asterisk">*</span>
</label>
<input type="email" value="" name="EMAIL" class="required email" id="mce-EMAIL">
</div>
<div class="mc-field-group input-group">
<strong>Subscriptions </strong>
<ul><li><input type="checkbox" value="1" name="group[9869][1]" id="mce-group[9869]-9869-0"><label for="mce-group[9869]-9869-0">Technical Updates and Alerts</label></li>
<li><input type="checkbox" value="2" name="group[9869][2]" id="mce-group[9869]-9869-1"><label for="mce-group[9869]-9869-1">Monthly Newsletter</label></li>
<li><input type="checkbox" value="4" name="group[9869][4]" id="mce-group[9869]-9869-2"><label for="mce-group[9869]-9869-2">Weekly Content Digest from Dash.org</label></li>
</ul>
</div>
<p class="bottom-space"><a href="http://us10.campaign-archive2.com/home/?u=24325ade3f458f5d1004b6c23&id=8ecd7e9bb7" title="View previous campaigns" >View previous campaigns.</a></p>
<div id="mce-responses" class="clear">
<div class="response" id="mce-error-response" style="display:none"></div>
<div class="response" id="mce-success-response" style="display:none"></div>
</div> <!-- real people should not fill this in and expect good things - do not remove this or risk form bot signups-->
<div style="position: absolute; left: -5000px;" aria-hidden="true"><input type="text" name="b_24325ade3f458f5d1004b6c23_8ecd7e9bb7" tabindex="-1" value=""></div>
<div class="clear"><input type="submit" value="Subscribe" name="subscribe" id="mc-embedded-subscribe" class="button"></div>
</div>
</form>
</div>
<script type='text/javascript' src='//s3.amazonaws.com/downloads.mailchimp.com/js/mc-validate.js'></script><script type='text/javascript'>(function($) {window.fnames = new Array(); window.ftypes = new Array();fnames[0]='EMAIL';ftypes[0]='email';fnames[1]='FNAME';ftypes[1]='text';fnames[2]='LNAME';ftypes[2]='text';fnames[6]='MMERGE6';ftypes[6]='dropdown';fnames[3]='MMERGE3';ftypes[3]='text';fnames[5]='MMERGE5';ftypes[5]='text';}(jQuery));var $mcj = jQuery.noConflict(true);</script>
<!--End mc_embed_signup-->
</div>
</div>
</div>
</section>

15
src/scss/_forms.scss
View file

@ -1,19 +1,22 @@
form {
input {
font-size: 15px;
padding: 10px 5px 10px 5px;
border: 2px solid $color-black;
padding: 10px 5px 10px 12px;
border: none;
border-radius: 4px;
box-sizing: border-box;
appearance: none;
}
select {
border: 2px solid $color-black;
border-radius: 0px;
border-radius: 4px;
-webkit-appearance: none;
}
textarea {
border: 2px solid $color-black;
border: none;
font-size: 15px;
padding: 10px 5px 10px 12px;
border-radius: 4px;
}
.input-block {
width: 100%;
@ -29,8 +32,8 @@ form {
color: #999;
background-color: #fff;
background-image: none;
border: 2px solid $color-black;
border-radius: 2px;
border: none;
border-radius: 4px;
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
-webkit-transition: border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;

18
src/scss/_junk-drawer.scss
View file

@ -303,6 +303,18 @@ a.blog_link {
overflow: hidden;
position: relative;
text-align: center;
z-index: 1;
&:after {
content: '';
background-image: -webkit-linear-gradient(315deg, rgba(40,61,129,0.7) 0%, rgba(28,117,188,0.8) 100%);
background-image: linear-gradient(-225deg, rgba(40,61,129,0.7) 0%, rgba(28,117,188,0.8) 100%);
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
z-index: -1;
}
h1, h2, h3 {
color: white;
}
@ -440,6 +452,12 @@ a.blog_link {
font:14px Helvetica,Arial,sans-serif;
}
.section--colored {
background-color: $color-blue;
color: white;
padding-top: 55px;
margin-bottom: 55px;
}
.ctabox__image {
background-color: rgba(173,219,255,0.1);

6
update/index.html
View file

@ -116,7 +116,7 @@ description: pages.update.description
<article class="ctabox__cta" data-js-ctabox-item>
<a href="https://misconductwineco.com/" target="_blank" class="ctabox__link">
<div class="ctabox__imagewrapper">
<img src="/assets/img/update/strategic.jpg" class="ctabox__image">
<img src="/assets/img/update/netw.png" class="ctabox__image">
</div>
<div class="ctabox__text">
<h4 class="ctabox__title">NETWORK</h4>
@ -163,7 +163,7 @@ description: pages.update.description
<!--
NETWORK ARCHITECTURE
-->
<section class="section--masternode">
<section class="section--colored">
<div class="content">
<div class="row">
<div class="col-sm-6">
@ -171,7 +171,7 @@ description: pages.update.description
{% tmd pages.update.execution-text %}
<a href="{% t pages.update.execution-link %}" target="_blank" class="btn-blue">{% t pages.update.execution-btn %}</a>
<a href="{% t pages.update.execution-link %}" target="_blank" class="btn-white-solid">{% t pages.update.execution-btn %}</a>
</div>
<div class="col-sm-6 home-architecture-graphic">
<img src="/assets/img/update/execution.png" alt="{% t pages.home.execution-heading %}">