Skip to content

Swaps WebFontLoader for FontFaceObserver #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kennethormandy wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Swaps WebFontLoader for FontFaceObserver #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b831fd
Adds a small amount of caption letter-spacing for @rileycran
kennethormandy Aug 20, 2015
cc333cc
Adds Font Face Observer
kennethormandy Aug 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions _includes/header.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!doctype html>
<!DOCTYPE html>
<html class="no-js" lang="en">
<head>
<meta charset="utf-8">
Expand All @@ -7,12 +7,17 @@
<meta name="description" content="{{ site.description }}">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="apple-touch-icon" href="apple-touch-icon.png">
<script src="https://use.typekit.net/lma3xaj.js"></script>
<script>
try{Typekit.load({ async: true });}catch(e){}
/*! loadCSS & loadJS © 2014 @scottjehl, Filament Group, Inc. Licensed MIT */
{{{inline "node_modules/fg-loadjs/loadJS.js" }}}
{{{inline "node_modules/fontfaceobserver/fontfaceobserver.js" }}}
{{{inline "node_modules/fg-loadcss/loadCSS.js" }}}
{{{inline "src/js/init.js" }}}
</script>
{{!--
<script src="/js/init.js"></script>
--}}
<link rel="stylesheet" href="/css/index.css">
{{> opengraph }}
</head>
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"keywords": [],
"dependencies": {
"dropcap.js": "1.0.0",
"fontfaceobserver": "1.5.1",
"smoothscroll": "0.1.0",
"vague-time": "1.2.0",
"zoom.js": "fat/zoom.js"
Expand Down
1 change: 1 addition & 0 deletions src/css/module/_figure.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ figcaption {
width: 100%;
flex: 1 1 100%;
font-family: $font-family-caption;
letter-spacing: 0.01em;
// font-style: italic;
align-self: flex-end;
line-height: $base-line-height;
Expand Down
10 changes: 5 additions & 5 deletions src/js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ if (mustard || 'querySelector' in window.document) {
// TODO Re-run after resize complete

// Social icons
WebFont.load({
custom: {
families: ['SSSocialRegular']
}
})
// WebFont.load({
// custom: {
// families: ['SSSocialRegular']
// }
// })
loadCSS('http://fonts.kennethormandy.com/css/symbolset.css')
}
23 changes: 13 additions & 10 deletions src/js/init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
// Cut the mustard, choose your own method here—querySelector is an easy one.
if ('querySelector' in window.document) {
var mustard = true
var WebFontConfig = {
timeout: 1500,
typekit: {
id: 'lma3xaj' // @losttype cpc2pit
},
custom: {
families: ['Moriston:n8,n4']
}
}
loadJS('https://cdnjs.cloudflare.com/ajax/libs/webfont/1.6.6/webfontloader.js')

loadCSS('http://fonts.kennethormandy.com/css/moriston.css')

var observeMoriston = new FontFaceObserver('Moriston')
.check()
.then(function() {
console.log('Loaded Moriston!')
})

var observeMeta = new FontFaceObserver('ff-meta-serif-web-pro')
.check()
.then(function() {
console.log('Loaded Meta Serif!')
})
}