diff --git a/fonts/century-supra/Century Supra T3 Bold Italic.ttf b/fonts/century-supra/Century Supra T3 Bold Italic.ttf new file mode 100644 index 0000000..8771bc9 Binary files /dev/null and b/fonts/century-supra/Century Supra T3 Bold Italic.ttf differ diff --git a/fonts/century-supra/Century Supra T3 Bold.ttf b/fonts/century-supra/Century Supra T3 Bold.ttf new file mode 100644 index 0000000..74d0457 Binary files /dev/null and b/fonts/century-supra/Century Supra T3 Bold.ttf differ diff --git a/fonts/century-supra/Century Supra T3 Italic.ttf b/fonts/century-supra/Century Supra T3 Italic.ttf new file mode 100644 index 0000000..771e982 Binary files /dev/null and b/fonts/century-supra/Century Supra T3 Italic.ttf differ diff --git a/fonts/century-supra/Century Supra T3 Regular.ttf b/fonts/century-supra/Century Supra T3 Regular.ttf new file mode 100644 index 0000000..002c52a Binary files /dev/null and b/fonts/century-supra/Century Supra T3 Regular.ttf differ diff --git a/fonts/century-supra/century_supra_t3_bold.woff b/fonts/century-supra/century_supra_t3_bold.woff new file mode 100644 index 0000000..5a91692 Binary files /dev/null and b/fonts/century-supra/century_supra_t3_bold.woff differ diff --git a/fonts/century-supra/century_supra_t3_bold_italic.woff b/fonts/century-supra/century_supra_t3_bold_italic.woff new file mode 100644 index 0000000..ecd91b2 Binary files /dev/null and b/fonts/century-supra/century_supra_t3_bold_italic.woff differ diff --git a/fonts/century-supra/century_supra_t3_italic.woff b/fonts/century-supra/century_supra_t3_italic.woff new file mode 100644 index 0000000..1356314 Binary files /dev/null and b/fonts/century-supra/century_supra_t3_italic.woff differ diff --git a/fonts/century-supra/century_supra_t3_regular.woff b/fonts/century-supra/century_supra_t3_regular.woff new file mode 100644 index 0000000..f485ab2 Binary files /dev/null and b/fonts/century-supra/century_supra_t3_regular.woff differ diff --git a/fonts/century-supra/stylesheet.css b/fonts/century-supra/stylesheet.css new file mode 100644 index 0000000..f8df541 --- /dev/null +++ b/fonts/century-supra/stylesheet.css @@ -0,0 +1,31 @@ +@font-face { + font-family: 'Century Supra'; + src: url('Century Supra T3 Regular.ttf') format('truetype'), + url('century_supra_t3_regular.woff') format('woff'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'Century Supra'; + src: url('Century Supra T3 Bold.ttf') format('truetype'), + url('century_supra_t3_bold.woff') format('woff'); + font-weight: bold; + font-style: normal; +} + +@font-face { + font-family: 'Century Supra'; + src: url('Century Supra T3 Italic.ttf') format('truetype'), + url('century_supra_t3_italic.woff') format('woff'); + font-weight: normal; + font-style: italic; +} + +@font-face { + font-family: 'Century Supra'; + src: url('Century Supra T3 Bold Italic.ttf') format('truetype'), + url('century_supra_t3_bold_italic.woff') format('woff'); + font-weight: bold; + font-style: italic; +} diff --git a/fonts/charter/charter_bold-webfont.eot b/fonts/charter/charter_bold-webfont.eot deleted file mode 100644 index 800aa39..0000000 Binary files a/fonts/charter/charter_bold-webfont.eot and /dev/null differ diff --git a/fonts/charter/charter_bold-webfont.ttf b/fonts/charter/charter_bold-webfont.ttf deleted file mode 100644 index cea448b..0000000 Binary files a/fonts/charter/charter_bold-webfont.ttf and /dev/null differ diff --git a/fonts/charter/charter_bold-webfont.woff b/fonts/charter/charter_bold-webfont.woff deleted file mode 100644 index 6d7fd7a..0000000 Binary files a/fonts/charter/charter_bold-webfont.woff and /dev/null differ diff --git a/fonts/charter/charter_bold_italic-webfont.eot b/fonts/charter/charter_bold_italic-webfont.eot deleted file mode 100644 index 62268df..0000000 Binary files a/fonts/charter/charter_bold_italic-webfont.eot and /dev/null differ diff --git a/fonts/charter/charter_bold_italic-webfont.ttf b/fonts/charter/charter_bold_italic-webfont.ttf deleted file mode 100644 index c83766c..0000000 Binary files a/fonts/charter/charter_bold_italic-webfont.ttf and /dev/null differ diff --git a/fonts/charter/charter_bold_italic-webfont.woff b/fonts/charter/charter_bold_italic-webfont.woff deleted file mode 100644 index 1ef433f..0000000 Binary files a/fonts/charter/charter_bold_italic-webfont.woff and /dev/null differ diff --git a/fonts/charter/charter_italic-webfont.eot b/fonts/charter/charter_italic-webfont.eot deleted file mode 100644 index 2124b1c..0000000 Binary files a/fonts/charter/charter_italic-webfont.eot and /dev/null differ diff --git a/fonts/charter/charter_italic-webfont.ttf b/fonts/charter/charter_italic-webfont.ttf deleted file mode 100644 index 9276421..0000000 Binary files a/fonts/charter/charter_italic-webfont.ttf and /dev/null differ diff --git a/fonts/charter/charter_italic-webfont.woff b/fonts/charter/charter_italic-webfont.woff deleted file mode 100644 index 08c8249..0000000 Binary files a/fonts/charter/charter_italic-webfont.woff and /dev/null differ diff --git a/fonts/charter/charter_regular-webfont.eot b/fonts/charter/charter_regular-webfont.eot deleted file mode 100644 index 01872e3..0000000 Binary files a/fonts/charter/charter_regular-webfont.eot and /dev/null differ diff --git a/fonts/charter/charter_regular-webfont.ttf b/fonts/charter/charter_regular-webfont.ttf deleted file mode 100644 index 44e097a..0000000 Binary files a/fonts/charter/charter_regular-webfont.ttf and /dev/null differ diff --git a/fonts/charter/charter_regular-webfont.woff b/fonts/charter/charter_regular-webfont.woff deleted file mode 100644 index a19483d..0000000 Binary files a/fonts/charter/charter_regular-webfont.woff and /dev/null differ diff --git a/fonts/charter/stylesheet.css b/fonts/charter/stylesheet.css deleted file mode 100644 index 3b63e0f..0000000 --- a/fonts/charter/stylesheet.css +++ /dev/null @@ -1,52 +0,0 @@ -/* Generated by Font Squirrel (http://www.fontsquirrel.com) on July 10, 2013 */ - - - -@font-face { - font-family: 'charterbold_italic'; - src: url('charter_bold_italic-webfont.eot'); - src: url('charter_bold_italic-webfont.eot?#iefix') format('embedded-opentype'), - url('charter_bold_italic-webfont.woff') format('woff'); - font-weight: normal; - font-style: normal; - -} - - - - -@font-face { - font-family: 'charterbold'; - src: url('charter_bold-webfont.eot'); - src: url('charter_bold-webfont.eot?#iefix') format('embedded-opentype'), - url('charter_bold-webfont.woff') format('woff'); - font-weight: normal; - font-style: normal; - -} - - - - -@font-face { - font-family: 'charteritalic'; - src: url('charter_italic-webfont.eot'); - src: url('charter_italic-webfont.eot?#iefix') format('embedded-opentype'), - url('charter_italic-webfont.woff') format('woff'); - font-weight: normal; - font-style: normal; - -} - - - - -@font-face { - font-family: 'charterregular'; - src: url('charter_regular-webfont.eot'); - src: url('charter_regular-webfont.eot?#iefix') format('embedded-opentype'), - url('charter_regular-webfont.woff') format('woff'); - font-weight: normal; - font-style: normal; - -} \ No newline at end of file diff --git a/fonts/triplicate/Triplicate T4 Code Bold Italic.ttf b/fonts/triplicate/Triplicate T4 Code Bold Italic.ttf new file mode 100644 index 0000000..afcc16b Binary files /dev/null and b/fonts/triplicate/Triplicate T4 Code Bold Italic.ttf differ diff --git a/fonts/triplicate/Triplicate T4 Code Bold.ttf b/fonts/triplicate/Triplicate T4 Code Bold.ttf new file mode 100644 index 0000000..912e27b Binary files /dev/null and b/fonts/triplicate/Triplicate T4 Code Bold.ttf differ diff --git a/fonts/triplicate/Triplicate T4 Code Italic.ttf b/fonts/triplicate/Triplicate T4 Code Italic.ttf new file mode 100644 index 0000000..b0b8852 Binary files /dev/null and b/fonts/triplicate/Triplicate T4 Code Italic.ttf differ diff --git a/fonts/triplicate/Triplicate T4 Code Regular.ttf b/fonts/triplicate/Triplicate T4 Code Regular.ttf new file mode 100644 index 0000000..37d0e4e Binary files /dev/null and b/fonts/triplicate/Triplicate T4 Code Regular.ttf differ diff --git a/fonts/triplicate/stylesheet.css b/fonts/triplicate/stylesheet.css new file mode 100644 index 0000000..92d4589 --- /dev/null +++ b/fonts/triplicate/stylesheet.css @@ -0,0 +1,31 @@ +@font-face { + font-family: 'Triplicate Code'; + src: url('Triplicate Code T4 Regular.ttf') format('truetype'), + url('triplicate_t4_code_regular.woff') format('woff'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'Triplicate Code'; + src: url('Triplicate Code T4 Bold.ttf') format('truetype'), + url('triplicate_t4_code_bold.woff') format('woff'); + font-weight: bold; + font-style: normal; +} + +@font-face { + font-family: 'Triplicate Code'; + src: url('Triplicate Code T4 Italic.ttf') format('truetype'), + url('triplicate_t4_code_italic.woff') format('woff'); + font-weight: normal; + font-style: italic; +} + +@font-face { + font-family: 'Triplicate Code'; + src: url('Triplicate Code T4 Bold Italic.ttf') format('truetype'), + url('triplicate_t4_code_bold_italic.woff') format('woff'); + font-weight: bold; + font-style: italic; +} diff --git a/fonts/triplicate/triplicate_t4_code_bold.woff b/fonts/triplicate/triplicate_t4_code_bold.woff new file mode 100644 index 0000000..8b86ffb Binary files /dev/null and b/fonts/triplicate/triplicate_t4_code_bold.woff differ diff --git a/fonts/triplicate/triplicate_t4_code_bold_italic.woff b/fonts/triplicate/triplicate_t4_code_bold_italic.woff new file mode 100644 index 0000000..622f346 Binary files /dev/null and b/fonts/triplicate/triplicate_t4_code_bold_italic.woff differ diff --git a/fonts/triplicate/triplicate_t4_code_italic.woff b/fonts/triplicate/triplicate_t4_code_italic.woff new file mode 100644 index 0000000..4fbdc2e Binary files /dev/null and b/fonts/triplicate/triplicate_t4_code_italic.woff differ diff --git a/fonts/triplicate/triplicate_t4_code_regular.woff b/fonts/triplicate/triplicate_t4_code_regular.woff new file mode 100644 index 0000000..7133e92 Binary files /dev/null and b/fonts/triplicate/triplicate_t4_code_regular.woff differ diff --git a/functions.php b/functions.php index 92db36c..6daeae1 100644 --- a/functions.php +++ b/functions.php @@ -120,14 +120,21 @@ add_action( 'widgets_init', 'jeremy_wordpress_theme_widgets_init' ); * Enqueue scripts and styles. */ function jeremy_wordpress_theme_scripts() { - wp_enqueue_style( 'charter-font', get_template_directory_uri() . '/fonts/charter/stylesheet.css' ); + wp_enqueue_style( 'century-supra-font', get_template_directory_uri() . '/fonts/century-supra/stylesheet.css' ); wp_enqueue_style( 'fira-sans-font', get_template_directory_uri() . '/fonts/fira-sans/fira-sans.css' ); + wp_enqueue_style( 'triplicate-font', get_template_directory_uri() . '/fonts/triplicate/stylesheet.css' ); wp_enqueue_style( 'highlight-style', get_template_directory_uri() . '/css/highlight-default.css' ); wp_enqueue_style( 'jeremy-wordpress-theme-style', get_stylesheet_uri() ); wp_enqueue_script( 'jeremy-wordpress-theme-navigation', get_template_directory_uri() . '/js/navigation.js', array(), '20151215', true ); - wp_enqueue_script( 'jeremy-wordpress-theme-skip-link-focus-fix', get_template_directory_uri() . '/js/skip-link-focus-fix.js', array(), '20151215', true ); + wp_enqueue_script( + 'jeremy-wordpress-theme-skip-link-focus-fix', + get_template_directory_uri() . '/js/skip-link-focus-fix.js', + array(), + '20151215', + true + ); wp_enqueue_script( 'highlight-js', get_template_directory_uri() . '/js/highlight.pack.js', array(), false, true ); diff --git a/style.css b/style.css index 9987c9c..c4bf285 100644 --- a/style.css +++ b/style.css @@ -429,6 +429,7 @@ address { pre { background: #eee; font-family: + 'Triplicate Code', SFMono-Regular, Menlo, Monaco, @@ -450,6 +451,7 @@ pre code { code, kbd, tt, var { font-family: + 'Triplicate Code', SFMono-Regular, Menlo, Monaco, @@ -462,6 +464,7 @@ code, kbd, tt, var { samp { font-family: + 'Triplicate Code', SFMono-Regular, Menlo, Monaco, @@ -490,7 +493,7 @@ Fonts */ body { font-family: - charterregular, + 'Century Supra', "Palatino Linotype", Palatino, Palladio,