jdormit/jeremy-wordpress-theme
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Typography update

Browse Source
This commit is contained in:
Jeremy Dormitzer 2019-05-18 02:03:04 -04:00
parent 8122f77fb0
commit ce0f471892
66 changed files with 132 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
fonts/charter/charter_bold-webfont.eot Normal file
View File

Binary file not shown.

BIN
fonts/charter/charter_bold-webfont.ttf Normal file
View File

Binary file not shown.

BIN
fonts/charter/charter_bold-webfont.woff Normal file
View File

Binary file not shown.

BIN
fonts/charter/charter_bold_italic-webfont.eot Normal file
View File

Binary file not shown.

BIN
fonts/charter/charter_bold_italic-webfont.ttf Normal file
View File

Binary file not shown.

BIN
fonts/charter/charter_bold_italic-webfont.woff Normal file
View File

Binary file not shown.

BIN
fonts/charter/charter_italic-webfont.eot Normal file
View File

Binary file not shown.

BIN
fonts/charter/charter_italic-webfont.ttf Normal file
View File

Binary file not shown.

BIN
fonts/charter/charter_italic-webfont.woff Normal file
View File

Binary file not shown.

BIN
fonts/charter/charter_regular-webfont.eot Normal file
View File

Binary file not shown.

BIN
fonts/charter/charter_regular-webfont.ttf Normal file
View File

Binary file not shown.

BIN
fonts/charter/charter_regular-webfont.woff Normal file
View File

Binary file not shown.

52
fonts/charter/stylesheet.css Normal file
View File

@ -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;
}

BIN
fonts/fira-sans/FiraSans-Bold.eot Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Bold.woff Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Bold.woff2 Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Book.eot Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Book.woff Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Book.woff2 Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Eight.eot Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Eight.woff Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Eight.woff2 Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-ExtraBold.eot Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-ExtraBold.woff Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-ExtraBold.woff2 Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-ExtraLight.eot Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-ExtraLight.woff Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-ExtraLight.woff2 Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Four.eot Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Four.woff Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Four.woff2 Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Hair.eot Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Hair.woff Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Hair.woff2 Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Heavy.eot Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Heavy.woff Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Heavy.woff2 Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Light.eot Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Light.woff Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Light.woff2 Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Medium.eot Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Medium.woff Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Medium.woff2 Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Regular.eot Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Regular.woff Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Regular.woff2 Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-SemiBold.eot Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-SemiBold.woff Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-SemiBold.woff2 Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Thin.eot Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Thin.woff Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Thin.woff2 Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Two.eot Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Two.woff Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Two.woff2 Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Ultra.eot Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Ultra.woff Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-Ultra.woff2 Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-UltraLight.eot Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-UltraLight.woff Normal file
View File

Binary file not shown.

BIN
fonts/fira-sans/FiraSans-UltraLight.woff2 Normal file
View File

Binary file not shown.

8
fonts/fira-sans/fira-sans.css Normal file
View File

@ -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;
}

2
functions.php
View File

@ -120,6 +120,8 @@ add_action( 'widgets_init', 'jeremy_wordpress_theme_widgets_init' );
* Enqueue scripts and styles. * Enqueue scripts and styles.
*/ */
function jeremy_wordpress_theme_scripts() { 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( 'highlight-style', get_template_directory_uri() . '/css/highlight-default.css' );
wp_enqueue_style( 'jeremy-wordpress-theme-style', get_stylesheet_uri() ); wp_enqueue_style( 'jeremy-wordpress-theme-style', get_stylesheet_uri() );

61
header.php
View File

@ -12,47 +12,46 @@
?> ?>
<!doctype html> <!doctype html>
<html <?php language_attributes(); ?>> <html <?php language_attributes(); ?>>
<head> <head>
<meta charset="<?php bloginfo( 'charset' ); ?>"> <meta charset="<?php bloginfo( 'charset' ); ?>">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="profile" href="https://gmpg.org/xfn/11"> <link rel="profile" href="https://gmpg.org/xfn/11">
<?php wp_head(); ?> <?php wp_head(); ?>
</head> </head>
<body <?php body_class(); ?>> <body <?php body_class(); ?>>
<div id="page" class="site"> <div id="page" class="site">
<a class="skip-link screen-reader-text" href="#content"><?php esc_html_e( 'Skip to content', 'jeremy-wordpress-theme' ); ?></a> <a class="skip-link screen-reader-text" href="#content"><?php esc_html_e( 'Skip to content', 'jeremy-wordpress-theme' ); ?></a>
<header id="masthead" class="site-header"> <header id="masthead" class="site-header">
<nav id="site-navigation" class="main-navigation">
<button class="menu-toggle" aria-controls="primary-menu" aria-expanded="false">
<img class="icon"
src="<?php echo get_template_directory_uri() . '/icons/menu.svg'?>"
alt="menu">
</button>
<?php
wp_nav_menu( array(
'theme_location' => 'menu-1',
'menu_id' => 'primary-menu',
) );
?>
</nav><!-- #site-navigation -->
<div class="site-branding"> <div class="site-branding">
<?php
the_custom_logo();
if ( is_front_page() && is_home() ) :
?>
<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
<?php <?php
the_custom_logo();
if ( is_front_page() && is_home() ) :
?>
<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
<?php
$jeremy_wordpress_theme_description = get_bloginfo( 'description', 'display' ); $jeremy_wordpress_theme_description = get_bloginfo( 'description', 'display' );
if ( $jeremy_wordpress_theme_description || is_customize_preview() ) : if ( $jeremy_wordpress_theme_description || is_customize_preview() ) :
?>
<p class="site-description"><?php echo $jeremy_wordpress_theme_description; /* WPCS: xss ok. */ ?></p>
<?php endif; ?>
<?php endif; ?>
</div><!-- .site-branding -->
<nav id="site-navigation" class="main-navigation">
<button class="menu-toggle" aria-controls="primary-menu" aria-expanded="false">
<img class="icon"
src="<?php echo get_template_directory_uri() . '/icons/menu.svg'?>"
alt="menu">
</button>
<?php
wp_nav_menu( array(
'theme_location' => 'menu-1',
'menu_id' => 'primary-menu',
) );
?> ?>
</nav><!-- #site-navigation --> <p class="site-description"><?php echo $jeremy_wordpress_theme_description; /* WPCS: xss ok. */ ?></p>
</header><!-- #masthead --> <?php endif; ?>
<?php endif; ?>
</div><!-- .site-branding -->
</header><!-- #masthead -->
<div id="content" class="site-content"> <div id="content" class="site-content">

2
page.php
View File

@ -36,5 +36,5 @@ get_header();
</div><!-- #primary --> </div><!-- #primary -->
<?php <?php
get_sidebar(); // get_sidebar();
get_footer(); get_footer();

114
style.css
View File

@ -396,11 +396,11 @@ input,
select, select,
optgroup, optgroup,
textarea { textarea {
color: #404040; color: #404040;
font-family: sans-serif; font-family: 'Fira Sans', sans-serif;
font-size: 16px; font-size: 21px;
font-size: 1rem; font-size: 1rem;
line-height: 1.5; line-height: 1.5;
} }
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
@ -490,6 +490,7 @@ Fonts
*/ */
body { body {
font-family: font-family:
charterregular,
"Palatino Linotype", "Palatino Linotype",
Palatino, Palatino,
Palladio, Palladio,
@ -509,54 +510,17 @@ body {
serif; serif;
} }
h1, h2, h3, h4, h5 {
font-weight: normal;
}
/*
Font sizes
*/
html { html {
font-size: 21px; font-size: 21px;
} }
h4 {
font-size: 28px;
}
h3 {
font-size: 37px;
}
h2 { h1, h2, h3, h4, h5, h6 {
font-size: 50px; font-weight: bold;
}
h1 {
font-size: 67px;
}
.widget-area {
font-size: 16px;
}
.widget-area h4 {
font-size: 21px; font-size: 21px;
} }
.widget-area h3 {
font-size: 28px;
}
.widget-area h2 {
font-size: 37px;
}
.widget-area h1 {
font-size: 50px;
}
.content-area { .content-area {
word-wrap: break-word; word-wrap: break-word;
} }
@ -645,22 +609,20 @@ button,
input[type="button"], input[type="button"],
input[type="reset"], input[type="reset"],
input[type="submit"] { input[type="submit"] {
border: 1px solid; border: none;
border-color: #ccc #ccc #bbb;
border-radius: 3px; border-radius: 3px;
background: #e6e6e6; background: #e9e9e9;
color: rgba(0, 0, 0, 0.8); color: #404040;
font-size: 12px; line-height: 1.75;
font-size: 0.75rem; padding: 0.5rem 1rem 0.5rem;
line-height: 1;
padding: .6em 1em .4em;
} }
button:hover, button:hover,
input[type="button"]:hover, input[type="button"]:hover,
input[type="reset"]:hover, input[type="reset"]:hover,
input[type="submit"]:hover { input[type="submit"]:hover {
border-color: #ccc #bbb #aaa; background-color: #dedede;
cursor: pointer;
} }
button:active, button:focus, button:active, button:focus,
@ -730,6 +692,7 @@ textarea {
--------------------------------------------------------------*/ --------------------------------------------------------------*/
a { a {
color: royalblue; color: royalblue;
text-decoration: none;
} }
a:visited { a:visited {
@ -772,7 +735,7 @@ a:hover, a:active {
top: 100%; top: 100%;
left: -999em; left: -999em;
z-index: 99999; z-index: 99999;
background-color: white; background-color: #fff;
} }
.main-navigation ul ul ul { .main-navigation ul ul ul {
@ -910,23 +873,6 @@ a:hover, a:active {
/*-------------------------------------------------------------- /*--------------------------------------------------------------
# Clearings # Clearings
--------------------------------------------------------------*/ --------------------------------------------------------------*/
.clear:before,
.clear:after,
.entry-content:before,
.entry-content:after,
.comment-content:before,
.comment-content:after,
.site-header:before,
.site-header:after,
.site-content:before,
.site-content:after,
.site-footer:before,
.site-footer:after {
content: "";
display: table;
table-layout: fixed;
}
.clear:after, .clear:after,
.entry-content:after, .entry-content:after,
.comment-content:after, .comment-content:after,
@ -978,21 +924,38 @@ a:hover, a:active {
Site header Site header
*/ */
.site-header { .site-header {
height: 60px;
display: grid; display: grid;
grid-template-columns: repeat(12, 1fr); grid-template-columns: repeat(12, 1fr);
grid-template-rows: 1fr; grid-template-rows: 1fr;
grid-gap: 1rem; grid-gap: 1rem;
padding-top: 1rem; padding-top: 0.5rem;
padding-bottom: 0.5rem;
position: fixed;
background-color: #fff;
width: 100%;
} }
.site-branding { .site-branding {
grid-column: 2 / 6; grid-column: 10 / 12;
} }
.main-navigation { .main-navigation {
display: grid; display: grid;
grid-column: 6 / 12; grid-column: 1 / 10;
justify-items: end; justify-items: start;
font-variant: small-caps;
letter-spacing: 0.05rem;
text-rendering: optimizelegibility;
font-feature-settings: 'kern';
}
.main-navigation a {
color: #404040;
}
.main-navigation a:hover {
color: #111;
} }
.main-navigation li { .main-navigation li {
@ -1023,6 +986,7 @@ Site content
grid-template-columns: repeat(12, 1fr); grid-template-columns: repeat(12, 1fr);
grid-gap: 1rem; grid-gap: 1rem;
grid-auto-rows: auto; grid-auto-rows: auto;
margin-top: 60px;
} }
.content-area { .content-area {