diff --git a/website/source/assets/images/logo-header.png b/website/source/assets/images/logo-header.png deleted file mode 100644 index b48d09673..000000000 --- a/website/source/assets/images/logo-header.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f60e3f47bea13f13c334cf27a9bd547bcc0f42be36fa3a0bac6bc97d78969065 -size 1435 diff --git a/website/source/assets/images/logo-header.svg b/website/source/assets/images/logo-header.svg new file mode 100644 index 000000000..0f9b3a5bd --- /dev/null +++ b/website/source/assets/images/logo-header.svg @@ -0,0 +1,22 @@ + + diff --git a/website/source/assets/images/logo-header@2x.png b/website/source/assets/images/logo-header@2x.png deleted file mode 100644 index c62c001e0..000000000 --- a/website/source/assets/images/logo-header@2x.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5c20ffcf8e1691d2b71615e980bba0694e9f1bd09c711f5e12b4a8b6dd42e416 -size 2591 diff --git a/website/source/assets/stylesheets/_buttons.scss b/website/source/assets/stylesheets/_buttons.scss index dcfe366ac..e3bc7fe1e 100755 --- a/website/source/assets/stylesheets/_buttons.scss +++ b/website/source/assets/stylesheets/_buttons.scss @@ -8,7 +8,6 @@ color: $black; @include transition(color .3s ease-in-out); //@include btn-shadow(); - font-family: $font-family-blanc-reg; text-transform: uppercase; border-radius: 3px; diff --git a/website/source/assets/stylesheets/_docs.scss b/website/source/assets/stylesheets/_docs.scss index 327266af1..a1b873341 100755 --- a/website/source/assets/stylesheets/_docs.scss +++ b/website/source/assets/stylesheets/_docs.scss @@ -4,6 +4,13 @@ $docs-font-size: 15px; +body.layout-inner{ + // h2, h3, h4, h5 { + // font-family: $font-family-open-sans; + // text-transform: none; + // } +} + body.layout-docs, body.layout-inner, body.layout-downloads, @@ -240,12 +247,13 @@ body.layout-intro{ margin-bottom: 25px; } - h1, .h1, h2, .h2, h3, .h3, h4, .h4{ + h1, h2, .h2, h3, .h3, h4, .h4{ color: $gray-dark; margin-top: 54px; margin-bottom: $docs-font-size; line-height: 1.3; @include open-sb(); + text-transform: none; } h2 { diff --git a/website/source/assets/stylesheets/_global.scss b/website/source/assets/stylesheets/_global.scss index a7ff8e342..53d817f9a 100755 --- a/website/source/assets/stylesheets/_global.scss +++ b/website/source/assets/stylesheets/_global.scss @@ -16,22 +16,17 @@ body { font-weight: 500; } - h1, h2, h3, h4, h5 { + font-family: $font-family-klavika; + text-transform: uppercase; -webkit-font-smoothing: antialiased; } h1{ - font-family: $font-family-open-sans; font-weight: $font-weight-reg; margin-bottom: 24px; } -h3, h4{ - font-family: $font-family-open-sans; - font-weight: $font-weight-reg; -} - //an alternative color for buttons in the doc body .btn-serf{ color: $white !important; @@ -82,6 +77,15 @@ pre { margin-bottom: 0; } +//Typekit utilites for hiding FOUC +.wf-loading { + visibility: hidden; +} + +.wf-active, .wf-inactive { + visibility: visible; +} + //fixed grid below 992 to prevent smaller responsive sizes @media (min-width: 768px) and (max-width: 992px) { .container{ @@ -89,7 +93,7 @@ pre { } } -//guarantees nav list fits at tablet viewport size +//guarantees nav list fits at tablet viewport size @media (min-width: 768px) and (max-width: 800px) { #header .navbar-nav a { font-size: 12px !important; diff --git a/website/source/assets/stylesheets/_header.scss b/website/source/assets/stylesheets/_header.scss index 10c444b0d..968bf88ad 100755 --- a/website/source/assets/stylesheets/_header.scss +++ b/website/source/assets/stylesheets/_header.scss @@ -7,15 +7,15 @@ #header { .navbar-brand { .logo{ - color: $gray-darker; - font-family: $font-family-blanc; - font-size: 28px; - background: image-url('logo-header.png') 0 0 no-repeat; - @include img-retina("logo-header.png", "logo-header@2x.png", $project-logo-width, $project-logo-height); - background-position: 0 center; + display: inline-block; + height: 59px; + width: 153px; + margin-top: 15px; + background: image-url('logo-header.svg') 0 0 no-repeat; + font-size: 0; &:hover{ - color: $green-dark; + opacity: .7; } } @@ -55,25 +55,3 @@ } } } - -@media (max-width: 414px) { - #header { - .navbar-brand { - .logo{ - padding-left: 42px; - font-size: 18px; - @include img-retina("logo-header.png", "logo-header@2x.png", $project-logo-width * .75, $project-logo-height * .75); - } - } - } -} - -@media (max-width: 320px) { - #header { - .navbar-brand { - .logo{ - // font-size: 0 !important; //hide terraform text - } - } - } -} diff --git a/website/source/assets/stylesheets/_home.scss b/website/source/assets/stylesheets/_home.scss index 726361082..a25782809 100755 --- a/website/source/assets/stylesheets/_home.scss +++ b/website/source/assets/stylesheets/_home.scss @@ -23,6 +23,11 @@ z-index: 1; } + p { + color: $gray; + text-align: center; + } + #hero-graphic{ position: absolute; display: inline-block; @@ -97,12 +102,13 @@ margin-top: 0; color: $blue-dark; font-size: $font-size-xl; - font-family: $font-family-blanc; } h4{ + font-family: $font-family-open-sans; + font-weight: 500; + text-transform: none; color: $blue-light; - font-family: $font-family-blanc; } #hero-btns{ @@ -182,7 +188,6 @@ margin-right: 30px; font-size: $font-size-reg; line-height: $font-size-reg; - font-family: $font-family-blanc-reg; } p, a{ @@ -198,7 +203,6 @@ margin-bottom: 120px; text-align: center; font-size: $font-size-m; - font-family: $font-family-blanc; color: $green; text-transform: uppercase; } @@ -320,7 +324,6 @@ color: $blue-dark; letter-spacing: 1px; font-size: $font-size-l; - font-family: $font-family-blanc; line-height: 1.25em; max-width: 640px; } @@ -329,7 +332,6 @@ margin-bottom: 30px; color: $blue-light; font-size: $font-size-reg+2; - font-family: $font-family-blanc-reg; line-height: 1.75em; max-width: 480px; } @@ -342,7 +344,6 @@ display: inline-block; color: $blue-dark; font-size: $font-size-reg; - font-family: $font-family-blanc; line-height: 1.75em; max-width: 320px; padding-left: 20px; diff --git a/website/source/assets/stylesheets/_utilities.scss b/website/source/assets/stylesheets/_utilities.scss index 5ef814442..99e14f050 100755 --- a/website/source/assets/stylesheets/_utilities.scss +++ b/website/source/assets/stylesheets/_utilities.scss @@ -40,7 +40,6 @@ @mixin v-nav-style-core{ color: $gray-darker; - font-family: $font-family-blanc-reg; font-size: 13px; text-transform: uppercase; letter-spacing: 0.0625em; diff --git a/website/source/assets/stylesheets/_variables.scss b/website/source/assets/stylesheets/_variables.scss index c93e9421c..3b343552d 100755 --- a/website/source/assets/stylesheets/_variables.scss +++ b/website/source/assets/stylesheets/_variables.scss @@ -51,8 +51,7 @@ $link-hover-color: darken($link-color, 15%); // Typography // ------------------------- $font-family-open-sans: 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; -$font-family-blanc: 'Blanc-Light', 'Lato', 'Helvetica Neue', Helvetica, Arial, sans-serif; -$font-family-blanc-reg: 'Blanc-Regular', 'Lato', 'Helvetica Neue', Helvetica, Arial, sans-serif; +$font-family-klavika: 'klavika-web', 'Open Sans', 'Helvetica Neue', Helvetica, Arial, sans-serif; $font-weight-xl: 300; $font-weight-reg: 400; $font-weight-sb: 600; diff --git a/website/source/assets/stylesheets/_webfonts.scss b/website/source/assets/stylesheets/_webfonts.scss deleted file mode 100644 index c2d75b370..000000000 --- a/website/source/assets/stylesheets/_webfonts.scss +++ /dev/null @@ -1,29 +0,0 @@ -/** - * @license - * MyFonts Webfont Build ID 3078913, 2015-08-21T01:21:30-0400 - * - * The fonts listed in this notice are subject to the End User License - * Agreement(s) entered into by the website owner. All other parties are - * explicitly restricted from using the Licensed Webfonts(s). - * - * You may obtain a valid license at the URLs below. - * - * Webfont: Blanc-Light by Latinotype - * URL: http://www.myfonts.com/fonts/latinotype/blanc/light/ - * Copyright: Jorge Cisterna - * Licensed pageviews: 10,000 - * - * - * License: http://www.myfonts.com/viewlicense?type=web&buildid=3078913 - * - * © 2015 MyFonts Inc -*/ - - -/* @import must be at top of file, otherwise CSS will not work */ -//@import url("//hello.myfonts.net/count/2efc68"); -@import url("//hello.myfonts.net/count/2efb01"); - - -@font-face {font-family: 'Blanc-Light';src: url('../webfonts/2EFB01_0_0.eot');src: url('../webfonts/2EFB01_0_0.eot?#iefix') format('embedded-opentype'),url('../webfonts/2EFB01_0_0.woff2') format('woff2'),url('../webfonts/2EFB01_0_0.woff') format('woff'),url('../webfonts/2EFB01_0_0.ttf') format('truetype');} -@font-face {font-family: 'Blanc-Regular';src: url('../webfonts/2EFC68_0_0.eot');src: url('../webfonts/2EFC68_0_0.eot?#iefix') format('embedded-opentype'),url('../webfonts/2EFC68_0_0.woff2') format('woff2'),url('../webfonts/2EFC68_0_0.woff') format('woff'),url('../webfonts/2EFC68_0_0.ttf') format('truetype');} diff --git a/website/source/assets/stylesheets/application.scss b/website/source/assets/stylesheets/application.scss index 97caf8958..d65870d4c 100755 --- a/website/source/assets/stylesheets/application.scss +++ b/website/source/assets/stylesheets/application.scss @@ -10,9 +10,6 @@ // Utility classes @import '_utilities'; -// Core CSS -@import '_webfonts'; - //Global Site @import '_global'; diff --git a/website/source/assets/stylesheets/hashicorp-shared/_hashicorp-header.scss b/website/source/assets/stylesheets/hashicorp-shared/_hashicorp-header.scss index 8ab6d99db..9695971f2 100755 --- a/website/source/assets/stylesheets/hashicorp-shared/_hashicorp-header.scss +++ b/website/source/assets/stylesheets/hashicorp-shared/_hashicorp-header.scss @@ -204,14 +204,9 @@ .navbar-brand { height: $header-mobile-height; - .logo{ - height: $header-mobile-height; - line-height: $header-mobile-height; - } .by{ height: $header-mobile-height; line-height: $header-mobile-height; - padding-top: 0; } } .main-links, diff --git a/website/source/assets/stylesheets/hashicorp-shared/_hashicorp-utility.scss b/website/source/assets/stylesheets/hashicorp-shared/_hashicorp-utility.scss index f6f9ab05d..d037d3ca8 100755 --- a/website/source/assets/stylesheets/hashicorp-shared/_hashicorp-utility.scss +++ b/website/source/assets/stylesheets/hashicorp-shared/_hashicorp-utility.scss @@ -12,7 +12,7 @@ $header-font-family: $font-family-open-sans; $header-font-weight: 600; // semi-bold $header-height: 74px; -$header-mobile-height: 60px; +$header-mobile-height: 90px; $by-hashicorp-width: 74px; $by-hashicorp-height: 16px; $nav-margin-right: 12px; diff --git a/website/source/layouts/_meta.erb b/website/source/layouts/_meta.erb index bcb3fc783..c27b1f82c 100644 --- a/website/source/layouts/_meta.erb +++ b/website/source/layouts/_meta.erb @@ -23,6 +23,10 @@ })(window,document,'script','dataLayer','GTM-NR2SD7C'); + + + + <%= yield_content :head %>