forked from mirror/_s
Fixed merge conflicts.
This commit is contained in:
commit
ec2a5e212a
|
@ -26,14 +26,14 @@ env:
|
||||||
# @link https://github.com/WordPress/WordPress
|
# @link https://github.com/WordPress/WordPress
|
||||||
- WP_VERSION=master WP_MULTISITE=0
|
- WP_VERSION=master WP_MULTISITE=0
|
||||||
- WP_VERSION=master WP_MULTISITE=1
|
- WP_VERSION=master WP_MULTISITE=1
|
||||||
|
# WordPress 4.1
|
||||||
|
# @link https://github.com/WordPress/WordPress/tree/4.1-branch
|
||||||
|
- WP_VERSION=4.1 WP_MULTISITE=0
|
||||||
|
- WP_VERSION=4.1 WP_MULTISITE=1
|
||||||
# WordPress 4.0
|
# WordPress 4.0
|
||||||
# @link https://github.com/WordPress/WordPress/tree/4.0-branch
|
# @link https://github.com/WordPress/WordPress/tree/4.0-branch
|
||||||
- WP_VERSION=4.0 WP_MULTISITE=0
|
- WP_VERSION=4.0 WP_MULTISITE=0
|
||||||
- WP_VERSION=4.0 WP_MULTISITE=1
|
- WP_VERSION=4.0 WP_MULTISITE=1
|
||||||
# WordPress 3.9
|
|
||||||
# @link https://github.com/WordPress/WordPress/tree/3.9-branch
|
|
||||||
- WP_VERSION=3.9 WP_MULTISITE=0
|
|
||||||
- WP_VERSION=3.9 WP_MULTISITE=1
|
|
||||||
|
|
||||||
# Declare 5.6 beta in test matrix.
|
# Declare 5.6 beta in test matrix.
|
||||||
# @link https://buddypress.trac.wordpress.org/ticket/5620
|
# @link https://buddypress.trac.wordpress.org/ticket/5620
|
||||||
|
|
|
@ -34,7 +34,7 @@ get_header(); ?>
|
||||||
|
|
||||||
<?php endwhile; ?>
|
<?php endwhile; ?>
|
||||||
|
|
||||||
<?php _s_paging_nav(); ?>
|
<?php the_posts_navigation(); ?>
|
||||||
|
|
||||||
<?php else : ?>
|
<?php else : ?>
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<ruleset name="Underscores WordPress Theme Coding Standards Configuration">
|
<ruleset name="Underscores WordPress Theme Coding Standards Configuration">
|
||||||
<!-- See https://github.com/squizlabs/PHP_CodeSniffer/wiki/Annotated-ruleset.xml -->
|
<!-- See https://github.com/squizlabs/PHP_CodeSniffer/wiki/Annotated-ruleset.xml -->
|
||||||
|
<!-- See https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/blob/develop/WordPress-Core/ruleset.xml -->
|
||||||
|
|
||||||
<!-- Set a description for this ruleset. -->
|
<!-- Set a description for this ruleset. -->
|
||||||
<description>A custom set of code standard rules to check for Underscores.</description>
|
<description>A custom set of code standard rules to check for Underscores.</description>
|
||||||
|
@ -8,6 +9,8 @@
|
||||||
<!-- Include the WordPress ruleset, with exclusions. -->
|
<!-- Include the WordPress ruleset, with exclusions. -->
|
||||||
<rule ref="WordPress">
|
<rule ref="WordPress">
|
||||||
<exclude name="Generic.WhiteSpace.ScopeIndent.Incorrect" />
|
<exclude name="Generic.WhiteSpace.ScopeIndent.Incorrect" />
|
||||||
|
<exclude name="PEAR.Functions.FunctionCallSignature.Indent" />
|
||||||
|
<exclude name="Generic.WhiteSpace.ScopeIndent.IncorrectExact" />
|
||||||
|
|
||||||
<exclude name="WordPress.XSS.EscapeOutput" />
|
<exclude name="WordPress.XSS.EscapeOutput" />
|
||||||
<exclude name="WordPress.WhiteSpace.ScopeIndent.Incorrect" />
|
<exclude name="WordPress.WhiteSpace.ScopeIndent.Incorrect" />
|
||||||
|
|
|
@ -7,18 +7,6 @@
|
||||||
* @package _s
|
* @package _s
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
|
||||||
* Get our wp_nav_menu() fallback, wp_page_menu(), to show a home link.
|
|
||||||
*
|
|
||||||
* @param array $args Configuration arguments.
|
|
||||||
* @return array
|
|
||||||
*/
|
|
||||||
function _s_page_menu_args( $args ) {
|
|
||||||
$args['show_home'] = true;
|
|
||||||
return $args;
|
|
||||||
}
|
|
||||||
add_filter( 'wp_page_menu_args', '_s_page_menu_args' );
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Adds custom classes to the array of body classes.
|
* Adds custom classes to the array of body classes.
|
||||||
*
|
*
|
||||||
|
@ -81,24 +69,3 @@ if ( version_compare( $GLOBALS['wp_version'], '4.1', '<' ) ) :
|
||||||
}
|
}
|
||||||
add_action( 'wp_head', '_s_render_title' );
|
add_action( 'wp_head', '_s_render_title' );
|
||||||
endif;
|
endif;
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets the authordata global when viewing an author archive.
|
|
||||||
*
|
|
||||||
* This provides backwards compatibility with
|
|
||||||
* http://core.trac.wordpress.org/changeset/25574
|
|
||||||
*
|
|
||||||
* It removes the need to call the_post() and rewind_posts() in an author
|
|
||||||
* template to print information about the author.
|
|
||||||
*
|
|
||||||
* @global WP_Query $wp_query WordPress Query object.
|
|
||||||
* @return void
|
|
||||||
*/
|
|
||||||
function _s_setup_author() {
|
|
||||||
global $wp_query;
|
|
||||||
|
|
||||||
if ( $wp_query->is_author() && isset( $wp_query->post ) ) {
|
|
||||||
$GLOBALS['authordata'] = get_userdata( $wp_query->post->post_author );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
add_action( 'wp', '_s_setup_author' );
|
|
||||||
|
|
|
@ -7,26 +7,28 @@
|
||||||
* @package _s
|
* @package _s
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if ( ! function_exists( '_s_paging_nav' ) ) :
|
if ( ! function_exists( 'the_posts_navigation' ) ) :
|
||||||
/**
|
/**
|
||||||
* Display navigation to next/previous set of posts when applicable.
|
* Display navigation to next/previous set of posts when applicable.
|
||||||
|
*
|
||||||
|
* @todo Remove this function when WordPress 4.3 is released.
|
||||||
*/
|
*/
|
||||||
function _s_paging_nav() {
|
function the_posts_navigation() {
|
||||||
// Don't print empty markup if there's only one page.
|
// Don't print empty markup if there's only one page.
|
||||||
if ( $GLOBALS['wp_query']->max_num_pages < 2 ) {
|
if ( $GLOBALS['wp_query']->max_num_pages < 2 ) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<nav class="navigation paging-navigation" role="navigation">
|
<nav class="navigation posts-navigation" role="navigation">
|
||||||
<h1 class="screen-reader-text"><?php _e( 'Posts navigation', '_s' ); ?></h1>
|
<h2 class="screen-reader-text"><?php _e( 'Posts navigation', '_s' ); ?></h2>
|
||||||
<div class="nav-links">
|
<div class="nav-links">
|
||||||
|
|
||||||
<?php if ( get_next_posts_link() ) : ?>
|
<?php if ( get_next_posts_link() ) : ?>
|
||||||
<div class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">←</span> Older posts', '_s' ) ); ?></div>
|
<div class="nav-previous"><?php next_posts_link( __( 'Older posts', '_s' ) ); ?></div>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
|
|
||||||
<?php if ( get_previous_posts_link() ) : ?>
|
<?php if ( get_previous_posts_link() ) : ?>
|
||||||
<div class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">→</span>', '_s' ) ); ?></div>
|
<div class="nav-next"><?php previous_posts_link( __( 'Newer posts', '_s' ) ); ?></div>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
|
|
||||||
</div><!-- .nav-links -->
|
</div><!-- .nav-links -->
|
||||||
|
@ -35,11 +37,13 @@ function _s_paging_nav() {
|
||||||
}
|
}
|
||||||
endif;
|
endif;
|
||||||
|
|
||||||
if ( ! function_exists( '_s_post_nav' ) ) :
|
if ( ! function_exists( 'the_post_navigation' ) ) :
|
||||||
/**
|
/**
|
||||||
* Display navigation to next/previous post when applicable.
|
* Display navigation to next/previous post when applicable.
|
||||||
|
*
|
||||||
|
* @todo Remove this function when WordPress 4.3 is released.
|
||||||
*/
|
*/
|
||||||
function _s_post_nav() {
|
function the_post_navigation() {
|
||||||
// Don't print empty markup if there's nowhere to navigate.
|
// Don't print empty markup if there's nowhere to navigate.
|
||||||
$previous = ( is_attachment() ) ? get_post( get_post()->post_parent ) : get_adjacent_post( false, '', true );
|
$previous = ( is_attachment() ) ? get_post( get_post()->post_parent ) : get_adjacent_post( false, '', true );
|
||||||
$next = get_adjacent_post( false, '', false );
|
$next = get_adjacent_post( false, '', false );
|
||||||
|
@ -49,11 +53,11 @@ function _s_post_nav() {
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<nav class="navigation post-navigation" role="navigation">
|
<nav class="navigation post-navigation" role="navigation">
|
||||||
<h1 class="screen-reader-text"><?php _e( 'Post navigation', '_s' ); ?></h1>
|
<h2 class="screen-reader-text"><?php _e( 'Post navigation', '_s' ); ?></h2>
|
||||||
<div class="nav-links">
|
<div class="nav-links">
|
||||||
<?php
|
<?php
|
||||||
previous_post_link( '<div class="nav-previous">%link</div>', _x( '<span class="meta-nav">←</span> %title', 'Previous post link', '_s' ) );
|
previous_post_link( '<div class="nav-previous">%link</div>', '%title' );
|
||||||
next_post_link( '<div class="nav-next">%link</div>', _x( '%title <span class="meta-nav">→</span>', 'Next post link', '_s' ) );
|
next_post_link( '<div class="nav-next">%link</div>', '%title' );
|
||||||
?>
|
?>
|
||||||
</div><!-- .nav-links -->
|
</div><!-- .nav-links -->
|
||||||
</nav><!-- .navigation -->
|
</nav><!-- .navigation -->
|
||||||
|
|
|
@ -31,7 +31,7 @@ get_header(); ?>
|
||||||
|
|
||||||
<?php endwhile; ?>
|
<?php endwhile; ?>
|
||||||
|
|
||||||
<?php _s_paging_nav(); ?>
|
<?php the_posts_navigation(); ?>
|
||||||
|
|
||||||
<?php else : ?>
|
<?php else : ?>
|
||||||
|
|
||||||
|
|
|
@ -8,8 +8,9 @@
|
||||||
var element = document.getElementById( location.hash.substring( 1 ) );
|
var element = document.getElementById( location.hash.substring( 1 ) );
|
||||||
|
|
||||||
if ( element ) {
|
if ( element ) {
|
||||||
if ( ! /^(?:a|select|input|button|textarea)$/i.test( element.tagName ) )
|
if ( ! /^(?:a|select|input|button|textarea)$/i.test( element.tagName ) ) {
|
||||||
element.tabIndex = -1;
|
element.tabIndex = -1;
|
||||||
|
}
|
||||||
|
|
||||||
element.focus();
|
element.focus();
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
# Copyright (C) 2014 Automattic
|
# Copyright (C) 2015 Automattic
|
||||||
# This file is distributed under the GNU General Public License v2 or later.
|
# This file is distributed under the GNU General Public License v2 or later.
|
||||||
msgid ""
|
msgid ""
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Project-Id-Version: _s 1.0-wpcom\n"
|
"Project-Id-Version: _s 1.0.0\n"
|
||||||
"Report-Msgid-Bugs-To: http://wordpress.org/support/theme/_s\n"
|
"Report-Msgid-Bugs-To: http://wordpress.org/tags/_s\n"
|
||||||
"POT-Creation-Date: 2014-12-03 09:43:15+00:00\n"
|
"POT-Creation-Date: 2015-01-06 02:24:02+00:00\n"
|
||||||
"MIME-Version: 1.0\n"
|
"MIME-Version: 1.0\n"
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
"Content-Transfer-Encoding: 8bit\n"
|
"Content-Transfer-Encoding: 8bit\n"
|
||||||
"PO-Revision-Date: 2014-MO-DA HO:MI+ZONE\n"
|
"PO-Revision-Date: 2015-MO-DA HO:MI+ZONE\n"
|
||||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||||
|
|
||||||
|
@ -73,7 +73,7 @@ msgstr ""
|
||||||
msgid "Pages:"
|
msgid "Pages:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: content-page.php:25 inc/template-tags.php:122
|
#: content-page.php:25 inc/template-tags.php:126
|
||||||
msgid "Edit"
|
msgid "Edit"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -111,163 +111,152 @@ msgstr ""
|
||||||
msgid "Page %s"
|
msgid "Page %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:21
|
#: inc/template-tags.php:23
|
||||||
msgid "Posts navigation"
|
msgid "Posts navigation"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:25
|
#: inc/template-tags.php:27
|
||||||
msgid "<span class=\"meta-nav\">←</span> Older posts"
|
msgid "Older posts"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:29
|
#: inc/template-tags.php:31
|
||||||
msgid "Newer posts <span class=\"meta-nav\">→</span>"
|
msgid "Newer posts"
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#: inc/template-tags.php:52
|
|
||||||
msgid "Post navigation"
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#: inc/template-tags.php:55
|
|
||||||
msgctxt "Previous post link"
|
|
||||||
msgid "<span class=\"meta-nav\">←</span> %title"
|
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:56
|
#: inc/template-tags.php:56
|
||||||
msgctxt "Next post link"
|
msgid "Post navigation"
|
||||||
msgid "%title <span class=\"meta-nav\">→</span>"
|
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:82
|
#: inc/template-tags.php:86
|
||||||
msgctxt "post date"
|
msgctxt "post date"
|
||||||
msgid "Posted on %s"
|
msgid "Posted on %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:87
|
#: inc/template-tags.php:91
|
||||||
msgctxt "post author"
|
msgctxt "post author"
|
||||||
msgid "by %s"
|
msgid "by %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. translators: used between list items, there is a space after the comma
|
#. translators: used between list items, there is a space after the comma
|
||||||
|
#: inc/template-tags.php:108 inc/template-tags.php:114
|
||||||
#: inc/template-tags.php:104 inc/template-tags.php:110
|
|
||||||
msgid ", "
|
msgid ", "
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:106
|
#: inc/template-tags.php:110
|
||||||
msgid "Posted in %1$s"
|
msgid "Posted in %1$s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:112
|
#: inc/template-tags.php:116
|
||||||
msgid "Tagged %1$s"
|
msgid "Tagged %1$s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:118
|
#: inc/template-tags.php:122
|
||||||
msgid "Leave a comment"
|
msgid "Leave a comment"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:118
|
#: inc/template-tags.php:122
|
||||||
msgid "1 Comment"
|
msgid "1 Comment"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:118
|
#: inc/template-tags.php:122
|
||||||
msgid "% Comments"
|
msgid "% Comments"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:139
|
#: inc/template-tags.php:143
|
||||||
msgid "Category: %s"
|
msgid "Category: %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:141
|
#: inc/template-tags.php:145
|
||||||
msgid "Tag: %s"
|
msgid "Tag: %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:143
|
#: inc/template-tags.php:147
|
||||||
msgid "Author: %s"
|
msgid "Author: %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:145
|
#: inc/template-tags.php:149
|
||||||
msgid "Year: %s"
|
msgid "Year: %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:145
|
#: inc/template-tags.php:149
|
||||||
msgctxt "yearly archives date format"
|
msgctxt "yearly archives date format"
|
||||||
msgid "Y"
|
msgid "Y"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:147
|
#: inc/template-tags.php:151
|
||||||
msgid "Month: %s"
|
msgid "Month: %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:147
|
#: inc/template-tags.php:151
|
||||||
msgctxt "monthly archives date format"
|
msgctxt "monthly archives date format"
|
||||||
msgid "F Y"
|
msgid "F Y"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:149
|
#: inc/template-tags.php:153
|
||||||
msgid "Day: %s"
|
msgid "Day: %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:149
|
#: inc/template-tags.php:153
|
||||||
msgctxt "daily archives date format"
|
msgctxt "daily archives date format"
|
||||||
msgid "F j, Y"
|
msgid "F j, Y"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:151
|
#: inc/template-tags.php:155
|
||||||
msgctxt "post format archive title"
|
msgctxt "post format archive title"
|
||||||
msgid "Asides"
|
msgid "Asides"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:153
|
#: inc/template-tags.php:157
|
||||||
msgctxt "post format archive title"
|
msgctxt "post format archive title"
|
||||||
msgid "Galleries"
|
msgid "Galleries"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:155
|
#: inc/template-tags.php:159
|
||||||
msgctxt "post format archive title"
|
msgctxt "post format archive title"
|
||||||
msgid "Images"
|
msgid "Images"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:157
|
#: inc/template-tags.php:161
|
||||||
msgctxt "post format archive title"
|
msgctxt "post format archive title"
|
||||||
msgid "Videos"
|
msgid "Videos"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:159
|
#: inc/template-tags.php:163
|
||||||
msgctxt "post format archive title"
|
msgctxt "post format archive title"
|
||||||
msgid "Quotes"
|
msgid "Quotes"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:161
|
#: inc/template-tags.php:165
|
||||||
msgctxt "post format archive title"
|
msgctxt "post format archive title"
|
||||||
msgid "Links"
|
msgid "Links"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:163
|
#: inc/template-tags.php:167
|
||||||
msgctxt "post format archive title"
|
msgctxt "post format archive title"
|
||||||
msgid "Statuses"
|
msgid "Statuses"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:165
|
#: inc/template-tags.php:169
|
||||||
msgctxt "post format archive title"
|
msgctxt "post format archive title"
|
||||||
msgid "Audio"
|
msgid "Audio"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:167
|
#: inc/template-tags.php:171
|
||||||
msgctxt "post format archive title"
|
msgctxt "post format archive title"
|
||||||
msgid "Chats"
|
msgid "Chats"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:169
|
#: inc/template-tags.php:173
|
||||||
msgid "Archives: %s"
|
msgid "Archives: %s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#. translators: 1: Taxonomy singular name, 2: Current taxonomy term
|
#. translators: 1: Taxonomy singular name, 2: Current taxonomy term
|
||||||
|
|
||||||
#: inc/template-tags.php:173
|
#: inc/template-tags.php:177
|
||||||
msgid "%1$s: %2$s"
|
msgid "%1$s: %2$s"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: inc/template-tags.php:175
|
#: inc/template-tags.php:179
|
||||||
msgid "Archives"
|
msgid "Archives"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,8 @@
|
||||||
// Center block
|
// Center block
|
||||||
@mixin center-block {
|
@mixin center-block {
|
||||||
display: block;
|
display: block;
|
||||||
margin: 0 auto;
|
margin-left: auto;
|
||||||
|
margin-right: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Clearfix
|
// Clearfix
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/* Globally hidden elements when Infinite Scroll is supported and in use. */
|
/* Globally hidden elements when Infinite Scroll is supported and in use. */
|
||||||
.infinite-scroll .paging-navigation, /* Older / Newer Posts Navigation (always hidden). */
|
.infinite-scroll .posts-navigation, /* Older / Newer Posts Navigation (always hidden) */
|
||||||
.infinite-scroll.neverending .site-footer { /* Theme Footer (when set to scrolling). */
|
.infinite-scroll.neverending .site-footer { /* Theme Footer (when set to scrolling) */
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -78,21 +78,21 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.site-main .comment-navigation,
|
.site-main .comment-navigation,
|
||||||
.site-main .paging-navigation,
|
.site-main .posts-navigation,
|
||||||
.site-main .post-navigation {
|
.site-main .post-navigation {
|
||||||
margin: 0 0 1.5em;
|
margin: 0 0 1.5em;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
.comment-navigation .nav-previous,
|
.comment-navigation .nav-previous,
|
||||||
.paging-navigation .nav-previous,
|
.posts-navigation .nav-previous,
|
||||||
.post-navigation .nav-previous {
|
.post-navigation .nav-previous {
|
||||||
float: left;
|
float: left;
|
||||||
width: 50%;
|
width: 50%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.comment-navigation .nav-next,
|
.comment-navigation .nav-next,
|
||||||
.paging-navigation .nav-next,
|
.posts-navigation .nav-next,
|
||||||
.post-navigation .nav-next {
|
.post-navigation .nav-next {
|
||||||
float: right;
|
float: right;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
|
|
|
@ -4,7 +4,7 @@ Theme URI: http://underscores.me/
|
||||||
Author: Automattic
|
Author: Automattic
|
||||||
Author URI: http://automattic.com/
|
Author URI: http://automattic.com/
|
||||||
Description: 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.
|
Description: 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.
|
||||||
Version: 1.0-wpcom
|
Version: 1.0.0
|
||||||
License: GNU General Public License v2 or later
|
License: GNU General Public License v2 or later
|
||||||
License URI: http://www.gnu.org/licenses/gpl-2.0.html
|
License URI: http://www.gnu.org/licenses/gpl-2.0.html
|
||||||
Text Domain: _s
|
Text Domain: _s
|
||||||
|
@ -13,7 +13,7 @@ Tags:
|
||||||
This theme, like WordPress, is licensed under the GPL.
|
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.
|
Use it to make something cool, have fun, and share what you've learned with others.
|
||||||
|
|
||||||
_s is based on Underscores http://underscores.me/, (C) 2012-2014 Automattic, Inc.
|
_s is based on Underscores http://underscores.me/, (C) 2012-2015 Automattic, Inc.
|
||||||
|
|
||||||
Normalizing styles have been helped along thanks to the fine work of
|
Normalizing styles have been helped along thanks to the fine work of
|
||||||
Nicolas Gallagher and Jonathan Neal http://necolas.github.com/normalize.css/
|
Nicolas Gallagher and Jonathan Neal http://necolas.github.com/normalize.css/
|
||||||
|
|
|
@ -30,7 +30,7 @@ get_header(); ?>
|
||||||
|
|
||||||
<?php endwhile; ?>
|
<?php endwhile; ?>
|
||||||
|
|
||||||
<?php _s_paging_nav(); ?>
|
<?php the_posts_navigation(); ?>
|
||||||
|
|
||||||
<?php else : ?>
|
<?php else : ?>
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@ get_header(); ?>
|
||||||
|
|
||||||
<?php get_template_part( 'content', 'single' ); ?>
|
<?php get_template_part( 'content', 'single' ); ?>
|
||||||
|
|
||||||
<?php _s_post_nav(); ?>
|
<?php the_post_navigation(); ?>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
// If comments are open or we have at least one comment, load up the comment template
|
// If comments are open or we have at least one comment, load up the comment template
|
||||||
|
|
17
style.css
17
style.css
|
@ -4,7 +4,7 @@ Theme URI: http://underscores.me/
|
||||||
Author: Automattic
|
Author: Automattic
|
||||||
Author URI: http://automattic.com/
|
Author URI: http://automattic.com/
|
||||||
Description: 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.
|
Description: 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.
|
||||||
Version: 1.0-wpcom
|
Version: 1.0.0
|
||||||
License: GNU General Public License v2 or later
|
License: GNU General Public License v2 or later
|
||||||
License URI: http://www.gnu.org/licenses/gpl-2.0.html
|
License URI: http://www.gnu.org/licenses/gpl-2.0.html
|
||||||
Text Domain: _s
|
Text Domain: _s
|
||||||
|
@ -13,7 +13,7 @@ Tags:
|
||||||
This theme, like WordPress, is licensed under the GPL.
|
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.
|
Use it to make something cool, have fun, and share what you've learned with others.
|
||||||
|
|
||||||
_s is based on Underscores http://underscores.me/, (C) 2012-2014 Automattic, Inc.
|
_s is based on Underscores http://underscores.me/, (C) 2012-2015 Automattic, Inc.
|
||||||
|
|
||||||
Normalizing styles have been helped along thanks to the fine work of
|
Normalizing styles have been helped along thanks to the fine work of
|
||||||
Nicolas Gallagher and Jonathan Neal http://necolas.github.com/normalize.css/
|
Nicolas Gallagher and Jonathan Neal http://necolas.github.com/normalize.css/
|
||||||
|
@ -612,21 +612,21 @@ a:active {
|
||||||
}
|
}
|
||||||
|
|
||||||
.site-main .comment-navigation,
|
.site-main .comment-navigation,
|
||||||
.site-main .paging-navigation,
|
.site-main .posts-navigation,
|
||||||
.site-main .post-navigation {
|
.site-main .post-navigation {
|
||||||
margin: 0 0 1.5em;
|
margin: 0 0 1.5em;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
.comment-navigation .nav-previous,
|
.comment-navigation .nav-previous,
|
||||||
.paging-navigation .nav-previous,
|
.posts-navigation .nav-previous,
|
||||||
.post-navigation .nav-previous {
|
.post-navigation .nav-previous {
|
||||||
float: left;
|
float: left;
|
||||||
width: 50%;
|
width: 50%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.comment-navigation .nav-next,
|
.comment-navigation .nav-next,
|
||||||
.paging-navigation .nav-next,
|
.posts-navigation .nav-next,
|
||||||
.post-navigation .nav-next {
|
.post-navigation .nav-next {
|
||||||
float: right;
|
float: right;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
|
@ -685,7 +685,8 @@ a:active {
|
||||||
.aligncenter {
|
.aligncenter {
|
||||||
clear: both;
|
clear: both;
|
||||||
display: block;
|
display: block;
|
||||||
margin: 0 auto;
|
margin-left: auto;
|
||||||
|
margin-right: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*--------------------------------------------------------------
|
/*--------------------------------------------------------------
|
||||||
|
@ -791,8 +792,8 @@ a:active {
|
||||||
11.0 Infinite scroll
|
11.0 Infinite scroll
|
||||||
--------------------------------------------------------------*/
|
--------------------------------------------------------------*/
|
||||||
/* Globally hidden elements when Infinite Scroll is supported and in use. */
|
/* Globally hidden elements when Infinite Scroll is supported and in use. */
|
||||||
.infinite-scroll .paging-navigation, /* Older / Newer Posts Navigation (always hidden). */
|
.infinite-scroll .posts-navigation, /* Older / Newer Posts Navigation (always hidden) */
|
||||||
.infinite-scroll.neverending .site-footer { /* Theme Footer (when set to scrolling). */
|
.infinite-scroll.neverending .site-footer { /* Theme Footer (when set to scrolling) */
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Reference in New Issue