diff --git a/_config.yml b/_config.yml index dd2e3e6..d656c95 100644 --- a/_config.yml +++ b/_config.yml @@ -17,7 +17,6 @@ exclude_from_localizations: ["assets"] sass: style: compressed cache: false - relative_assets: true gems: - jekyll-paginate diff --git a/_i18n/en.yml b/_i18n/en.yml index 5c9f53c..a0e0a63 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -9,8 +9,8 @@ pages: home: title: Official Website | Private Digital Currency description: Dash is Digital Cash - hero-heading: Dash is Digital Cash - hero-text: The first truly-decentralized digital money system
Meet Digital Cash. + hero-heading: Dash is Digital Cash! + hero-text: The first truly-decentralized digital money system.
Meet Digital Cash. video-heading: Dash is Digital Cash You Can Spend Online video-text: Use Dash to make instant, anonymous payments online or in-store using our secure open-source platform hosted by thousands of users around the world. @@ -228,4 +228,4 @@ nav: github: GitHub tos: Terms of Use - sitemap: Sitemap \ No newline at end of file + sitemap: Sitemap diff --git a/_includes/nav-desktop.html b/_includes/nav-desktop.html index 4c5e70f..70cd8c8 100644 --- a/_includes/nav-desktop.html +++ b/_includes/nav-desktop.html @@ -9,11 +9,11 @@ {% assign logo-color = include.logo-color %} {% endif %} -
- +
+ -
+ diff --git a/_sass/_buttons.scss b/_sass/_buttons.scss index ad0abec..d3b8874 100644 --- a/_sass/_buttons.scss +++ b/_sass/_buttons.scss @@ -1,20 +1,28 @@ -.btn-white-solid { +.btn { border-radius: 5px; - border: 2px solid $white; - background-color: darken($white, 3); + border: 2px solid; padding: 5px 10px; + display: inline-block; + font-family: $font-heading; + font-weight: 500; +} + +.btn-white-solid { + @extend .btn; + border-color: $white; + background-color: darken($white, 3); margin-bottom: 10px; color: lighten($black, 5) !important; text-decoration: none; font-size: 16px; text-transform: uppercase; - box-sizing: border-box; &:hover { background-color: $white; } } .btn-green { + @extend .btn; background-color: $green; padding: 10px 20px 10px 20px; color: $white !important; @@ -29,9 +37,9 @@ } .btn-blue { + @extend .btn; border-radius: 5px; - border: 2px solid $blue; - padding: 5px 10px; + border-color: $blue; color: $blue !important; text-decoration: none; &:hover { @@ -41,16 +49,13 @@ } .btn-blue-solid { - border-radius: 5px; + @extend .btn; background-color: lighten($blue, 5); - padding: 5px 10px; - margin-bottom: 10px; color: $white !important; text-decoration: none; border: none; font-size: 16px; text-transform: uppercase; - box-sizing: border-box; &:hover { background-color: darken($blue, 3); color: $white !important; diff --git a/_sass/_directives.scss b/_sass/_directives.scss new file mode 100644 index 0000000..51e43a0 --- /dev/null +++ b/_sass/_directives.scss @@ -0,0 +1,11 @@ +/* +This is for time-saving base classes that get @extend -ed +*/ + +%clearfix { + &:after { + content: ""; + display: table; + clear: both; + } +} diff --git a/_sass/_header.scss b/_sass/_header.scss index 1ed47b1..8c01bf2 100644 --- a/_sass/_header.scss +++ b/_sass/_header.scss @@ -1,44 +1,35 @@ -#header { - text-align: left; +#hero { + height: 600px; color: $white; - padding: 1px 0; #top { - border-bottom: 1px solid $blue; - text-align: left; - .logo { - width: 180px; - height: auto; - display: inline-block; - } - nav { - float: right; - text-align: right; - margin-bottom: 5px; - li { - display: inline; - margin-left: 20px; - a { - color: $blue; - text-decoration: none; - font-size: 12px; - &:hover { - color: lighten($blue, 25); - } - } + border-bottom: 1px solid rgba($white, 0.35); + nav li a { + color: rgba($white, 0.9); + &:hover { + color: rgba($white, 1); + text-shadow: 0 0 2em black; } } } - .page-info { - background-color: #fff; + + > h1, > p { + text-shadow: 2px 2px 2px rgba(black, 0.4); } - h1 { - color: $blue; - text-shadow: 1px 2px 4px rgba(0, 0, 0, 0.3); + > h1 { + margin-top: 2.5em; + font-size: 56px; + line-height: 1.2; + } + > p { + font-family: $font-heading; + font-size: 35px; + line-height: 1.25; + margin-bottom: 0.5em; } - p { - color: $blue; - margin-bottom: 50px; + .btn-blue-solid { + font-size: 20px; + padding: 5px 25px; } } diff --git a/_sass/_home.scss b/_sass/_home.scss index 6013c10..0418936 100644 --- a/_sass/_home.scss +++ b/_sass/_home.scss @@ -1,43 +1,3 @@ -#hero { - background-color: rgba(#000, .25); - text-align: left; - color: $white; - padding: 1px 0 265px 0; - #top { - border-bottom: 1px solid $white; - text-align: left; - .logo { - width: 180px; - height: auto; - display: inline-block; - } - nav { - float: right; - text-align: right; - margin-bottom: 5px; - li { - display: inline; - margin-left: 20px; - a { - color: rgba($white, 0.9); - text-decoration: none; - font-size: 12px; - &:hover { - color: rgba($white, 1.0); - } - } - } - } - } - h1 { - text-shadow: 1px 2px 4px rgba(0, 0, 0, 0.3); - } - - p { - margin-bottom: 50px; - } -} - #info { .col { width: 33%; diff --git a/_sass/_nav.scss b/_sass/_nav.scss index 6f55b8a..5ef8f5a 100644 --- a/_sass/_nav.scss +++ b/_sass/_nav.scss @@ -1,31 +1,46 @@ #top { - border-bottom: 1px solid $white; - text-align: left; - margin-top: 30px; - margin-bottom: 40px; - .logo { - width: 180px; - height: auto; - display: inline-block; - } + border-bottom: 1px solid $blue; + margin-bottom: 20px; + @extend %clearfix; + nav { float: right; text-align: right; li { - display: inline; - margin-left: 10px; + display: inline-block; + text-transform: uppercase; + font-size: 14px; + font-weight: 600; + line-height: 90px; + a { - color: rgba($black, 0.9); - text-transform: uppercase; + padding: 0 10px; + display: inline-block; text-decoration: none; - font-size: 16px; + color: rgba($black, 0.9); + &:hover { color: rgba($black, 1.0); } } + &:last-child > a { + padding-right: 0; + } + .status { + color: $blue; + } } - .status { - color: $blue !important; + } + + .logo { + width: 180px; + height: 90px; + display: inline-block; + > img { + position: relative; + top: 50%; + transform: translateY(-50%); + max-width: 100%; } } } diff --git a/_sass/_typography.scss b/_sass/_typography.scss index 4a6d81d..b3fd7c3 100644 --- a/_sass/_typography.scss +++ b/_sass/_typography.scss @@ -1,13 +1,19 @@ -@import "../fonts/worksans/font.css"; // imports are relative to /assets/css/style.scss +@import "fonts/worksans/bold"; +@import "fonts/worksans/medium"; +@import "fonts/open-sans/regular"; +@import "fonts/open-sans/italic"; + +$font-body: 'Open Sans', Helvetica, Arial, sans-serif; +$font-heading: 'Work Sans', Helvetica, Arial, sans-serif; body { - font-family: 'Work Sans', Helvetica, Arial, sans-serif; + font-family: $font-body; line-height: 1.5; } p { font-size: 14px; - line-height: 22px; + line-height: 1.5; a { color: $blue; text-decoration: none; @@ -17,6 +23,10 @@ p { } } +h1, h2, h3 { + font-family: $font-heading; +} + h1 { font-size: 36px; line-height: 40px; diff --git a/_sass/_video.scss b/_sass/_video.scss index 1d0e438..259c213 100644 --- a/_sass/_video.scss +++ b/_sass/_video.scss @@ -1,19 +1,29 @@ #background-video { - position: absolute; - top: -150px; - right: 0; - bottom: 0; - left: 0; - overflow: hidden; - z-index: -100; - height: 700px; - overflow: hidden; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + overflow: hidden; + z-index: -100; + height: 600px; + overflow: hidden; + &:after { + content: ''; + background-image: linear-gradient(to bottom, rgba(black, 0.6), transparent); + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + } .background-video { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: auto; + position: relative; + top: 40%; + transform: translateY(-40%); + width: 100%; + height: auto; + min-height: 100%; } } @@ -38,4 +48,4 @@ display: none; } } -} \ No newline at end of file +} diff --git a/_sass/fonts/gunshipital/_regular.scss b/_sass/fonts/gunshipital/_regular.scss new file mode 100755 index 0000000..3af83b4 --- /dev/null +++ b/_sass/fonts/gunshipital/_regular.scss @@ -0,0 +1,10 @@ +/* Generated by Font Squirrel (https://www.fontsquirrel.com) on May 14, 2016 */ + +@font-face { + font-family: 'Gunship Italic'; + src: url('../fonts/gunshipital/gunshipital-webfont.woff2') format('woff2'), + url('../fonts/gunshipital/gunshipital-webfont.woff') format('woff'); + font-weight: normal; + font-style: normal; +} + diff --git a/_sass/fonts/open-sans/_bold.scss b/_sass/fonts/open-sans/_bold.scss new file mode 100644 index 0000000..dde560a --- /dev/null +++ b/_sass/fonts/open-sans/_bold.scss @@ -0,0 +1,11 @@ +@font-face { + font-family: 'Open Sans'; + src: url('../fonts/open-sans/OpenSans-Bold-webfont.eot'); + src: url('../fonts/open-sans/OpenSans-Bold-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/open-sans/OpenSans-Bold-webfont.woff') format('woff'), + url('../fonts/open-sans/OpenSans-Bold-webfont.ttf') format('truetype'); + font-weight: bold; + font-style: normal; + +} + diff --git a/_sass/fonts/open-sans/_bolditalic.scss b/_sass/fonts/open-sans/_bolditalic.scss new file mode 100644 index 0000000..c8dcbbd --- /dev/null +++ b/_sass/fonts/open-sans/_bolditalic.scss @@ -0,0 +1,11 @@ +@font-face { + font-family: 'Open Sans'; + src: url('../fonts/open-sans/OpenSans-BoldItalic-webfont.eot'); + src: url('../fonts/open-sans/OpenSans-BoldItalic-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/open-sans/OpenSans-BoldItalic-webfont.woff') format('woff'), + url('../fonts/open-sans/OpenSans-BoldItalic-webfont.ttf') format('truetype'); + font-weight: bold; + font-style: italic; + +} + diff --git a/_sass/fonts/open-sans/_extrabold.scss b/_sass/fonts/open-sans/_extrabold.scss new file mode 100644 index 0000000..d032627 --- /dev/null +++ b/_sass/fonts/open-sans/_extrabold.scss @@ -0,0 +1,11 @@ +@font-face { + font-family: 'Open Sans'; + src: url('../fonts/open-sans/OpenSans-ExtraBold-webfont.eot'); + src: url('../fonts/open-sans/OpenSans-ExtraBold-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/open-sans/OpenSans-ExtraBold-webfont.woff') format('woff'), + url('../fonts/open-sans/OpenSans-ExtraBold-webfont.ttf') format('truetype'); + font-weight: 900; + font-style: normal; + +} + diff --git a/_sass/fonts/open-sans/_extrabolditalic.scss b/_sass/fonts/open-sans/_extrabolditalic.scss new file mode 100644 index 0000000..61e53f8 --- /dev/null +++ b/_sass/fonts/open-sans/_extrabolditalic.scss @@ -0,0 +1,11 @@ +@font-face { + font-family: 'Open Sans'; + src: url('../fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.eot'); + src: url('../fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.woff') format('woff'), + url('../fonts/open-sans/OpenSans-ExtraBoldItalic-webfont.ttf') format('truetype'); + font-weight: 900; + font-style: italic; + +} + diff --git a/_sass/fonts/open-sans/_italic.scss b/_sass/fonts/open-sans/_italic.scss new file mode 100644 index 0000000..f64bb27 --- /dev/null +++ b/_sass/fonts/open-sans/_italic.scss @@ -0,0 +1,11 @@ +@font-face { + font-family: 'Open Sans'; + src: url('../fonts/open-sans/OpenSans-Italic-webfont.eot'); + src: url('../fonts/open-sans/OpenSans-Italic-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/open-sans/OpenSans-Italic-webfont.woff') format('woff'), + url('../fonts/open-sans/OpenSans-Italic-webfont.ttf') format('truetype'); + font-weight: normal; + font-style: italic; + +} + diff --git a/_sass/fonts/open-sans/_light.scss b/_sass/fonts/open-sans/_light.scss new file mode 100644 index 0000000..a22d78a --- /dev/null +++ b/_sass/fonts/open-sans/_light.scss @@ -0,0 +1,11 @@ +@font-face { + font-family: 'Open Sans'; + src: url('../fonts/open-sans/OpenSans-Light-webfont.eot'); + src: url('../fonts/open-sans/OpenSans-Light-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/open-sans/OpenSans-Light-webfont.woff') format('woff'), + url('../fonts/open-sans/OpenSans-Light-webfont.ttf') format('truetype'); + font-weight: 200; + font-style: normal; + +} + diff --git a/_sass/fonts/open-sans/_lightitalic.scss b/_sass/fonts/open-sans/_lightitalic.scss new file mode 100644 index 0000000..bc6a556 --- /dev/null +++ b/_sass/fonts/open-sans/_lightitalic.scss @@ -0,0 +1,11 @@ +@font-face { + font-family: 'Open Sans'; + src: url('../fonts/open-sans/OpenSans-LightItalic-webfont.eot'); + src: url('../fonts/open-sans/OpenSans-LightItalic-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/open-sans/OpenSans-LightItalic-webfont.woff') format('woff'), + url('../fonts/open-sans/OpenSans-LightItalic-webfont.ttf') format('truetype'); + font-weight: 200; + font-style: italic; + +} + diff --git a/_sass/fonts/open-sans/_regular.scss b/_sass/fonts/open-sans/_regular.scss new file mode 100644 index 0000000..354fd86 --- /dev/null +++ b/_sass/fonts/open-sans/_regular.scss @@ -0,0 +1,11 @@ +@font-face { + font-family: 'Open Sans'; + src: url('../fonts/open-sans/OpenSans-Regular-webfont.eot'); + src: url('../fonts/open-sans/OpenSans-Regular-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/open-sans/OpenSans-Regular-webfont.woff') format('woff'), + url('../fonts/open-sans/OpenSans-Regular-webfont.ttf') format('truetype'); + font-weight: normal; + font-style: normal; + +} + diff --git a/_sass/fonts/open-sans/_semibold.scss b/_sass/fonts/open-sans/_semibold.scss new file mode 100644 index 0000000..fdb384c --- /dev/null +++ b/_sass/fonts/open-sans/_semibold.scss @@ -0,0 +1,11 @@ +@font-face { + font-family: 'Open Sans'; + src: url('../fonts/open-sans/OpenSans-Semibold-webfont.eot'); + src: url('../fonts/open-sans/OpenSans-Semibold-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/open-sans/OpenSans-Semibold-webfont.woff') format('woff'), + url('../fonts/open-sans/OpenSans-Semibold-webfont.ttf') format('truetype'); + font-weight: 600; + font-style: normal; + +} + diff --git a/_sass/fonts/open-sans/_semibolditalic.scss b/_sass/fonts/open-sans/_semibolditalic.scss new file mode 100644 index 0000000..2197d98 --- /dev/null +++ b/_sass/fonts/open-sans/_semibolditalic.scss @@ -0,0 +1,11 @@ +@font-face { + font-family: 'open_sanssemibold_italic'; + src: url('../fonts/open-sans/OpenSans-SemiboldItalic-webfont.eot'); + src: url('../fonts/open-sans/OpenSans-SemiboldItalic-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/open-sans/OpenSans-SemiboldItalic-webfont.woff') format('woff'), + url('../fonts/open-sans/OpenSans-SemiboldItalic-webfont.ttf') format('truetype'); + font-weight: 600; + font-style: italic; + +} + diff --git a/_sass/fonts/worksans/_black.scss b/_sass/fonts/worksans/_black.scss new file mode 100644 index 0000000..0c20b35 --- /dev/null +++ b/_sass/fonts/worksans/_black.scss @@ -0,0 +1,10 @@ +@font-face { + font-family: 'Work Sans'; + src: url('../fonts/worksans/worksans-black-webfont.eot'); + src: url('../fonts/worksans/worksans-black-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/worksans/worksans-black-webfont.woff2') format('woff2'), + url('../fonts/worksans/worksans-black-webfont.woff') format('woff'), + url('../fonts/worksans/worksans-black-webfont.ttf') format('truetype'); + font-weight: 900; + font-style: normal; +} diff --git a/_sass/fonts/worksans/_bold.scss b/_sass/fonts/worksans/_bold.scss new file mode 100644 index 0000000..d9b6a27 --- /dev/null +++ b/_sass/fonts/worksans/_bold.scss @@ -0,0 +1,11 @@ +@font-face { + font-family: 'Work Sans'; + src: url('../fonts/worksans/worksans-bold-webfont.eot'); + src: url('../fonts/worksans/worksans-bold-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/worksans/worksans-bold-webfont.woff2') format('woff2'), + url('../fonts/worksans/worksans-bold-webfont.woff') format('woff'), + url('../fonts/worksans/worksans-bold-webfont.ttf') format('truetype'); + font-weight: bold; + font-style: normal; +} + diff --git a/_sass/fonts/worksans/_extrabold.scss b/_sass/fonts/worksans/_extrabold.scss new file mode 100644 index 0000000..680c656 --- /dev/null +++ b/_sass/fonts/worksans/_extrabold.scss @@ -0,0 +1,10 @@ +@font-face { + font-family: 'Work Sans'; + src: url('../fonts/worksans/worksans-extrabold-webfont.eot'); + src: url('../fonts/worksans/worksans-extrabold-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/worksans/worksans-extrabold-webfont.woff2') format('woff2'), + url('../fonts/worksans/worksans-extrabold-webfont.woff') format('woff'), + url('../fonts/worksans/worksans-extrabold-webfont.ttf') format('truetype'); + font-weight: 800; + font-style: normal; +} diff --git a/_sass/fonts/worksans/_extralight.scss b/_sass/fonts/worksans/_extralight.scss new file mode 100644 index 0000000..12d709a --- /dev/null +++ b/_sass/fonts/worksans/_extralight.scss @@ -0,0 +1,10 @@ +@font-face { + font-family: 'Work Sans'; + src: url('../fonts/worksans/worksans-extralight-webfont.eot'); + src: url('../fonts/worksans/worksans-extralight-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/worksans/worksans-extralight-webfont.woff2') format('woff2'), + url('../fonts/worksans/worksans-extralight-webfont.woff') format('woff'), + url('../fonts/worksans/worksans-extralight-webfont.ttf') format('truetype'); + font-weight: 200; + font-style: normal; +} diff --git a/_sass/fonts/worksans/_hairline.scss b/_sass/fonts/worksans/_hairline.scss new file mode 100644 index 0000000..702ee92 --- /dev/null +++ b/_sass/fonts/worksans/_hairline.scss @@ -0,0 +1,10 @@ +@font-face { + font-family: 'Work Sans'; + src: url('../fonts/worksans/worksans-hairline-webfont.eot'); + src: url('../fonts/worksans/worksans-hairline-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/worksans/worksans-hairline-webfont.woff2') format('woff2'), + url('../fonts/worksans/worksans-hairline-webfont.woff') format('woff'), + url('../fonts/worksans/worksans-hairline-webfont.ttf') format('truetype'); + font-weight: 50; + font-style: normal; +} diff --git a/_sass/fonts/worksans/_light.scss b/_sass/fonts/worksans/_light.scss new file mode 100644 index 0000000..1f0695c --- /dev/null +++ b/_sass/fonts/worksans/_light.scss @@ -0,0 +1,10 @@ +@font-face { + font-family: 'Work Sans'; + src: url('../fonts/worksans/worksans-light-webfont.eot'); + src: url('../fonts/worksans/worksans-light-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/worksans/worksans-light-webfont.woff2') format('woff2'), + url('../fonts/worksans/worksans-light-webfont.woff') format('woff'), + url('../fonts/worksans/worksans-light-webfont.ttf') format('truetype'); + font-weight: 300; + font-style: normal; +} diff --git a/_sass/fonts/worksans/_medium.scss b/_sass/fonts/worksans/_medium.scss new file mode 100644 index 0000000..a13bc4b --- /dev/null +++ b/_sass/fonts/worksans/_medium.scss @@ -0,0 +1,10 @@ +@font-face { + font-family: 'Work Sans'; + src: url('../fonts/worksans/worksans-medium-webfont.eot'); + src: url('../fonts/worksans/worksans-medium-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/worksans/worksans-medium-webfont.woff2') format('woff2'), + url('../fonts/worksans/worksans-medium-webfont.woff') format('woff'), + url('../fonts/worksans/worksans-medium-webfont.ttf') format('truetype'); + font-weight: 500; + font-style: normal; +} diff --git a/_sass/fonts/worksans/_regular.scss b/_sass/fonts/worksans/_regular.scss new file mode 100644 index 0000000..956016f --- /dev/null +++ b/_sass/fonts/worksans/_regular.scss @@ -0,0 +1,10 @@ +@font-face { + font-family: 'Work Sans'; + src: url('../fonts/worksans/worksans-regular-webfont.eot'); + src: url('../fonts/worksans/worksans-regular-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/worksans/worksans-regular-webfont.woff2') format('woff2'), + url('../fonts/worksans/worksans-regular-webfont.woff') format('woff'), + url('../fonts/worksans/worksans-regular-webfont.ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} diff --git a/_sass/fonts/worksans/_semibold.scss b/_sass/fonts/worksans/_semibold.scss new file mode 100644 index 0000000..ab5e345 --- /dev/null +++ b/_sass/fonts/worksans/_semibold.scss @@ -0,0 +1,11 @@ +@font-face { + font-family: 'Work Sans'; + src: url('../fonts/worksans/worksans-semibold-webfont.eot'); + src: url('../fonts/worksans/worksans-semibold-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/worksans/worksans-semibold-webfont.woff2') format('woff2'), + url('../fonts/worksans/worksans-semibold-webfont.woff') format('woff'), + url('../fonts/worksans/worksans-semibold-webfont.ttf') format('truetype'); + font-weight: 600; + font-style: normal; +} + diff --git a/_sass/fonts/worksans/_thin.scss b/_sass/fonts/worksans/_thin.scss new file mode 100644 index 0000000..afb2a33 --- /dev/null +++ b/_sass/fonts/worksans/_thin.scss @@ -0,0 +1,10 @@ +@font-face { + font-family: 'Work Sans'; + src: url('../fonts/worksans/worksans-thin-webfont.eot'); + src: url('../fonts/worksans/worksans-thin-webfont.eot?#iefix') format('embedded-opentype'), + url('../fonts/worksans/worksans-thin-webfont.woff2') format('woff2'), + url('../fonts/worksans/worksans-thin-webfont.woff') format('woff'), + url('../fonts/worksans/worksans-thin-webfont.ttf') format('truetype'); + font-weight: 100; + font-style: normal; +} diff --git a/assets/css/style.scss b/assets/css/style.scss index 78a1f8a..59b80b0 100644 --- a/assets/css/style.scss +++ b/assets/css/style.scss @@ -8,6 +8,7 @@ @import "colors"; @import "typography"; @import "layout"; +@import "directives"; //stuff every page needs @import "header"; diff --git a/assets/fonts/generator_config.txt b/assets/fonts/gunshipital/generator_config.txt similarity index 100% rename from assets/fonts/generator_config.txt rename to assets/fonts/gunshipital/generator_config.txt diff --git a/assets/fonts/gunshipital-demo.html b/assets/fonts/gunshipital/gunshipital-demo.html similarity index 98% rename from assets/fonts/gunshipital-demo.html rename to assets/fonts/gunshipital/gunshipital-demo.html index 3b9c468..a1fed5a 100755 --- a/assets/fonts/gunshipital-demo.html +++ b/assets/fonts/gunshipital/gunshipital-demo.html @@ -16,8 +16,8 @@ Gunship Italic Italic Specimen - - + +