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

Fix merge conflict.

This commit is contained in:
David A. Kennedy 2013-08-23 23:58:40 -04:00
parent 889491de53 0ac069a0bf
commit 22e859857e
19 changed files with 61 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
404.php
View File

@ -7,8 +7,9 @@
get_header(); ?>
<div id="primary" class="content-area">
<div id="content" class="site-content" role="main">
<main id="main" class="site-main" role="main">
<section class="error-404 not-found">
<header class="page-header">
@ -50,7 +51,7 @@ get_header(); ?>
</div><!-- .page-content -->
</section><!-- .error-404 -->
</div><!-- #content -->
</main><!-- #main -->
</div><!-- #primary -->
<?php get_footer(); ?>

20
README.md
View File

@ -7,26 +7,27 @@ My ultra-minimal CSS might make me look like theme tartare but that means less s
* A just right amount of lean, well-commented, modern, HTML5 templates.
* A helpful 404 template.
* A sample custom header implementation in inc/custom-header.php that can be activated by uncommenting one line in functions.php and adding the code snippet found the comments of inc/custom-header.php to your header.php template.
* Custom template tags in inc/template-tags that keep your templates clean and neat and prevent code duplication.
* Some small tweaks in /inc/extras.php that can improve your theming experience.
* Keyboard navigation for image attachment templates. The script can be found in js/keyboard-navigation.js. It’s enqueued in functions.php.
* A script at js/small-menu.js that makes your menu a toggled dropdown on small screens (like your phone), ready for CSS artistry. It’s enqueued in functions.php.
* 5 sample CSS layouts in /layouts: Two sidebars on the left, two sidebars on the right, a sidebar on either side of your content, and two-column layouts with sidebars on either side.
* Smartly organized starter CSS in style.css that will help you to quickly get your design off the ground.
* The GPL license in license.txt. :) Use it to make something cool.
* A sample custom header implementation in `inc/custom-header.php` that can be activated by uncommenting one line in functions.php and adding the code snippet found the comments of `inc/custom-header.php` to your `header.php` template.
* Custom template tags in `inc/template-tags.php` that keep your templates clean and neat and prevent code duplication.
* Some small tweaks in `inc/extras.php` that can improve your theming experience.
* Keyboard navigation for image attachment templates. The script can be found in `js/keyboard-navigation.js`. It's enqueued in `functions.php`.
* A script at `js/small-menu.js` that makes your menu a toggled dropdown on small screens (like your phone), ready for CSS artistry. It's enqueued in `functions.php`.
* 2 sample CSS layouts in `layouts` for a sidebar on either side of your content.
* Smartly organized starter CSS in `style.css` that will help you to quickly get your design off the ground.
* Licensed under GPLv2 or later. :) Use it to make something cool.
Getting Started
---------------
If you want to keep it simple, head over to http://underscores.me and generate your `_s` based theme from there. You just input the name of the theme you want to create, click the "Generate" button, and you get your ready-to-awesomize starter theme.
If you want to set things up manually, download `_s` from github. The first thing you want to do is copy the `_s` directory and change the name to something else — Like, say, `megatherium` — then you'll need to do a three-step find and replace on the name in all the templates.
If you want to set things up manually, download `_s` from github. The first thing you want to do is copy the `_s` directory and change the name to something else - Like, say, `megatherium` - then you'll need to do a five-step find and replace on the name in all the templates.
1. Search for `'_s'` (inside single quotations) to capture the text domain.
2. Search for `_s_` to capture all the function names.
3. Search for <code>&nbsp;_s</code> (with a space before it) to capture DocBlocks.
4. Search for `_s-` to capture prefixed handles.
5. Search for `Text Domain: _s` in style.css.
OR
@ -34,6 +35,7 @@ OR
* Search for: `_s_` and replace with: `megatherium_`
* Search for: <code>&nbsp;_s</code> and replace with: <code>&nbsp;Megatherium</code>
* Search for: `_s-` and replace with: `megatherium-`
* Search for: `Text Domain: _s` and replace with: `Text Domain: megatherium` in style.css.
Then, update the stylesheet header in style.css and the links in footer.php with your own information. Next, update or delete this readme.

8
archive.php
View File

@ -10,7 +10,7 @@
get_header(); ?>
<section id="primary" class="content-area">
<div id="content" class="site-content" role="main">
<main id="main" class="site-main" role="main">
<?php if ( have_posts() ) : ?>
@ -28,7 +28,7 @@ get_header(); ?>
* what author we're dealing with (if that is the case).
*/
the_post();
printf( __( 'Author: %s', '_s' ), '<span class="vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '" rel="me">' . get_the_author() . '</a></span>' );
printf( __( 'Author: %s', '_s' ), '<span class="vcard">' . get_the_author() . '</span>' );
/* Since we called the_post() above, we need to
* rewind the loop back to the beginning that way
* we can run the loop properly, in full.
@ -79,7 +79,7 @@ get_header(); ?>
<?php
/* Include the Post-Format-specific template for the content.
* If you want to overload this in a child theme then include a file
* 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( 'content', get_post_format() );
@ -95,7 +95,7 @@ get_header(); ?>
<?php endif; ?>
</div><!-- #content -->
</main><!-- #main -->
</section><!-- #primary -->
<?php get_sidebar(); ?>

2
comments.php
View File

@ -43,7 +43,7 @@ if ( post_password_required() )
<?php
/* Loop through and list the comments. Tell wp_list_comments()
* to use _s_comment() to format the comments.
* If you want to overload this in a child theme then you can
* If you want to override this in a child theme then you can
* define _s_comment() and that will be used instead.
* See _s_comment() in inc/template-tags.php for more.
*/

2
footer.php
View File

@ -8,7 +8,7 @@
*/
?>
</div><!-- #main -->
</div><!-- #content -->
<footer id="colophon" class="site-footer" role="contentinfo">
<div class="site-info">

4
header.php
View File

@ -2,7 +2,7 @@
/**
* The Header for our theme.
*
* Displays all of the <head> section and everything up till <div id="main">
* Displays all of the <head> section and everything up till <main id="main">
*
* @package _s
*/
@ -35,4 +35,4 @@
</nav><!-- #site-navigation -->
</header><!-- #masthead -->
<div id="main" class="site-main">
<div id="content" class="site-content">

4
image.php
View File

@ -9,7 +9,7 @@ get_header();
?>
<div id="primary" class="content-area image-attachment">
<div id="content" class="site-content" role="main">
<main id="main" class="site-main" role="main">
<?php while ( have_posts() ) : the_post(); ?>
@ -88,7 +88,7 @@ get_header();
<?php endwhile; // end of the loop. ?>
</div><!-- #content -->
</main><!-- #main -->
</div><!-- #primary -->
<?php get_footer(); ?>

2
inc/jetpack.php
View File

@ -12,7 +12,7 @@
*/
function _s_jetpack_setup() {
add_theme_support( 'infinite-scroll', array(
'container' => 'content',
'container' => 'main',
'footer' => 'page',
) );
}

12
inc/template-tags.php
View File

@ -99,9 +99,15 @@ function _s_comment( $comment, $args, $depth ) {
<?php comment_text(); ?>
</div><!-- .comment-content -->
<div class="reply">
<?php comment_reply_link( array_merge( $args, array( 'add_below' => 'div-comment', 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
</div><!-- .reply -->
<?php
comment_reply_link( array_merge( $args, array(
'add_below' => 'div-comment',
'depth' => $depth,
'max_depth' => $args['max_depth'],
'before' => '<div class="reply">',
'after' => '</div>',
) ) );
?>
</article><!-- .comment-body -->
<?php

6
index.php
View File

@ -14,7 +14,7 @@
get_header(); ?>
<div id="primary" class="content-area">
<div id="content" class="site-content" role="main">
<main id="main" class="site-main" role="main">
<?php if ( have_posts() ) : ?>
@ -23,7 +23,7 @@ get_header(); ?>
<?php
/* Include the Post-Format-specific template for the content.
* If you want to overload this in a child theme then include a file
* 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( 'content', get_post_format() );
@ -39,7 +39,7 @@ get_header(); ?>
<?php endif; ?>
</div><!-- #content -->
</main><!-- #main -->
</div><!-- #primary -->
<?php get_sidebar(); ?>

22
layouts/content-sidebar-sidebar.css
View File

@ -1,22 +0,0 @@
/*
Theme Name: _s
Layout: Content-Sidebar-Sidebar
*/
.content-area {
float: left;
width: 100%;
}
.site-content {
margin: 0 40% 0 0;
}
.site-main .widget-area {
float: left;
margin: 0 0 0 -40%;
overflow: hidden;
width: 20%;
}
.site-footer {
clear: both;
width: 100%;
}

4
layouts/content-sidebar.css
View File

@ -8,10 +8,10 @@ Layout: Content-Sidebar
margin: 0 -25% 0 0;
width: 100%;
}
.site-content {
.site-main {
margin: 0 25% 0 0;
}
.site-main .widget-area {
.site-content .widget-area {
float: right;
overflow: hidden;
width: 25%;

22
layouts/sidebar-content-sidebar.css
View File

@ -1,22 +0,0 @@
/*
Theme Name: _s
Layout: Sidebar-Content-Sidebar
*/
.content-area {
float: left;
width: 100%;
}
.site-content {
margin: 0 20%;
}
.site-main .widget-area {
float: left;
margin: 0 0 0 -100%;
overflow: hidden;
width: 20%;
}
.site-footer {
clear: both;
width: 100%;
}

4
layouts/sidebar-content.css
View File

@ -8,10 +8,10 @@ Layout: Sidebar-Content
margin: 0 0 0 -25%;
width: 100%;
}
.site-content {
.site-main {
margin: 0 0 0 25%;
}
.site-main .widget-area {
.site-content .widget-area {
float: left;
overflow: hidden;
width: 25%;

22
layouts/sidebar-sidebar-content.css
View File

@ -1,22 +0,0 @@
/*
Theme Name: _s
Layout: Sidebar-Sidebar-Content
*/
.content-area {
float: right;
margin: 0 0 0 -40%;
width: 100%;
}
.site-content {
margin: 0 0 0 40%;
}
.site-main .widget-area {
float: left;
overflow: hidden;
width: 20%;
}
.site-footer {
clear: both;
width: 100%;
}

4
page.php
View File

@ -13,7 +13,7 @@
get_header(); ?>
<div id="primary" class="content-area">
<div id="content" class="site-content" role="main">
<main id="main" class="site-main" role="main">
<?php while ( have_posts() ) : the_post(); ?>
@ -27,7 +27,7 @@ get_header(); ?>
<?php endwhile; // end of the loop. ?>
</div><!-- #content -->
</main><!-- #main -->
</div><!-- #primary -->
<?php get_sidebar(); ?>

4
search.php
View File

@ -8,7 +8,7 @@
get_header(); ?>
<section id="primary" class="content-area">
<div id="content" class="site-content" role="main">
<main id="main" class="site-main" role="main">
<?php if ( have_posts() ) : ?>
@ -31,7 +31,7 @@ get_header(); ?>
<?php endif; ?>
</div><!-- #content -->
</main><!-- #main -->
</section><!-- #primary -->
<?php get_sidebar(); ?>

4
single.php
View File

@ -8,7 +8,7 @@
get_header(); ?>
<div id="primary" class="content-area">
<div id="content" class="site-content" role="main">
<main id="main" class="site-main" role="main">
<?php while ( have_posts() ) : the_post(); ?>
@ -24,7 +24,7 @@ get_header(); ?>
<?php endwhile; // end of the loop. ?>
</div><!-- #content -->
</main><!-- #main -->
</div><!-- #primary -->
<?php get_sidebar(); ?>

20
style.css
View File

@ -7,6 +7,8 @@ Description: Hi. I'm a starter theme called <code>_s</code>, or <em>underscores<
Version: 1.3-wpcom
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Text Domain: _s
Domain Path: /languages/
Tags:
This theme, like WordPress, is licensed under the GPL.
@ -58,6 +60,7 @@ figcaption,
figure,
footer,
header,
main,
nav,
section {
display: block;
@ -108,7 +111,7 @@ textarea {
}
/* Headings */
h1,h2,h3,h4,h5,h6 {
h1, h2, h3, h4, h5, h6 {
clear: both;
}
hr {
@ -280,6 +283,7 @@ input::-moz-focus-inner { /* Corrects inner padding and border displayed oddly i
}
input[type="text"],
input[type="email"],
input[type="url"],
input[type="password"],
input[type="search"],
textarea {
@ -289,6 +293,7 @@ textarea {
}
input[type="text"]:focus,
input[type="email"]:focus,
input[type="url"]:focus,
input[type="password"]:focus,
input[type="search"]:focus,
textarea:focus {
@ -296,6 +301,7 @@ textarea:focus {
}
input[type="text"],
input[type="email"],
input[type="url"],
input[type="password"],
input[type="search"] {
padding: 3px;
@ -516,22 +522,22 @@ a:active {
.wp-caption .wp-caption-text {
margin: 0.8075em 0;
}
.site-content .gallery {
.site-main .gallery {
margin-bottom: 1.5em;
}
.gallery-caption {
}
.site-content .gallery a img {
.site-main .gallery a img {
border: none;
height: auto;
max-width: 90%;
}
.site-content .gallery dd {
.site-main .gallery dd {
margin: 0;
}
.site-content .gallery-columns-4 .gallery-item {
.site-main .gallery-columns-4 .gallery-item {
}
.site-content .gallery-columns-4 .gallery-item img {
.site-main .gallery-columns-4 .gallery-item img {
}
/* Make sure embeds and iframes fit their containers */
@ -545,7 +551,7 @@ object {
/* =Navigation
----------------------------------------------- */
.site-content [class*="navigation"] {
.site-main [class*="navigation"] {
margin: 0 0 1.5em;
overflow: hidden;
}