From 824893ed9d03287ab664867e370dd217b94d84b3 Mon Sep 17 00:00:00 2001 From: Jason Costello Date: Tue, 14 Feb 2017 11:28:43 -0800 Subject: [PATCH 1/3] add typekit classes to hide FOUC --- website/source/assets/stylesheets/_global.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/website/source/assets/stylesheets/_global.scss b/website/source/assets/stylesheets/_global.scss index b5082113e..ba7d813d9 100755 --- a/website/source/assets/stylesheets/_global.scss +++ b/website/source/assets/stylesheets/_global.scss @@ -74,6 +74,14 @@ pre { margin-bottom: 0; } +// Typekit utilites to hide FOUC +.wf-loading { + visibility: hidden; +} +.wf-active, .wf-inactive { + visibility: visible; +} + //fixed grid below 992 to prevent smaller responsive sizes @media (max-width: 992px) { From fdc82fc5aa3e334a0c2c5a6f20377a656ff00dda Mon Sep 17 00:00:00 2001 From: Jason Costello Date: Tue, 14 Feb 2017 11:37:11 -0800 Subject: [PATCH 2/3] improve klavika declaration --- website/source/assets/stylesheets/_docs.scss | 2 +- website/source/assets/stylesheets/_global.scss | 2 +- website/source/assets/stylesheets/_header.scss | 2 +- website/source/assets/stylesheets/_variables.scss | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/website/source/assets/stylesheets/_docs.scss b/website/source/assets/stylesheets/_docs.scss index 132c4ba20..e5af033ff 100755 --- a/website/source/assets/stylesheets/_docs.scss +++ b/website/source/assets/stylesheets/_docs.scss @@ -99,7 +99,7 @@ body.layout-intro{ .docs-sidenav{ padding-top: 15px; padding-bottom: 15px; - font-family: "Klavika-web"; + font-family: $font-family-klavika; font-size: 16px; :last-child{ diff --git a/website/source/assets/stylesheets/_global.scss b/website/source/assets/stylesheets/_global.scss index ba7d813d9..d292c49d5 100755 --- a/website/source/assets/stylesheets/_global.scss +++ b/website/source/assets/stylesheets/_global.scss @@ -17,7 +17,7 @@ body { h1, h2, h3, h4, h5 { -webkit-font-smoothing: antialiased; - font-family: "klavika-web"; + font-family: $font-family-klavika; font-weight: 600; } h1{ diff --git a/website/source/assets/stylesheets/_header.scss b/website/source/assets/stylesheets/_header.scss index 1a3a8711e..4acd72169 100755 --- a/website/source/assets/stylesheets/_header.scss +++ b/website/source/assets/stylesheets/_header.scss @@ -14,7 +14,7 @@ body.page-sub{ .navbar-brand { .logo{ font-size: 32px; - font-family: "Klavika-web"; + font-family: $font-family-klavika; font-weight: 500; background: image-url('logo-header.png') 0 0 no-repeat; @include img-retina("../images/logo-header.png", "../images/logo-header@2x.png", $project-logo-width, $project-logo-height); diff --git a/website/source/assets/stylesheets/_variables.scss b/website/source/assets/stylesheets/_variables.scss index 0047afc03..772ce2847 100755 --- a/website/source/assets/stylesheets/_variables.scss +++ b/website/source/assets/stylesheets/_variables.scss @@ -45,6 +45,7 @@ $link-hover-color: darken($link-color, 15%); // Typography // ------------------------- $font-family-open-sans: 'Open Sans', "Helvetica Neue", Helvetica, Arial, sans-serif; +$font-family-klavika: 'klavika-web', 'klavika', 'Open Sans', Helvtical, Arial, sans-serif; $text-shadow: 1px 1px 1px #000; $shadow: $text-shadow; From c6baf92dede59cbd220d16edd33a097bce8112fb Mon Sep 17 00:00:00 2001 From: Jason Costello Date: Tue, 14 Feb 2017 11:59:01 -0800 Subject: [PATCH 3/3] typo --- website/source/assets/stylesheets/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/source/assets/stylesheets/_variables.scss b/website/source/assets/stylesheets/_variables.scss index 772ce2847..768ff74ab 100755 --- a/website/source/assets/stylesheets/_variables.scss +++ b/website/source/assets/stylesheets/_variables.scss @@ -45,7 +45,7 @@ $link-hover-color: darken($link-color, 15%); // Typography // ------------------------- $font-family-open-sans: 'Open Sans', "Helvetica Neue", Helvetica, Arial, sans-serif; -$font-family-klavika: 'klavika-web', 'klavika', 'Open Sans', Helvtical, Arial, sans-serif; +$font-family-klavika: 'klavika-web', 'klavika', 'Open Sans', Helvetica, Arial, sans-serif; $text-shadow: 1px 1px 1px #000; $shadow: $text-shadow;