Merge pull request #2 from seigler/master

Added new site fonts, started styling document footer
This commit is contained in:
perrywoodin 2016-07-28 10:52:59 -04:00 committed by GitHub
commit 312d9f68a9
26 changed files with 302 additions and 243 deletions

10
_components/buttons.html Normal file
View file

@ -0,0 +1,10 @@
---
title: "Buttons"
type: buttons
usage:
---
<a href="#" class="btn-white-solid">btn-white-solid</a>
<a href="#" class="btn-green">btn-green</a>
<a href="#" class="btn-blue">btn-blue</a>
<a href="#" class="btn-blue-solid">btn-blue-solid</a>

View file

@ -17,6 +17,7 @@ exclude_from_localizations: ["assets"]
sass:
style: compressed
cache: false
relative_assets: true
gems:
- jekyll-paginate

View file

@ -1,53 +1,79 @@
{% t nav.get-dash %}
<ul>
<li>{% t nav.download %}</li>
<li>{% t nav.buy %}</li>
<li>{% t nav.shop %}</li>
<li>{% t nav.debit %}</li>
</ul>
<nav class="content">
<section>
{% t nav.get-dash %}
<ul>
<li><a href="#">{% t nav.download %}</a></li>
<li><a href="#">{% t nav.buy %}</a></li>
<li><a href="#">{% t nav.shop %}</a></li>
<li><a href="#">{% t nav.debit %}</a></li>
</ul>
</section>
{% t nav.participate %}
<ul>
<li>{% t nav.mining %}</li>
<li>{% t nav.masternode %}</li>
<li>{% t nav.wallet %}</li>
<li>{% t nav.funding %}</li>
</ul>
<section>
{% t nav.participate %}
<ul>
<li><a href="#">{% t nav.mining %}</a></li>
<li><a href="#">{% t nav.masternode %}</a></li>
<li><a href="#">{% t nav.wallet %}</a></li>
<li><a href="#">{% t nav.funding %}</a></li>
</ul>
</section>
{% t nav.currency %}
<ul>
<li>{% t nav.exchange %}</li>
<li>{% t nav.governance %}</li>
<li>{% t nav.explorers %}</li>
<li>{% t nav.stats %}</li>
</ul>
<section>
{% t nav.currency %}
<ul>
<li><a href="#">{% t nav.exchange %}</a></li>
<li><a href="#">{% t nav.governance %}</a></li>
<li><a href="#">{% t nav.explorers %}</a></li>
<li><a href="#">{% t nav.stats %}</a></li>
</ul>
</section>
{% t nav.community %}
<ul>
<li>{% t nav.discussion %}</li>
<li>{% t nav.social-apps %}</li>
<li>{% t nav.news %}</li>
<li>{% t nav.tools-dev %}</li>
<li>{% t nav.tools-masternodes %}</li>
</ul>
<section>
{% t nav.community %}
<ul>
<li><a href="#">{% t nav.discussion %}</a></li>
<li><a href="#">{% t nav.social-apps %}</a></li>
<li><a href="#">{% t nav.news %}</a></li>
<li><a href="#">{% t nav.tools-dev %}</a></li>
<li><a href="#">{% t nav.tools-masternodes %}</a></li>
</ul>
</section>
{% t nav.project %}
<ul>
<li>{% t nav.help %}</li>
<li>{% t nav.info %}</li>
<li>{% t nav.team %}</li>
<li>{% t nav.contact %}</li>
</ul>
<section>
{% t nav.project %}
<ul>
<li><a href="#">{% t nav.help %}</a></li>
<li><a href="#">{% t nav.info %}</a></li>
<li><a href="#">{% t nav.team %}</a></li>
<li><a href="#">{% t nav.contact %}</a></li>
</ul>
</section>
{% t nav.social %}
<ul>
<li>{% t nav.blog %}</li>
<li>{% t nav.reddit %}</li>
<li>{% t nav.twitter %}</li>
<li>{% t nav.youtube %}</li>
<li>{% t nav.google %}</li>
<li>{% t nav.linkedin %}</li>
<li>{% t nav.facebook %}</li>
<li>{% t nav.instagram %}</li>
<li>{% t nav.github %}</li>
</ul>
<section>
{% t nav.social %}
<ul class="footer--social">
<li><a href="#">{% t nav.blog %}</a></li>
<li><a href="#">{% t nav.reddit %}</a></li>
<li><a href="#">{% t nav.twitter %}</a></li>
<li><a href="#">{% t nav.youtube %}</a></li>
<li><a href="#">{% t nav.google %}</a></li>
<li><a href="#">{% t nav.linkedin %}</a></li>
<li><a href="#">{% t nav.facebook %}</a></li>
<li><a href="#">{% t nav.instagram %}</a></li>
<li><a href="#">{% t nav.github %}</a></li>
</ul>
</section>
</nav>
<div class="footer--menu content">
<div class="footer--languagePicker"></div>
<a href="#">Terms of Use</a>
<a href="#">Contact</a>
<a href="#">Sitemap</a>
</div>
<div class="footer--legal">
<div class="content">
<span class="footer--copyright">&copy; {{ site.time | date: "%Y" }} The Dash Network</span>
<a href="#">Github Source</a>
</div>
</div>

View file

@ -26,8 +26,8 @@
{{ content }}
<!-- Footer -->
<footer class="content">
{% include footer.html %}
<footer>
{% include footer.html %}
</footer>
<!-- Mobile Nav -->

View file

@ -32,7 +32,6 @@
margin-bottom: 20px;
border-right: none;
h2 {
font-family: 'montserratlight';
font-size: 24px;
margin-bottom: 10px;
}

View file

@ -7,7 +7,6 @@
color: lighten($black, 5) !important;
text-decoration: none;
font-size: 16px;
font-family: 'montserratregular';
text-transform: uppercase;
box-sizing: border-box;
&:hover {
@ -22,7 +21,6 @@
text-decoration: none;
border: none;
font-size: 16px;
font-family: 'montserratregular';
text-transform: uppercase;
&:hover {
background-color: darken($green, 3);
@ -51,7 +49,6 @@
text-decoration: none;
border: none;
font-size: 16px;
font-family: 'montserratregular';
text-transform: uppercase;
box-sizing: border-box;
&:hover {

View file

@ -1,55 +1,46 @@
/*
footer
nav.content
section x5
<text>
ul
li
.footer--menu.content
.footer--languagePicker
a x3
.footer--legal
.content
.footer--copyright
a
*/
footer {
padding-top: 20px;
ul {
margin: 0;
padding: 0;
}
.nav {
float: right;
text-align: right;
display: block;
li {
display: inline;
margin-left: 20px;
a {
text-decoration: none;
color: $blue;
font-size: 16px;
font-family: 'montserratregular';
&:hover {
color: darken($blue, 6);
}
}
.sign-up {
color: $green !important;
&:hover {
color: darken($green, 6) !important;
}
}
}
}
.social {
float: right;
text-align: right;
display: block;
li {
display: inline;
margin-left: 10px;
}
.social-icon {
width: 30px;
height: auto;
}
}
.logo {
float: left;
width: 56px;
height: auto;
}
.copyright {
margin-top: 13px;
float: left;
font-size: 12px;
color: #999;
}
background-color: #333333;
color: #717171;
padding-top: 4em;
a {
color: $white;
}
> nav {
display: table;
table-layout: fixed;
> section {
display: table-cell;
> ul {
margin: 1em 0 0;
padding: 0;
> li {
list-style: none;
}
}
}
}
}
.footer--social {
-moz-column-count: 2;
-webkit-column-count: 2;
column-count: 2;
}

View file

@ -22,7 +22,6 @@
color: $blue;
text-decoration: none;
font-size: 12px;
font-family: 'montserratregular';
&:hover {
color: lighten($blue, 25);
}

View file

@ -22,7 +22,6 @@
color: rgba($white, 0.9);
text-decoration: none;
font-size: 12px;
font-family: 'montserratregular';
&:hover {
color: rgba($white, 1.0);
}
@ -48,7 +47,6 @@
text-align: center;
border-right: 2px solid $gray;
h2 {
font-family: 'montserratlight';
font-size: 26px;
margin-bottom: 10px;
span {
@ -119,8 +117,6 @@
overflow: hidden;
}
h3 {
font-family: 'Helvetica Neue', Helvetica, Arial, Sans-Serif;
font-size: 14px;
margin-bottom: 10px;
}
.date {

View file

@ -4,7 +4,6 @@
h1 {
padding-top: 60px;
padding-bottom: 20px;
font-family: 'montserratlight';
font-size: 30px;
}
}
@ -76,7 +75,6 @@ iframe {
text-transform: uppercase;
color: $black;
margin: 0px;
font-family: 'montserratlight';
}
}
.callout-blue {
@ -86,7 +84,6 @@ iframe {
margin-bottom: 20px;
text-align: center;
h2 {
font-family: 'montserratlight';
font-size: 64px;
margin-bottom: 20px;
color: $blue;
@ -108,7 +105,6 @@ iframe {
margin-bottom: 20px;
text-align: center;
h2 {
font-family: 'montserratlight';
font-size: 64px;
margin-bottom: 20px;
color: $green;

31
_sass/_junk-drawer.scss Normal file
View file

@ -0,0 +1,31 @@
/*
Everything in this file is technical debt. Put stuff in here if
you're in a hurry or lost or you just need to Make It Work©
*/
img.staff {
max-width: 100px;
float: left;
margin-right: 10px;
}
a.blog_link {
text-align:right;
}
.img-circle {
margin: 1px;
border:1px solid #dddddd;
border-radius: 50%;
-webkit-border-radius: 50%;
-moz-border-radius: 50%;
}
.background-title {
background-color: $gray;
padding: 10px;
margin-top: 30px;
margin-bottom: 0;
}

35
_sass/_layout.scss Normal file
View file

@ -0,0 +1,35 @@
body {
margin: 0;
padding: 0;
color: $black;
background-color: $white;
}
.content {
width: 1280px;
margin: 0 auto;
}
.col {
float: left
}
.button_container {
display: none;
}
// non-semantic concessions AKA utility classes
.clear {
clear: both;
display: block;
}
.right {
float: right;
display: inline-block;
}
.left {
float: left;
display: inline-block;
}

View file

@ -19,7 +19,6 @@
text-transform: uppercase;
text-decoration: none;
font-size: 16px;
font-family: 'montserratregular';
&:hover {
color: rgba($black, 1.0);
}

54
_sass/_reset.scss Normal file
View file

@ -0,0 +1,54 @@
/**
* This gives us a consistent starting point for styles across browsers.
*
* Eric Meyer's Reset CSS v2.0 (http://meyerweb.com/eric/tools/css/reset/)
* http://cssreset.com
*/
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
b, u, i, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary,
time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
font: inherit;
vertical-align: baseline;
}
/* HTML5 display-role reset for older browsers */
article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section {
display: block;
}
body {
line-height: 1;
}
ol, ul {
list-style: none;
}
blockquote, q {
quotes: none;
}
blockquote:before, blockquote:after,
q:before, q:after {
content: '';
content: none;
}
table {
border-collapse: collapse;
border-spacing: 0;
}
/* one small addition */
*,*:after,*:before {
box-sizing: inherit;
}

View file

@ -1,50 +1,11 @@
font-face {
font-family: 'montserratbold';
src: url('../fonts/montserrat-bold-webfont.eot');
src: url('../fonts/montserrat-bold-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/montserrat-bold-webfont.woff2') format('woff2'),
url('../fonts/montserrat-bold-webfont.woff') format('woff'),
url('../fonts/montserrat-bold-webfont.ttf') format('truetype'),
url('../fonts/montserrat-bold-webfont.svg#montserratbold') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'montserratlight';
src: url('../fonts/montserrat-light-webfont.eot');
src: url('../fonts/montserrat-light-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/montserrat-light-webfont.woff2') format('woff2'),
url('../fonts/montserrat-light-webfont.woff') format('woff'),
url('../fonts/montserrat-light-webfont.ttf') format('truetype'),
url('../fonts/montserrat-light-webfont.svg#montserratlight') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'montserratregular';
src: url('../fonts/montserrat-regular-webfont.eot');
src: url('../fonts/montserrat-regular-webfont.eot?#iefix') format('embedded-opentype'),
url('../fonts/montserrat-regular-webfont.woff2') format('woff2'),
url('../fonts/montserrat-regular-webfont.woff') format('woff'),
url('../fonts/montserrat-regular-webfont.ttf') format('truetype'),
url('../fonts/montserrat-regular-webfont.svg#montserratregular') format('svg');
font-weight: normal;
font-style: normal;
@import "../fonts/worksans/font.css"; // imports are relative to /assets/css/style.scss
body {
font-family: 'Work Sans', Helvetica, Arial, sans-serif;
line-height: 1.5;
}
p {
font-family: 'Helvetica Neue', Helvetica, Arial, Sans-Serif;
font-size: 14px;
line-height: 22px;
a {
@ -56,41 +17,23 @@ p {
}
}
span {
font-family: 'Helvetica Neue', Helvetica, Arial, Sans-Serif;
}
h1 {
font-size: 36px;
line-height: 40px;
font-family: 'montserratbold', 'Helvetica Neue', Helvetica, Arial, Sans-Serif;
font-weight: bold;
}
h2 {
font-family: 'montserratregular';
font-size: 22px;
color: $blue;
}
h3 {
font-family: 'montserratlight';
font-size: 20px;
color: $black;
span {
font-family: inherit;
}
}
.background-title {
background-color: $gray;
padding: 10px;
margin-top: 30px;
margin-bottom: 0;
}
a {
font-family: 'Helvetica Neue', Helvetica, Arial, Sans-Serif;
text-decoration: none;
color: $blue;
}

View file

@ -3,78 +3,32 @@
# only Main files contain this front matter, not partials.
---
// stuff every page really needs
@import "reset";
@import "colors";
@import "typography";
@import "layout";
body {
margin: 0;
padding: 0;
color: $black;
background-color: $white;
font-family: 'Helvetica Neue', Helvetica, Arial, Sans-Serif;
font-size: 14px;
line-height: 22px;
}
.content {
width: 1280px;
margin: 0 auto;
}
.col {
float: left
}
.clear {
clear: both;
display: block;
}
.right {
float: right;
display: inline-block;
}
.left {
float: left;
display: inline-block;
}
.button_container {
display: none;
}
img.staff {
max-width: 100px;
float: left;
margin-right: 10px;
}
a.blog_link {
text-align:right;
}
.img-circle {
margin: 1px;
border:1px solid #dddddd;
border-radius: 50%;
-webkit-border-radius: 50%;
-moz-border-radius: 50%;
}
//stuff every page needs
@import "header";
@import "nav";
@import "buttons";
@import "forms";
@import "footer";
//stuff most pages need
@import "overlay-menu";
@import "video";
//styles for specific pages
@import "home";
@import "interior";
@import "post";
@import "header";
@import "junk-drawer";
@import "styleguide";
//responsive overrides
//TODO merge these back into the rest of the SCSS files
@import "1024";
@import "768";
@import "640";

View file

@ -0,0 +1,23 @@
/* Generated by Font Squirrel (https://www.fontsquirrel.com) on July 27, 2016 */
@font-face {
font-family: 'Work Sans';
src: url('worksans-bold-webfont.eot');
src: url('worksans-bold-webfont.eot?#iefix') format('embedded-opentype'),
url('worksans-bold-webfont.woff2') format('woff2'),
url('worksans-bold-webfont.woff') format('woff'),
url('worksans-bold-webfont.ttf') format('truetype');
font-weight: bold;
font-style: normal;
}
@font-face {
font-family: 'Work Sans';
src: url('worksans-regular-webfont.eot');
src: url('worksans-regular-webfont.eot?#iefix') format('embedded-opentype'),
url('worksans-regular-webfont.woff2') format('woff2'),
url('worksans-regular-webfont.woff') format('woff'),
url('worksans-regular-webfont.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}

View file

@ -0,0 +1,5 @@
# Font Squirrel Font-face Generator Configuration File
# Upload this file to the generator to recreate the settings
# you used to create these fonts.
{"mode":"expert","formats":["ttf","woff","woff2","eotz"],"tt_instructor":"default","fix_gasp":"xy","fix_vertical_metrics":"Y","metrics_ascent":"","metrics_descent":"","metrics_linegap":"","add_spaces":"Y","add_hyphens":"Y","fallback":"none","fallback_custom":"100","options_subset":"none","subset_custom":"","subset_custom_range":"","subset_ot_features_list":"","style_link":"Y","css_stylesheet":"font.css","filename_suffix":"-webfont","emsquare":"2048","spacing_adjustment":"0","rememberme":"Y"}

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.