Skip to content

Commit

Permalink
Bumps version to v.0.6.1-alpha
Browse files Browse the repository at this point in the history
Fixes content errors and configures Sass mixins.
  • Loading branch information
connor-baer committed Jun 29, 2016
1 parent 90bd8bc commit 22f4947
Show file tree
Hide file tree
Showing 24 changed files with 33 additions and 320 deletions.
31 changes: 1 addition & 30 deletions 404.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,38 +19,9 @@
<div class="page-content">
<p><?php esc_html_e( 'It looks like nothing was found at this location. Maybe try one of the links below or a search?', 'nc-template' ); ?></p>

<?php
get_search_form();
<?php get_search_form(); ?>

the_widget( 'WP_Widget_Recent_Posts' );

// Only show the widget if site has multiple categories.
if ( nc_template_categorized_blog() ) :
?>

<div class="widget widget_categories">
<h2 class="widget-title"><?php esc_html_e( 'Most Used Categories', 'nc-template' ); ?></h2>
<ul>
<?php
wp_list_categories( array(
'orderby' => 'count',
'order' => 'DESC',
'show_count' => 1,
'title_li' => '',
'number' => 10,
) );
?>
</ul>
</div>
<?php
endif;

/* translators: %1$s: smiley */
$archive_content = '<p>' . sprintf( esc_html__( 'Try looking in the monthly archives. %1$s', 'nc-template' ), convert_smilies( ':)' ) ) . '</p>';
the_widget( 'WP_Widget_Archives', 'dropdown=1', "after_title=</h2>$archive_content" );

the_widget( 'WP_Widget_Tag_Cloud' );
?>

</div>
</section>
Expand Down
4 changes: 2 additions & 2 deletions archive.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@
* If you want to override this in a child theme, then include a file
* called content-___.php (where ___ is the Post Format name) and that will be used instead.
*/
get_template_part( 'components/post/content', get_post_format() );
get_template_part( 'components/content', get_post_format() );

endwhile;

the_posts_navigation();

else :

get_template_part( 'components/post/content', 'none' );
get_template_part( 'components/content', 'none' );

endif; ?>

Expand Down
16 changes: 5 additions & 11 deletions components/navigation-header.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,16 @@
* @package NC_Template
*/

?><nav id="site-navigation" class="main-navigation" role="navigation">
?><div id="site-navigation" class="main-navigation" role="navigation">
<button class="menu-toggle" aria-controls="top-menu" aria-expanded="false"><?php esc_html_e( 'Top Menu', 'nc-template' ); ?></button>
<?php if ( has_nav_menu( 'header' ) ) {
wp_nav_menu( array(
'theme_location' => 'header',
'depth' => '2',
'container' => 'nav',
'container_class' => 'nav-collapse',
'fallback_cb' => 'false',
) );
} ?>

</nav><!-- #site-navigation -->

<!-- <nav class="nav-collapse">
<ul>
<li><a href="#">Home</a></li>
<li><a href="#">About</a></li>
<li><a href="#">Projects</a></li>
<li><a href="#">Contact</a></li>
</ul>
</nav> -->
</div><!-- #site-navigation -->
2 changes: 1 addition & 1 deletion components/site-info.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
?><div class="site-info">
<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'nc-template' ) ); ?>"><?php printf( esc_html__( 'Proudly powered by %s', 'nc-template' ), 'WordPress' ); ?></a>
<span class="sep"> | </span>
<?php printf( esc_html__( 'Theme: %1$s by %2$s.', 'nc-template' ), 'NC Template', '<a href="http://automattic.com/" rel="designer">Automattic</a>' ); ?>
<?php printf( esc_html__( 'Theme: %1$s by %2$s.', 'nc-template' ), 'NC Template', '<a href="http://connorbaer.io/" rel="designer">Connor Bär</a>' ); ?>
</div><!-- .site-info -->
File renamed without changes.
File renamed without changes.
File renamed without changes.
3 changes: 1 addition & 2 deletions footer.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@

</div>
<footer id="colophon" class="site-footer" role="contentinfo">
<?php get_template_part( 'components/footer/site', 'info' ); ?>
<?php get_template_part( 'components/site', 'info' ); ?>
</footer>
</div>
<?php wp_footer(); ?>

</body>
</html>
5 changes: 5 additions & 0 deletions functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,11 @@ function nc_template_scripts() {
wp_enqueue_style( 'nc-template-fonts', nc_template_fonts_url(), array(), null );
// Theme stylesheet.
wp_enqueue_style( 'nc-template-style', get_stylesheet_uri() );
// Load the html5 shiv.
wp_enqueue_script( 'nc-template-html5', get_template_directory_uri() . '/js/html5.js' );
wp_script_add_data( 'nc-template-html5', 'conditional', 'lt IE 9' );
// Theme scripts.
wp_enqueue_script( 'nc-template-script', get_template_directory_uri() . '/js/scripts.js' );
}
add_action( 'wp_enqueue_scripts', 'nc_template_scripts' );

Expand Down
9 changes: 9 additions & 0 deletions header.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@
<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>">

<?php wp_head(); ?>

<meta name="description" content="<?php if ( is_single() ) {
single_post_title( '', true );
} else {
bloginfo( 'name' );
echo ' - ';
bloginfo( 'description' );
}
?>" />
</head>

<body <?php body_class(); ?>>
Expand Down
2 changes: 0 additions & 2 deletions js/core.js

This file was deleted.

2 changes: 2 additions & 0 deletions js/scripts.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion nc-template.svg

This file was deleted.

2 changes: 1 addition & 1 deletion page.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<?php
while ( have_posts() ) : the_post();

get_template_part( 'components/page/content', 'page' );
get_template_part( 'components/content', 'page' );

// If comments are open or we have at least one comment, load up the comment template.
if ( comments_open() || get_comments_number() ) :
Expand Down
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Requires at least: WordPress 4.5

Tested up to: WordPress 4.5.3

Version: 0.6.0-alpha
Version: 0.6.1-alpha

License: [MIT](#copyright)

Expand Down
4 changes: 2 additions & 2 deletions search.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@
* If you want to overload this in a child theme then include a file
* called content-search.php and that will be used instead.
*/
get_template_part( 'components/post/content', 'search' );
get_template_part( 'components/content', 'search' );

endwhile;

the_posts_navigation();

else :

get_template_part( 'components/post/content', 'none' );
get_template_part( 'components/content', 'none' );

endif; ?>

Expand Down
2 changes: 1 addition & 1 deletion single.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<?php
while ( have_posts() ) : the_post();

get_template_part( 'components/post/content', get_post_format() );
get_template_part( 'components/content', get_post_format() );

the_post_navigation();

Expand Down
4 changes: 2 additions & 2 deletions style.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 0 additions & 33 deletions template-parts/biography.php

This file was deleted.

31 changes: 0 additions & 31 deletions template-parts/content-none.php

This file was deleted.

Loading

0 comments on commit 22f4947

Please sign in to comment.