Skip to content

Commit 8fb16ac

Browse files
Stephen MullenStephen Mullen
authored andcommitted
Updated to Foundation 6.4.1
Updated to Foundation 6.4.1. Now using new XY Grid as default. Added search page template
1 parent 926836d commit 8fb16ac

40 files changed

+23502
-12631
lines changed

404.php

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,34 @@
1111

1212
get_header(); ?>
1313

14-
<div class="row">
15-
<div id="primary" class="site-content columns">
16-
<main id="content" role="main">
17-
<?php do_action( 'cornerstone_before_content' ); ?>
18-
<section id="post-0" class="error-404 not-found">
19-
<header class="entry-header">
20-
<h1 class="entry-title"><?php esc_html_e( 'Oops! That page can&rsquo;t be found.', 'cornerstone' ); ?></h1>
21-
</header>
14+
<div class="grid-container">
15+
<div class="grid-x grid-padding-x">
16+
<div id="primary" class="cell site-content">
17+
<main id="content" role="main">
18+
<?php do_action( 'cornerstone_before_content' ); ?>
19+
<section id="post-0" class="error-404 not-found">
20+
<header class="entry-header">
21+
<h1 class="entry-title"><?php esc_html_e( 'Oops! That page can&rsquo;t be found.', 'cornerstone' ); ?></h1>
22+
</header>
2223

23-
<div class="page-content">
24-
<p><?php esc_html_e( 'It looks like nothing was found at this location. Maybe try one of the links below or a search?', 'cornerstone' ); ?></p>
24+
<div class="page-content">
25+
<p><?php esc_html_e( 'It looks like nothing was found at this location. Maybe try one of the links below or a search?', 'cornerstone' ); ?></p>
2526

26-
<?php
27-
get_search_form();
28-
the_widget( 'WP_Widget_Recent_Posts' );
27+
<?php
28+
get_search_form();
29+
the_widget( 'WP_Widget_Recent_Posts' );
2930

30-
/* translators: %1$s: smiley */
31-
$archive_content = '<p>' . sprintf( esc_html__( 'Try looking in the monthly archives. %1$s', 'cornerstone' ), convert_smilies( ':)' ) ) . '</p>';
32-
the_widget( 'WP_Widget_Archives', 'dropdown=1', "after_title=</h2>$archive_content" );
33-
the_widget( 'WP_Widget_Tag_Cloud' );
34-
?>
31+
/* translators: %1$s: smiley */
32+
$archive_content = '<p>' . sprintf( esc_html__( 'Try looking in the monthly archives. %1$s', 'cornerstone' ), convert_smilies( ':)' ) ) . '</p>';
33+
the_widget( 'WP_Widget_Archives', 'dropdown=1', "after_title=</h2>$archive_content" );
34+
the_widget( 'WP_Widget_Tag_Cloud' );
35+
?>
3536

36-
</div>
37-
</section>
38-
<?php do_action( 'cornerstone_after_content' ); ?>
39-
</main>
37+
</div>
38+
</section>
39+
<?php do_action( 'cornerstone_after_content' ); ?>
40+
</main>
41+
</div>
4042
</div>
4143
</div>
4244

author.php

Lines changed: 48 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -13,60 +13,62 @@
1313

1414
get_header(); ?>
1515

16-
<div class="row">
17-
<section id="primary" class="site-content columns">
18-
<main id="content" role="main">
16+
<div class="grid-container">
17+
<div class="grid-x grid-padding-x">
18+
<section id="primary" class="auto cell site-content">
19+
<main id="content" role="main">
1920

20-
<?php if ( have_posts() ) : ?>
21+
<?php if ( have_posts() ) : ?>
2122

22-
<?php
23-
/* Queue the first post, that way we know
24-
* what author we're dealing with (if that is the case).
25-
*
26-
* We reset this later so we can run the loop
27-
* properly with a call to rewind_posts().
28-
*/
29-
the_post();
30-
?>
23+
<?php
24+
/* Queue the first post, that way we know
25+
* what author we're dealing with (if that is the case).
26+
*
27+
* We reset this later so we can run the loop
28+
* properly with a call to rewind_posts().
29+
*/
30+
the_post();
31+
?>
3132

32-
<header class="archive-header">
33-
<h1 class="archive-title"><?php printf( __( 'Author Archives: %s', 'cornerstone' ), '<span class="vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( "ID" ) ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' ); ?></h1>
34-
</header><?php // .archive-header ?>
33+
<header class="archive-header">
34+
<h1 class="archive-title"><?php printf( __( 'Author Archives: %s', 'cornerstone' ), '<span class="vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( "ID" ) ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' ); ?></h1>
35+
</header><?php // .archive-header ?>
3536

36-
<?php
37-
/* Since we called the_post() above, we need to
38-
* rewind the loop back to the beginning that way
39-
* we can run the loop properly, in full.
40-
*/
41-
rewind_posts();
42-
?>
37+
<?php
38+
/* Since we called the_post() above, we need to
39+
* rewind the loop back to the beginning that way
40+
* we can run the loop properly, in full.
41+
*/
42+
rewind_posts();
43+
?>
4344

44-
<?php
45-
// If a user has filled out their description, show a bio on their entries.
46-
if ( get_the_author_meta( 'description' ) ) : ?>
47-
<div class="author-info">
48-
<div class="author-avatar">
49-
<?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'cornerstone_author_bio_avatar_size', 60 ) ); ?>
50-
</div><?php // .author-avatar ?>
51-
<div class="author-description">
52-
<h2><?php printf( __( 'About %s', 'cornerstone' ), get_the_author() ); ?></h2>
53-
<p><?php the_author_meta( 'description' ); ?></p>
54-
</div><?php // .author-description ?>
55-
</div><?php // .author-info ?>
56-
<?php endif; ?>
45+
<?php
46+
// If a user has filled out their description, show a bio on their entries.
47+
if ( get_the_author_meta( 'description' ) ) : ?>
48+
<div class="author-info">
49+
<div class="author-avatar">
50+
<?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'cornerstone_author_bio_avatar_size', 60 ) ); ?>
51+
</div><?php // .author-avatar ?>
52+
<div class="author-description">
53+
<h2><?php printf( __( 'About %s', 'cornerstone' ), get_the_author() ); ?></h2>
54+
<p><?php the_author_meta( 'description' ); ?></p>
55+
</div><?php // .author-description ?>
56+
</div><?php // .author-info ?>
57+
<?php endif; ?>
5758

58-
<?php /* Start the Loop */ ?>
59-
<?php while ( have_posts() ) : the_post(); ?>
60-
<?php get_template_part( 'template-parts/content', get_post_format() ); ?>
61-
<?php endwhile; ?>
59+
<?php /* Start the Loop */ ?>
60+
<?php while ( have_posts() ) : the_post(); ?>
61+
<?php get_template_part( 'template-parts/content', get_post_format() ); ?>
62+
<?php endwhile; ?>
6263

63-
<?php else : ?>
64-
<?php get_template_part( 'template-parts/content', 'none' ); ?>
65-
<?php endif; ?>
64+
<?php else : ?>
65+
<?php get_template_part( 'template-parts/content', 'none' ); ?>
66+
<?php endif; ?>
6667

67-
</main><?php // #content ?>
68-
</section><?php // #primary ?>
68+
</main><?php // #content ?>
69+
</section><?php // #primary ?>
6970

70-
<?php get_sidebar(); ?>
71+
<?php get_sidebar(); ?>
72+
</div>
7173
</div>
7274
<?php get_footer(); ?>

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"name": "cornerstone",
33
"ignore": [],
44
"dependencies": {
5-
"foundation-sites": "~6.3.1",
5+
"foundation-sites": "~6.4.1",
66
"motion-ui" : "~1.2.2",
7-
"what-input" : "latest"
7+
"what-input" : "4.1.6"
88
},
99
"install" : {
1010
"options" : {

changelog.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
== changelog ==
22

3+
= 5.1.0 =
4+
* Updated to Foundation 6.4.1.
5+
* Now using new XY Grid as default.
6+
* Added search page template
7+
8+
39
= 5.0.0 =
410
* Updated to Foundation 6.3.
511
* Now using flex grid as default. Changed Foundation classes to use the flex versions.

css/foundation-flex.min.css

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)