rayelliott
/
_s
Archived
forked from mirror/_s
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into update-single-post-nav

This commit is contained in:
alaczek 2017-08-28 18:04:38 +10:00 committed by GitHub
parent c05e3ab6ec 9bf12e5851
commit 142e2d5030
41 changed files with 321 additions and 378 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
CONTRIBUTING.md → .github/CONTRIBUTING.md vendored
View File

6
.github/PULL_REQUEST_TEMPLATE.md vendored Normal file
View File

@ -0,0 +1,6 @@
<!-- Thanks for contributing to Underscores! Please provide as much information as possible with your Pull Request by filling out the following - this helps make reviewing much quicker! -->
#### Changes proposed in this Pull Request:
#### Related issue(s):

8
.travis.yml
View File

@ -8,6 +8,7 @@
# @link http://docs.travis-ci.com/user/migrating-from-legacy/#Why-migrate-to-container-based-infrastructure%3F
# @link http://docs.travis-ci.com/user/workers/container-based-infrastructure/#Routing-your-build-to-container-based-infrastructure
sudo: false
dist: trusty
# Declare project language.
# @link http://about.travis-ci.org/docs/user/languages/php/
@ -22,6 +23,7 @@ matrix:
# Current $required_php_version for WordPress: 5.2.4
# aliased to 5.2.17
- php: '5.2'
dist: precise
# aliased to a recent 5.6.x version
- php: '5.6'
env: SNIFF=1
@ -47,11 +49,11 @@ before_script:
- export PHPCS_DIR=/tmp/phpcs
- export SNIFFS_DIR=/tmp/sniffs
# Install CodeSniffer for WordPress Coding Standards checks.
- if [[ "$SNIFF" == "1" ]]; then git clone -b 2.9 --depth 1 https://github.com/squizlabs/PHP_CodeSniffer.git $PHPCS_DIR; fi
- if [[ "$SNIFF" == "1" ]]; then git clone -b 2.9.1 --depth 1 https://github.com/squizlabs/PHP_CodeSniffer.git $PHPCS_DIR; fi
# Install WordPress Coding Standards.
- if [[ "$SNIFF" == "1" ]]; then git clone -b master --depth 1 https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git $SNIFFS_DIR; fi
- if [[ "$SNIFF" == "1" ]]; then git clone -b 0.11.0 --depth 1 https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git $SNIFFS_DIR; fi
# Install PHP Compatibility sniffs.
- if [[ "$SNIFF" == "1" ]]; then git clone -b master --depth 1 https://github.com/wimg/PHPCompatibility.git $SNIFFS_DIR/PHPCompatibility; fi
- if [[ "$SNIFF" == "1" ]]; then git clone -b 7.1.5 --depth 1 https://github.com/wimg/PHPCompatibility.git $SNIFFS_DIR/PHPCompatibility; fi
# Set install path for PHPCS sniffs.
# @link https://github.com/squizlabs/PHP_CodeSniffer/blob/4237c2fc98cc838730b76ee9cee316f99286a2a7/CodeSniffer.php#L1941
- if [[ "$SNIFF" == "1" ]]; then $PHPCS_DIR/scripts/phpcs --config-set installed_paths $SNIFFS_DIR; fi

10
README.md
View File

@ -32,11 +32,11 @@ If you want to set things up manually, download `_s` from GitHub. The first thin
OR
* Search for: `'_s'` and replace with: `'megatherium-is-awesome'`
* Search for: `_s_` and replace with: `megatherium_is_awesome_`
* Search for: `Text Domain: _s` and replace with: `Text Domain: megatherium-is-awesome` in style.css.
* Search for: <code>&nbsp;_s</code> and replace with: <code>&nbsp;Megatherium_is_Awesome</code>
* Search for: `_s-` and replace with: `megatherium-is-awesome-`
1. Search for: `'_s'` and replace with: `'megatherium-is-awesome'`
2. Search for: `_s_` and replace with: `megatherium_is_awesome_`
3. Search for: `Text Domain: _s` and replace with: `Text Domain: megatherium-is-awesome` in style.css.
4. Search for: <code>&nbsp;_s</code> and replace with: <code>&nbsp;Megatherium_is_Awesome</code>
5. Search for: `_s-` and replace with: `megatherium-is-awesome-`
Then, update the stylesheet header in `style.css` and the links in `footer.php` with your own information. Next, update or delete this readme.

33
comments.php
View File

@ -45,17 +45,7 @@ if ( post_password_required() ) {
?>
</h2><!-- .comments-title -->
<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
<nav id="comment-nav-above" class="navigation comment-navigation">
<h2 class="screen-reader-text"><?php esc_html_e( 'Comment navigation', '_s' ); ?></h2>
<div class="nav-links">
<div class="nav-previous"><?php previous_comments_link( esc_html__( 'Older Comments', '_s' ) ); ?></div>
<div class="nav-next"><?php next_comments_link( esc_html__( 'Newer Comments', '_s' ) ); ?></div>
</div><!-- .nav-links -->
</nav><!-- #comment-nav-above -->
<?php endif; // Check for comment navigation. ?>
<?php the_comments_navigation(); ?>
<ol class="comment-list">
<?php
@ -66,29 +56,16 @@ if ( post_password_required() ) {
?>
</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">
<h2 class="screen-reader-text"><?php esc_html_e( 'Comment navigation', '_s' ); ?></h2>
<div class="nav-links">
<div class="nav-previous"><?php previous_comments_link( esc_html__( 'Older Comments', '_s' ) ); ?></div>
<div class="nav-next"><?php next_comments_link( esc_html__( 'Newer Comments', '_s' ) ); ?></div>
</div><!-- .nav-links -->
</nav><!-- #comment-nav-below -->
<?php
endif; // Check for comment navigation.
endif; // Check for have_comments().
<?php the_comments_navigation();
// 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_open() ) : ?>
<p class="no-comments"><?php esc_html_e( 'Comments are closed.', '_s' ); ?></p>
<?php
endif;
endif; // Check for have_comments().
comment_form();
?>

10
functions.php
View File

@ -8,14 +8,14 @@
*/
if ( ! function_exists( '_s_setup' ) ) :
/**
/**
* Sets up theme defaults and registers support for various WordPress features.
*
* Note that this function is hooked into the after_setup_theme hook, which
* runs before the init hook. The init hook is too late for some features, such
* as indicating support for post thumbnails.
*/
function _s_setup() {
function _s_setup() {
/*
* Make theme available for translation.
* Translations can be filed in the /languages/ directory.
@ -79,7 +79,7 @@ function _s_setup() {
'flex-width' => true,
'flex-height' => true,
) );
}
}
endif;
add_action( 'after_setup_theme', '_s_setup' );
@ -152,4 +152,6 @@ require get_template_directory() . '/inc/customizer.php';
/**
* Load Jetpack compatibility file.
*/
require get_template_directory() . '/inc/jetpack.php';
if ( defined( 'JETPACK__VERSION' ) ) {
require get_template_directory() . '/inc/jetpack.php';
}

11
header.php
View File

@ -9,14 +9,15 @@
* @package _s
*/
?><!doctype html>
?>
<!doctype html>
<html <?php language_attributes(); ?>>
<head>
<meta charset="<?php bloginfo( 'charset' ); ?>">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="profile" href="http://gmpg.org/xfn/11">
<meta charset="<?php bloginfo( 'charset' ); ?>">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="profile" href="http://gmpg.org/xfn/11">
<?php wp_head(); ?>
<?php wp_head(); ?>
</head>
<body <?php body_class(); ?>>

6
inc/custom-header.php
View File

@ -29,12 +29,12 @@ function _s_custom_header_setup() {
add_action( 'after_setup_theme', '_s_custom_header_setup' );
if ( ! function_exists( '_s_header_style' ) ) :
/**
/**
* Styles the header image and text displayed on the blog.
*
* @see _s_custom_header_setup().
*/
function _s_header_style() {
function _s_header_style() {
$header_text_color = get_header_textcolor();
/*
@ -68,5 +68,5 @@ function _s_header_style() {
<?php endif; ?>
</style>
<?php
}
}
endif;

2
inc/customizer.php
View File

@ -50,6 +50,6 @@ function _s_customize_partial_blogdescription() {
* Binds JS handlers to make Theme Customizer preview reload changes asynchronously.
*/
function _s_customize_preview_js() {
wp_enqueue_script( '_s_customizer', get_template_directory_uri() . '/js/customizer.js', array( 'customize-preview' ), '20151215', true );
wp_enqueue_script( '_s-customizer', get_template_directory_uri() . '/js/customizer.js', array( 'customize-preview' ), '20151215', true );
}
add_action( 'customize_preview_init', '_s_customize_preview_js' );

12
inc/template-tags.php
View File

@ -8,10 +8,10 @@
*/
if ( ! function_exists( '_s_posted_on' ) ) :
/**
/**
* Prints HTML with meta information for the current post-date/time and author.
*/
function _s_posted_on() {
function _s_posted_on() {
$time_string = '<time class="entry-date published updated" datetime="%1$s">%2$s</time>';
if ( get_the_time( 'U' ) !== get_the_modified_time( 'U' ) ) {
$time_string = '<time class="entry-date published" datetime="%1$s">%2$s</time><time class="updated" datetime="%3$s">%4$s</time>';
@ -38,14 +38,14 @@ function _s_posted_on() {
echo '<span class="posted-on">' . $posted_on . '</span><span class="byline"> ' . $byline . '</span>'; // WPCS: XSS OK.
}
}
endif;
if ( ! function_exists( '_s_entry_footer' ) ) :
/**
/**
* Prints HTML with meta information for the categories, tags and comments.
*/
function _s_entry_footer() {
function _s_entry_footer() {
// Hide category and tag text for pages.
if ( 'post' === get_post_type() ) {
/* translators: used between list items, there is a space after the comma */
@ -98,5 +98,5 @@ function _s_entry_footer() {
'<span class="edit-link">',
'</span>'
);
}
}
endif;

167
languages/_s.pot
View File

@ -5,114 +5,73 @@ msgstr ""
"Project-Id-Version: _s 1.0.0\n"
"Report-Msgid-Bugs-To: https://wordpress.org/tags/_s\n"
"POT-Creation-Date: 2016-12-23 16:00+0100\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"PO-Revision-Date: 2016-12-23 16:00+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
"PO-Revision-Date: 2017-MO-DA HO:MI+ZONE\n"
"Last-Translator:\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"X-Generator: grunt-wp-i18n 0.5.4\n"
#: 404.php:17
#@ _s
msgid "Oops! That page can&rsquo;t be found."
msgstr ""
#: 404.php:21
#@ _s
msgid "It looks like nothing was found at this location. Maybe try one of the links below or a search?"
msgid ""
"It looks like nothing was found at this location. Maybe try one of the "
"links below or a search?"
msgstr ""
#: 404.php:33
#@ _s
#: 404.php:30
msgid "Most Used Categories"
msgstr ""
#: 404.php:47
#. translators: %1$s: smiley
#: 404.php:51
#, php-format
#@ _s
msgid "Try looking in the monthly archives. %1$s"
msgstr ""
#. translators: 1: title.
#: comments.php:34
#, php-format
#@ _s
#. translators: 1: title.
msgid "One thought on &ldquo;%1$s&rdquo;"
msgstr ""
#. translators: 1: comment count number, 2: title.
#: comments.php:40
#, php-format
#@ _s
msgctxt "comments title"
msgid "%1$s thought on &ldquo;%2$s&rdquo;"
msgid_plural "%1$s thoughts on &ldquo;%2$s&rdquo;"
msgstr[0] ""
msgstr[1] ""
#: comments.php:50 comments.php:71
#@ _s
msgid "Comment navigation"
msgstr ""
#: comments.php:53 comments.php:74
#@ _s
msgid "Older Comments"
msgstr ""
#: comments.php:54 comments.php:75
#@ _s
msgid "Newer Comments"
msgstr ""
#: comments.php:88
#@ _s
#: comments.php:67
msgid "Comments are closed."
msgstr ""
#: footer.php:18
#@ _s
msgid "https://wordpress.org/"
msgstr ""
#. translators: %s: CMS name, i.e. WordPress.
#: footer.php:20
#, php-format
#@ _s
#. translators: %s: CMS name, i.e. WordPress.
msgid "Proudly powered by %s"
msgstr ""
#. translators: 1: Theme name, 2: Theme author.
#: footer.php:25
#, php-format
#@ _s
#. translators: 1: Theme name, 2: Theme author.
msgid "Theme: %1$s by %2$s."
msgstr ""
#: functions.php:47
#@ _s
msgid "Primary"
msgstr ""
#: functions.php:93
#@ _s
#: functions.php:105
msgid "Sidebar"
msgstr ""
#: functions.php:95
#@ _s
#: functions.php:107
msgid "Add widgets here."
msgstr ""
#: header.php:24
#@ _s
msgid "Skip to content"
msgstr ""
#: header.php:44
#@ _s
#: header.php:45
msgid "Primary Menu"
msgstr ""
@ -132,116 +91,112 @@ msgctxt "post date"
msgid "Posted on %s"
msgstr ""
#. translators: %s: post author.
#: inc/template-tags.php:35
#, php-format
#@ _s
msgctxt "post author"
msgid "by %s"
msgstr ""
#. translators: used between list items, there is a space after the comma
#: inc/template-tags.php:52
#@ _s
#. translators: used between list items, there is a space after the comma
msgid ", "
msgstr ""
#. translators: 1: list of categories.
#: inc/template-tags.php:55
#, php-format
#@ _s
#. translators: 1: list of categories.
msgid "Posted in %1$s"
msgstr ""
#. translators: used between list items, there is a space after the comma
#: inc/template-tags.php:59
#, php-format
#@ _s
msgctxt "list item separator"
msgid ", "
msgstr ""
#. translators: 1: list of tags.
#: inc/template-tags.php:62
#. translators: 1: list of tags.
msgid "Tagged %1$s"
msgstr ""
#. translators: %s: post title
#: inc/template-tags.php:72
#, php-format
#@ _s
#. translators: %s: post title
msgid "Leave a Comment<span class=\"screen-reader-text\"> on %s</span>"
msgstr ""
#. translators: %s: Name of current post. Only visible to screen readers
#: inc/template-tags.php:89 template-parts/content-page.php:35
#, php-format
#@ _s
#. translators: %s: Name of current post. Only visible to screen readers
msgid "Edit <span class=\"screen-reader-text\">%s</span>"
msgstr ""
#. translators: %s: search query.
#: search.php:21
#, php-format
#@ _s
#. translators: %s: search query.
msgid "Search Results for: %s"
msgstr ""
#: template-parts/content-none.php:14
#@ _s
msgid "Nothing Found"
msgstr ""
#. translators: 1: link to WP admin new post page.
#: template-parts/content-none.php:25
#, php-format
#@ _s
#. translators: 1: link to WP admin new post page.
msgid "Ready to publish your first post? <a href=\"%1$s\">Get started here</a>."
msgstr ""
#: template-parts/content-none.php:38
#@ _s
msgid "Sorry, but nothing matched your search terms. Please try again with some different keywords."
msgid ""
"Sorry, but nothing matched your search terms. Please try again with some "
"different keywords."
msgstr ""
#: template-parts/content-none.php:44
#@ _s
msgid "It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help."
msgid ""
"It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps "
"searching can help."
msgstr ""
#@ _s
#: template-parts/content-page.php:22 template-parts/content.php:45
msgid "Pages:"
msgstr ""
#. translators: %s: Name of current post. Only visible to screen readers
#: template-parts/content.php:34
#, php-format
#@ _s
#. translators: %s: Name of current post. Only visible to screen readers
msgid "Continue reading<span class=\"screen-reader-text\"> \"%s\"</span>"
msgstr ""
#. Theme Name of the plugin/theme
#@ _s
msgid "_s"
msgstr ""
#. Theme URI of the plugin/theme
#@ _s
msgid "http://underscores.me/"
msgstr ""
#. Description of the plugin/theme
#@ _s
msgid "Hi. I'm a starter theme called <code>_s</code>, or <em>underscores</em>, if you like. I'm a theme meant for hacking so don't use me as a <em>Parent Theme</em>. Instead try turning me into the next, most awesome, WordPress theme out there. That's what I'm here for."
msgid ""
"Hi. I'm a starter theme called <code>_s</code>, or <em>underscores</em>, if "
"you like. I'm a theme meant for hacking so don't use me as a <em>Parent "
"Theme</em>. Instead try turning me into the next, most awesome, WordPress "
"theme out there. That's what I'm here for."
msgstr ""
#. Author of the plugin/theme
#@ _s
msgid "Automattic"
msgstr ""
#. Author URI of the plugin/theme
#@ _s
msgid "http://automattic.com/"
msgstr ""
#: comments.php:40
#. translators: 1: comment count number, 2: title.
msgctxt "comments title"
msgid "%1$s thought on &ldquo;%2$s&rdquo;"
msgid_plural "%1$s thoughts on &ldquo;%2$s&rdquo;"
msgstr[0] ""
msgstr[1] ""
#: inc/template-tags.php:29
#. translators: %s: post date.
msgctxt "post date"
msgid "Posted on %s"
msgstr ""
#: inc/template-tags.php:35
#. translators: %s: post author.
msgctxt "post author"
msgid "by %s"
msgstr ""
#: inc/template-tags.php:59
#. translators: used between list items, there is a space after the comma
msgctxt "list item separator"
msgid ", "
msgstr ""

4
phpcs.xml.dist
View File

@ -16,8 +16,8 @@
-->
<arg value="psvn"/>
<!-- Only check the PHP files. JS files are checked separately with JSCS and JSHint. -->
<arg name="extensions" value="php"/>
<!-- Only check the PHP, CSS and SCSS files. JS files are checked separately with JSCS and JSHint. -->
<arg name="extensions" value="php,css,scss/css"/>
<!-- Check all files in this directory and the directories below it. -->
<file>.</file>

2
readme.txt
View File

@ -1,7 +1,7 @@
=== _s ===
Contributors: automattic
Tags:
Tags: custom-background, custom-logo, custom-menu, featured-images, threaded-comments, translation-ready
Requires at least: 4.0
Tested up to: 4.8

2
sass/media/_galleries.scss
View File

@ -10,7 +10,7 @@
// Loops to enumerate the classes for gallery columns.
@for $i from 2 through 9 {
.gallery-columns-#{$i} {
.gallery-columns-#{$i} & {
max-width: ( 100% / $i );
}
}

2
sass/media/_media.scss
View File

@ -15,7 +15,7 @@ object {
}
/* Make sure logo link wraps around logo image. */
.custom-logo-link{
.custom-logo-link {
display: inline-block;
}

2
sass/site/primary/_posts-and-pages.scss
View File

@ -6,7 +6,7 @@
margin: 0 0 1.5em;
}
.updated:not(.published){
.updated:not(.published) {
display: none;
}

2
sass/style.scss
View File

@ -8,7 +8,7 @@ Version: 1.0.0
License: GNU General Public License v2 or later
License URI: LICENSE
Text Domain: _s
Tags:
Tags: custom-background, custom-logo, custom-menu, featured-images, threaded-comments, translation-ready
This theme, like WordPress, is licensed under the GPL.
Use it to make something cool, have fun, and share what you've learned with others.

2
single.php
View File

@ -15,7 +15,7 @@ get_header(); ?>
<?php
while ( have_posts() ) : the_post();
get_template_part( 'template-parts/content', get_post_format() );
get_template_part( 'template-parts/content', get_post_type() );
the_post_navigation( array(
'prev_text' => '<span class="nav-subtitle">' . __( 'Previous:', '_s' ) . '</span> <span class="nav-title">%title</span>',

4
style.css
View File

@ -8,7 +8,7 @@ Version: 1.0.0
License: GNU General Public License v2 or later
License URI: LICENSE
Text Domain: _s
Tags:
Tags: custom-background, custom-logo, custom-menu, featured-images, threaded-comments, translation-ready
This theme, like WordPress, is licensed under the GPL.
Use it to make something cool, have fun, and share what you've learned with others.
@ -818,7 +818,7 @@ object {
}
/* Make sure logo link wraps around logo image. */
.custom-logo-link{
.custom-logo-link {
display: inline-block;
}