Skip to content
This repository has been archived by the owner on Nov 9, 2024. It is now read-only.

Commit

Permalink
Merge pull request #12 from bueltge/merger
Browse files Browse the repository at this point in the history 
Formatting and Strict rules.
  • Loading branch information
@bueltge
bueltge authored Nov 8, 2024
2 parents 475d9a6 + 8a9b615 commit fc8003c
Show file tree
Hide file tree
Showing 26 changed files with 1,190 additions and 960 deletions.
8 changes: 8 additions & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
* text eol=lf
*.jpg -text
*.png -text
*.gif -text

.git export-ignore
.gitignore export-ignore
.gitattributes export-ignore
26 changes: 26 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# General
.DS_Store

# npm
/node_modules

# Release task
/release

# Build files
/js/*.js
/js/*.map
/css/*.css
/css/*.map

# Sass
.sass-cache

# Vendor (e.g. Composer)
vendor/*
!vendor/.gitkeep

# IDE PhpStorm
.idea/
*.ipr
*.iws
18 changes: 10 additions & 8 deletions 404.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,22 @@
/**
* The template for displaying 404 pages (not found).
*
* @link https://codex.wordpress.org/Creating_an_Error_404_Page
* @link https://codex.wordpress.org/Creating_an_Error_404_Page
*
* @package popper
*/

get_header(); ?>

<div id="primary" class="content-area">
<main id="main" class="site-main" role="main">
<div id="primary" class="content-area">
<main id="main" class="site-main" role="main">

<?php get_template_part('template-parts/content', 'none'); ?>
<?php get_template_part( 'template-parts/content', 'none' ); ?>

</main><!-- #main -->
</div><!-- #primary -->
</main><!-- #main -->
</div><!-- #primary -->

<?php get_sidebar(); ?>
<?php get_footer(); ?>
<?php
get_sidebar();
get_footer();
?>
49 changes: 24 additions & 25 deletions archive.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,50 +2,49 @@
/**
* The template for displaying archive pages.
*
* @link https://codex.wordpress.org/Template_Hierarchy
* @link https://codex.wordpress.org/Template_Hierarchy
*
* @package popper
*/

get_header(); ?>

<div id="primary" class="content-area">
<main id="main" class="site-main" role="main">
<div id="primary" class="content-area">
<main id="main" class="site-main" role="main">

<?php if ( have_posts() ) : ?>

<header class="page-header">
<?php
the_archive_title( '<h1 class="page-title">', '</h1>' );
the_archive_description( '<div class="taxonomy-description">', '</div>' );
the_archive_title( '<h1 class="page-title">', '</h1>' );
the_archive_description( '<div class="taxonomy-description">', '</div>' );
?>
</header><!-- .page-header -->

<?php /* Start the Loop */ ?>
<?php while ( have_posts() ) : the_post(); ?>
<?php /* Start the Loop */
while ( have_posts() ) : the_post();

<?php

/*
* Include the Post-Format-specific template for the content.
* 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( 'template-parts/content', get_post_format() );
?>
/*
* Include the Post-Format-specific template for the content.
* 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( 'template-parts/content', get_post_format() );

<?php endwhile; ?>
endwhile;

<?php popper_paging_nav(); ?>
popper_paging_nav();

<?php else : ?>
else :

<?php get_template_part( 'template-parts/content', 'none' ); ?>
get_template_part( 'template-parts/content', 'none' );

<?php endif; ?>
endif; ?>

</main><!-- #main -->
</div><!-- #primary -->
</main><!-- #main -->
</div><!-- #primary -->

<?php get_sidebar(); ?>
<?php get_footer(); ?>
<?php
get_sidebar();
get_footer();
?>
40 changes: 20 additions & 20 deletions comments.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* This is the template that displays the area of the page that contains both the current comments
* and the comment form.
*
* @link https://codex.wordpress.org/Template_Hierarchy
* @link https://codex.wordpress.org/Template_Hierarchy
*
* @package popper
*/
Expand All @@ -27,41 +27,41 @@
<?php if ( have_comments() ) : ?>
<h2 class="comments-title">
<?php
printf( // WPCS: XSS OK.
esc_html( _nx( 'One Comment', '%1$s Comments', get_comments_number(), 'comments title', 'popper' ) ),
number_format_i18n( get_comments_number() )
);
printf( // WPCS: XSS OK.
esc_html( _nx( 'One Comment', '%1$s Comments', get_comments_number(), 'comments title', 'popper' ) ),
number_format_i18n( get_comments_number() )
);
?>
</h2>

<ol class="comment-list">
<?php
wp_list_comments( array(
'style' => 'ol',
'short_ping' => true,
'avatar_size' => '96',
) );
wp_list_comments( array(
'style' => 'ol',
'short_ping' => true,
'avatar_size' => '96',
) );
?>
</ol><!-- .comment-list -->

<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
<nav id="comment-nav-below" class="navigation comment-navigation" role="navigation">
<h2 class="screen-reader-text"><?php esc_html_e( 'Comment navigation', 'popper' ); ?></h2>
<div class="nav-links">
<nav id="comment-nav-below" class="navigation comment-navigation" role="navigation">
<h2 class="screen-reader-text"><?php esc_html_e( 'Comment navigation', 'popper' ); ?></h2>
<div class="nav-links">

<div class="nav-previous"><?php previous_comments_link( esc_html__( 'Older Comments', 'popper' ) ); ?></div>
<div class="nav-next"><?php next_comments_link( esc_html__( 'Newer Comments', 'popper' ) ); ?></div>
<div class="nav-previous"><?php previous_comments_link( esc_html__( 'Older Comments', 'popper' ) ); ?></div>
<div class="nav-next"><?php next_comments_link( esc_html__( 'Newer Comments', 'popper' ) ); ?></div>

</div><!-- .nav-links -->
</nav><!-- #comment-nav-below -->
</div><!-- .nav-links -->
</nav><!-- #comment-nav-below -->
<?php endif; // Check for comment navigation. ?>

<?php endif; // Check for have_comments(). ?>

<?php
// If comments are closed and there are comments, let's leave a little note, shall we?
if ( ! comments_open() && get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) :
?>
// If comments are closed and there are comments, let's leave a little note, shall we?
if ( ! comments_open() && get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) :
?>
<p class="no-comments"><?php esc_html_e( 'Comments are closed.', 'popper' ); ?></p>
<?php endif; ?>

Expand Down
22 changes: 12 additions & 10 deletions footer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,24 @@
*
* Contains the closing of the #content div and all content after.
*
* @link https://developer.wordpress.org/themes/basics/template-files/#template-partials
* @link https://developer.wordpress.org/themes/basics/template-files/#template-partials
*
* @package popper
*/

?>

</div><!-- #content -->
</div><!-- #content -->

<footer id="colophon" class="site-footer" role="contentinfo">
<div class="site-info">
<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'popper' ) ); ?>"><?php printf( esc_html__( 'Proudly powered by %s', 'popper' ), 'WordPress' ); ?></a>
<?php echo apply_filters( 'popper_footer_link', sprintf(
'<span class="sep"> | </span>' . esc_html__( 'Theme: %1$s', 'popper' ),
'<a href="https://wordpress.org/themes/popper/" target="_none" rel="nofollow">Popper</a>'
) ); ?>
</div><!-- .site-info -->
</footer><!-- #colophon -->

<footer id="colophon" class="site-footer" role="contentinfo">
<div class="site-info">
<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'popper' ) ); ?>"><?php printf( esc_html__( 'Proudly powered by %s', 'popper' ), 'WordPress' ); ?></a>
<span class="sep"> | </span>
<?php printf( esc_html__( 'Theme: %1$s', 'popper' ), '<a href="https://wordpress.org/themes/popper/" rel="nofollow">Popper</a>' ); ?>
</div><!-- .site-info -->
</footer><!-- #colophon -->
</div><!-- #page -->

<?php wp_footer(); ?>
Expand Down
Loading

0 comments on commit fc8003c

Please sign in to comment.