diff --git a/fonts/charter/charter_bold-webfont.eot b/fonts/charter/charter_bold-webfont.eot new file mode 100644 index 0000000..800aa39 Binary files /dev/null and b/fonts/charter/charter_bold-webfont.eot differ diff --git a/fonts/charter/charter_bold-webfont.ttf b/fonts/charter/charter_bold-webfont.ttf new file mode 100644 index 0000000..cea448b Binary files /dev/null and b/fonts/charter/charter_bold-webfont.ttf differ diff --git a/fonts/charter/charter_bold-webfont.woff b/fonts/charter/charter_bold-webfont.woff new file mode 100644 index 0000000..6d7fd7a Binary files /dev/null and b/fonts/charter/charter_bold-webfont.woff differ diff --git a/fonts/charter/charter_bold_italic-webfont.eot b/fonts/charter/charter_bold_italic-webfont.eot new file mode 100644 index 0000000..62268df Binary files /dev/null and b/fonts/charter/charter_bold_italic-webfont.eot differ diff --git a/fonts/charter/charter_bold_italic-webfont.ttf b/fonts/charter/charter_bold_italic-webfont.ttf new file mode 100644 index 0000000..c83766c Binary files /dev/null and b/fonts/charter/charter_bold_italic-webfont.ttf differ diff --git a/fonts/charter/charter_bold_italic-webfont.woff b/fonts/charter/charter_bold_italic-webfont.woff new file mode 100644 index 0000000..1ef433f Binary files /dev/null and b/fonts/charter/charter_bold_italic-webfont.woff differ diff --git a/fonts/charter/charter_italic-webfont.eot b/fonts/charter/charter_italic-webfont.eot new file mode 100644 index 0000000..2124b1c Binary files /dev/null and b/fonts/charter/charter_italic-webfont.eot differ diff --git a/fonts/charter/charter_italic-webfont.ttf b/fonts/charter/charter_italic-webfont.ttf new file mode 100644 index 0000000..9276421 Binary files /dev/null and b/fonts/charter/charter_italic-webfont.ttf differ diff --git a/fonts/charter/charter_italic-webfont.woff b/fonts/charter/charter_italic-webfont.woff new file mode 100644 index 0000000..08c8249 Binary files /dev/null and b/fonts/charter/charter_italic-webfont.woff differ diff --git a/fonts/charter/charter_regular-webfont.eot b/fonts/charter/charter_regular-webfont.eot new file mode 100644 index 0000000..01872e3 Binary files /dev/null and b/fonts/charter/charter_regular-webfont.eot differ diff --git a/fonts/charter/charter_regular-webfont.ttf b/fonts/charter/charter_regular-webfont.ttf new file mode 100644 index 0000000..44e097a Binary files /dev/null and b/fonts/charter/charter_regular-webfont.ttf differ diff --git a/fonts/charter/charter_regular-webfont.woff b/fonts/charter/charter_regular-webfont.woff new file mode 100644 index 0000000..a19483d Binary files /dev/null and b/fonts/charter/charter_regular-webfont.woff differ diff --git a/fonts/charter/stylesheet.css b/fonts/charter/stylesheet.css new file mode 100644 index 0000000..3b63e0f --- /dev/null +++ b/fonts/charter/stylesheet.css @@ -0,0 +1,52 @@ +/* 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/fira-sans/FiraSans-Bold.eot b/fonts/fira-sans/FiraSans-Bold.eot new file mode 100644 index 0000000..91245f1 Binary files /dev/null and b/fonts/fira-sans/FiraSans-Bold.eot differ diff --git a/fonts/fira-sans/FiraSans-Bold.woff b/fonts/fira-sans/FiraSans-Bold.woff new file mode 100644 index 0000000..aac5ce3 Binary files /dev/null and b/fonts/fira-sans/FiraSans-Bold.woff differ diff --git a/fonts/fira-sans/FiraSans-Bold.woff2 b/fonts/fira-sans/FiraSans-Bold.woff2 new file mode 100644 index 0000000..9216d5e Binary files /dev/null and b/fonts/fira-sans/FiraSans-Bold.woff2 differ diff --git a/fonts/fira-sans/FiraSans-Book.eot b/fonts/fira-sans/FiraSans-Book.eot new file mode 100644 index 0000000..9902a51 Binary files /dev/null and b/fonts/fira-sans/FiraSans-Book.eot differ diff --git a/fonts/fira-sans/FiraSans-Book.woff b/fonts/fira-sans/FiraSans-Book.woff new file mode 100644 index 0000000..a480632 Binary files /dev/null and b/fonts/fira-sans/FiraSans-Book.woff differ diff --git a/fonts/fira-sans/FiraSans-Book.woff2 b/fonts/fira-sans/FiraSans-Book.woff2 new file mode 100644 index 0000000..be1642d Binary files /dev/null and b/fonts/fira-sans/FiraSans-Book.woff2 differ diff --git a/fonts/fira-sans/FiraSans-Eight.eot b/fonts/fira-sans/FiraSans-Eight.eot new file mode 100644 index 0000000..5ada51d Binary files /dev/null and b/fonts/fira-sans/FiraSans-Eight.eot differ diff --git a/fonts/fira-sans/FiraSans-Eight.woff b/fonts/fira-sans/FiraSans-Eight.woff new file mode 100644 index 0000000..239e8ad Binary files /dev/null and b/fonts/fira-sans/FiraSans-Eight.woff differ diff --git a/fonts/fira-sans/FiraSans-Eight.woff2 b/fonts/fira-sans/FiraSans-Eight.woff2 new file mode 100644 index 0000000..417dc71 Binary files /dev/null and b/fonts/fira-sans/FiraSans-Eight.woff2 differ diff --git a/fonts/fira-sans/FiraSans-ExtraBold.eot b/fonts/fira-sans/FiraSans-ExtraBold.eot new file mode 100644 index 0000000..66a7887 Binary files /dev/null and b/fonts/fira-sans/FiraSans-ExtraBold.eot differ diff --git a/fonts/fira-sans/FiraSans-ExtraBold.woff b/fonts/fira-sans/FiraSans-ExtraBold.woff new file mode 100644 index 0000000..ecf5c00 Binary files /dev/null and b/fonts/fira-sans/FiraSans-ExtraBold.woff differ diff --git a/fonts/fira-sans/FiraSans-ExtraBold.woff2 b/fonts/fira-sans/FiraSans-ExtraBold.woff2 new file mode 100644 index 0000000..643056a Binary files /dev/null and b/fonts/fira-sans/FiraSans-ExtraBold.woff2 differ diff --git a/fonts/fira-sans/FiraSans-ExtraLight.eot b/fonts/fira-sans/FiraSans-ExtraLight.eot new file mode 100644 index 0000000..df7b79a Binary files /dev/null and b/fonts/fira-sans/FiraSans-ExtraLight.eot differ diff --git a/fonts/fira-sans/FiraSans-ExtraLight.woff b/fonts/fira-sans/FiraSans-ExtraLight.woff new file mode 100644 index 0000000..3fff7f2 Binary files /dev/null and b/fonts/fira-sans/FiraSans-ExtraLight.woff differ diff --git a/fonts/fira-sans/FiraSans-ExtraLight.woff2 b/fonts/fira-sans/FiraSans-ExtraLight.woff2 new file mode 100644 index 0000000..40789f7 Binary files /dev/null and b/fonts/fira-sans/FiraSans-ExtraLight.woff2 differ diff --git a/fonts/fira-sans/FiraSans-Four.eot b/fonts/fira-sans/FiraSans-Four.eot new file mode 100644 index 0000000..9ecf883 Binary files /dev/null and b/fonts/fira-sans/FiraSans-Four.eot differ diff --git a/fonts/fira-sans/FiraSans-Four.woff b/fonts/fira-sans/FiraSans-Four.woff new file mode 100644 index 0000000..b2343a4 Binary files /dev/null and b/fonts/fira-sans/FiraSans-Four.woff differ diff --git a/fonts/fira-sans/FiraSans-Four.woff2 b/fonts/fira-sans/FiraSans-Four.woff2 new file mode 100644 index 0000000..1579f2c Binary files /dev/null and b/fonts/fira-sans/FiraSans-Four.woff2 differ diff --git a/fonts/fira-sans/FiraSans-Hair.eot b/fonts/fira-sans/FiraSans-Hair.eot new file mode 100644 index 0000000..548058b Binary files /dev/null and b/fonts/fira-sans/FiraSans-Hair.eot differ diff --git a/fonts/fira-sans/FiraSans-Hair.woff b/fonts/fira-sans/FiraSans-Hair.woff new file mode 100644 index 0000000..8d65933 Binary files /dev/null and b/fonts/fira-sans/FiraSans-Hair.woff differ diff --git a/fonts/fira-sans/FiraSans-Hair.woff2 b/fonts/fira-sans/FiraSans-Hair.woff2 new file mode 100644 index 0000000..f1e2cce Binary files /dev/null and b/fonts/fira-sans/FiraSans-Hair.woff2 differ diff --git a/fonts/fira-sans/FiraSans-Heavy.eot b/fonts/fira-sans/FiraSans-Heavy.eot new file mode 100644 index 0000000..12eaa13 Binary files /dev/null and b/fonts/fira-sans/FiraSans-Heavy.eot differ diff --git a/fonts/fira-sans/FiraSans-Heavy.woff b/fonts/fira-sans/FiraSans-Heavy.woff new file mode 100644 index 0000000..d8f9f83 Binary files /dev/null and b/fonts/fira-sans/FiraSans-Heavy.woff differ diff --git a/fonts/fira-sans/FiraSans-Heavy.woff2 b/fonts/fira-sans/FiraSans-Heavy.woff2 new file mode 100644 index 0000000..90070f8 Binary files /dev/null and b/fonts/fira-sans/FiraSans-Heavy.woff2 differ diff --git a/fonts/fira-sans/FiraSans-Light.eot b/fonts/fira-sans/FiraSans-Light.eot new file mode 100644 index 0000000..683a207 Binary files /dev/null and b/fonts/fira-sans/FiraSans-Light.eot differ diff --git a/fonts/fira-sans/FiraSans-Light.woff b/fonts/fira-sans/FiraSans-Light.woff new file mode 100644 index 0000000..fc2d955 Binary files /dev/null and b/fonts/fira-sans/FiraSans-Light.woff differ diff --git a/fonts/fira-sans/FiraSans-Light.woff2 b/fonts/fira-sans/FiraSans-Light.woff2 new file mode 100644 index 0000000..28ff042 Binary files /dev/null and b/fonts/fira-sans/FiraSans-Light.woff2 differ diff --git a/fonts/fira-sans/FiraSans-Medium.eot b/fonts/fira-sans/FiraSans-Medium.eot new file mode 100644 index 0000000..9bfb6cd Binary files /dev/null and b/fonts/fira-sans/FiraSans-Medium.eot differ diff --git a/fonts/fira-sans/FiraSans-Medium.woff b/fonts/fira-sans/FiraSans-Medium.woff new file mode 100644 index 0000000..bae9822 Binary files /dev/null and b/fonts/fira-sans/FiraSans-Medium.woff differ diff --git a/fonts/fira-sans/FiraSans-Medium.woff2 b/fonts/fira-sans/FiraSans-Medium.woff2 new file mode 100644 index 0000000..0d1b17b Binary files /dev/null and b/fonts/fira-sans/FiraSans-Medium.woff2 differ diff --git a/fonts/fira-sans/FiraSans-Regular.eot b/fonts/fira-sans/FiraSans-Regular.eot new file mode 100644 index 0000000..f384666 Binary files /dev/null and b/fonts/fira-sans/FiraSans-Regular.eot differ diff --git a/fonts/fira-sans/FiraSans-Regular.woff b/fonts/fira-sans/FiraSans-Regular.woff new file mode 100644 index 0000000..607b95e Binary files /dev/null and b/fonts/fira-sans/FiraSans-Regular.woff differ diff --git a/fonts/fira-sans/FiraSans-Regular.woff2 b/fonts/fira-sans/FiraSans-Regular.woff2 new file mode 100644 index 0000000..60c2cb4 Binary files /dev/null and b/fonts/fira-sans/FiraSans-Regular.woff2 differ diff --git a/fonts/fira-sans/FiraSans-SemiBold.eot b/fonts/fira-sans/FiraSans-SemiBold.eot new file mode 100644 index 0000000..a385a44 Binary files /dev/null and b/fonts/fira-sans/FiraSans-SemiBold.eot differ diff --git a/fonts/fira-sans/FiraSans-SemiBold.woff b/fonts/fira-sans/FiraSans-SemiBold.woff new file mode 100644 index 0000000..2e2ddf9 Binary files /dev/null and b/fonts/fira-sans/FiraSans-SemiBold.woff differ diff --git a/fonts/fira-sans/FiraSans-SemiBold.woff2 b/fonts/fira-sans/FiraSans-SemiBold.woff2 new file mode 100644 index 0000000..3f87175 Binary files /dev/null and b/fonts/fira-sans/FiraSans-SemiBold.woff2 differ diff --git a/fonts/fira-sans/FiraSans-Thin.eot b/fonts/fira-sans/FiraSans-Thin.eot new file mode 100644 index 0000000..7bf411e Binary files /dev/null and b/fonts/fira-sans/FiraSans-Thin.eot differ diff --git a/fonts/fira-sans/FiraSans-Thin.woff b/fonts/fira-sans/FiraSans-Thin.woff new file mode 100644 index 0000000..17c1e4a Binary files /dev/null and b/fonts/fira-sans/FiraSans-Thin.woff differ diff --git a/fonts/fira-sans/FiraSans-Thin.woff2 b/fonts/fira-sans/FiraSans-Thin.woff2 new file mode 100644 index 0000000..10ff95d Binary files /dev/null and b/fonts/fira-sans/FiraSans-Thin.woff2 differ diff --git a/fonts/fira-sans/FiraSans-Two.eot b/fonts/fira-sans/FiraSans-Two.eot new file mode 100644 index 0000000..7361d5f Binary files /dev/null and b/fonts/fira-sans/FiraSans-Two.eot differ diff --git a/fonts/fira-sans/FiraSans-Two.woff b/fonts/fira-sans/FiraSans-Two.woff new file mode 100644 index 0000000..70f1645 Binary files /dev/null and b/fonts/fira-sans/FiraSans-Two.woff differ diff --git a/fonts/fira-sans/FiraSans-Two.woff2 b/fonts/fira-sans/FiraSans-Two.woff2 new file mode 100644 index 0000000..99b57b5 Binary files /dev/null and b/fonts/fira-sans/FiraSans-Two.woff2 differ diff --git a/fonts/fira-sans/FiraSans-Ultra.eot b/fonts/fira-sans/FiraSans-Ultra.eot new file mode 100644 index 0000000..d0a6f82 Binary files /dev/null and b/fonts/fira-sans/FiraSans-Ultra.eot differ diff --git a/fonts/fira-sans/FiraSans-Ultra.woff b/fonts/fira-sans/FiraSans-Ultra.woff new file mode 100644 index 0000000..972c1ad Binary files /dev/null and b/fonts/fira-sans/FiraSans-Ultra.woff differ diff --git a/fonts/fira-sans/FiraSans-Ultra.woff2 b/fonts/fira-sans/FiraSans-Ultra.woff2 new file mode 100644 index 0000000..3ba9de7 Binary files /dev/null and b/fonts/fira-sans/FiraSans-Ultra.woff2 differ diff --git a/fonts/fira-sans/FiraSans-UltraLight.eot b/fonts/fira-sans/FiraSans-UltraLight.eot new file mode 100644 index 0000000..c42feda Binary files /dev/null and b/fonts/fira-sans/FiraSans-UltraLight.eot differ diff --git a/fonts/fira-sans/FiraSans-UltraLight.woff b/fonts/fira-sans/FiraSans-UltraLight.woff new file mode 100644 index 0000000..c97117f Binary files /dev/null and b/fonts/fira-sans/FiraSans-UltraLight.woff differ diff --git a/fonts/fira-sans/FiraSans-UltraLight.woff2 b/fonts/fira-sans/FiraSans-UltraLight.woff2 new file mode 100644 index 0000000..0a132f7 Binary files /dev/null and b/fonts/fira-sans/FiraSans-UltraLight.woff2 differ diff --git a/fonts/fira-sans/fira-sans.css b/fonts/fira-sans/fira-sans.css new file mode 100644 index 0000000..0f6bfb4 --- /dev/null +++ b/fonts/fira-sans/fira-sans.css @@ -0,0 +1,8 @@ +@font-face { + font-family: 'Fira Sans'; + src: url('FiraSans-Regular.eot'); + src: url('FiraSans-Regular.eot?#iefix') format('embedded-opentype'), + url('FiraSans-Regular.woff') format('woff'); + font-weight: normal; + font-style: normal; +} diff --git a/functions.php b/functions.php index f25a2b0..92db36c 100644 --- a/functions.php +++ b/functions.php @@ -120,6 +120,8 @@ 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( 'fira-sans-font', get_template_directory_uri() . '/fonts/fira-sans/fira-sans.css' ); wp_enqueue_style( 'highlight-style', get_template_directory_uri() . '/css/highlight-default.css' ); wp_enqueue_style( 'jeremy-wordpress-theme-style', get_stylesheet_uri() ); diff --git a/header.php b/header.php index 45e4fea..c7ce2eb 100644 --- a/header.php +++ b/header.php @@ -12,47 +12,46 @@ ?> > - + - + -> -
- + > +
+ -
+ -
+
diff --git a/page.php b/page.php index 48755c3..8e4c043 100644 --- a/page.php +++ b/page.php @@ -36,5 +36,5 @@ get_header();