Permalink
Browse files

_s: Formatting changes:

- Reduce element comments to either the element id or the first element
class.
- Tabs > Spaces.
- Improve adherence to formatting guidelines.
  • Loading branch information...
1 parent c7f2b7a commit c4f2aa32ce18db79e6b9cd1d01d1894fedd90d5e @obenland obenland committed Mar 5, 2013
Showing with 314 additions and 320 deletions.
  1. +2 −2 404.php
  2. +70 −70 archive.php
  3. +2 −2 comments.php
  4. +1 −1 content-page.php
  5. +1 −1 content-single.php
  6. +1 −1 content.php
  7. +3 −3 footer.php
  8. +7 −7 functions.php
  9. +2 −2 header.php
  10. +106 −106 image.php
  11. +4 −4 inc/wpcom.php
  12. +19 −19 index.php
  13. +17 −23 js/skip-link-focus-fix.js
  14. +12 −12 page.php
  15. +16 −16 search.php
  16. +22 −22 sidebar.php
  17. +13 −13 single.php
  18. +16 −16 style.css
View
4 404.php
@@ -41,7 +41,7 @@
</div><!-- .entry-content -->
</article><!-- #post-0 .post .error404 .not-found -->
- </div><!-- #content .site-content -->
- </div><!-- #primary .content-area -->
+ </div><!-- #content -->
+ </div><!-- #primary -->
<?php get_footer(); ?>
View
140 archive.php
@@ -10,86 +10,86 @@
get_header(); ?>
- <section id="primary" class="content-area">
- <div id="content" class="site-content" role="main">
-
- <?php if ( have_posts() ) : ?>
-
- <header class="page-header">
- <h1 class="page-title">
- <?php
- if ( is_category() ) {
- printf( __( 'Category Archives: %s', '_s' ), '<span>' . single_cat_title( '', false ) . '</span>' );
-
- } elseif ( is_tag() ) {
- printf( __( 'Tag Archives: %s', '_s' ), '<span>' . single_tag_title( '', false ) . '</span>' );
-
- } elseif ( is_author() ) {
- /* Queue the first post, that way we know
- * what author we're dealing with (if that is the case).
- */
- the_post();
- printf( __( 'Author Archives: %s', '_s' ), '<span class="vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( "ID" ) ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></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.
- */
- rewind_posts();
-
- } elseif ( is_day() ) {
- printf( __( 'Daily Archives: %s', '_s' ), '<span>' . get_the_date() . '</span>' );
-
- } elseif ( is_month() ) {
- printf( __( 'Monthly Archives: %s', '_s' ), '<span>' . get_the_date( 'F Y' ) . '</span>' );
-
- } elseif ( is_year() ) {
- printf( __( 'Yearly Archives: %s', '_s' ), '<span>' . get_the_date( 'Y' ) . '</span>' );
-
- } else {
- _e( 'Archives', '_s' );
-
- }
- ?>
- </h1>
+ <section id="primary" class="content-area">
+ <div id="content" class="site-content" role="main">
+
+ <?php if ( have_posts() ) : ?>
+
+ <header class="page-header">
+ <h1 class="page-title">
<?php
if ( is_category() ) {
- // show an optional category description
- $category_description = category_description();
- if ( ! empty( $category_description ) )
- echo apply_filters( 'category_archive_meta', '<div class="taxonomy-description">' . $category_description . '</div>' );
+ printf( __( 'Category Archives: %s', '_s' ), '<span>' . single_cat_title( '', false ) . '</span>' );
} elseif ( is_tag() ) {
- // show an optional tag description
- $tag_description = tag_description();
- if ( ! empty( $tag_description ) )
- echo apply_filters( 'tag_archive_meta', '<div class="taxonomy-description">' . $tag_description . '</div>' );
- }
- ?>
- </header><!-- .page-header -->
-
- <?php /* Start the Loop */ ?>
- <?php while ( have_posts() ) : the_post(); ?>
+ printf( __( 'Tag Archives: %s', '_s' ), '<span>' . single_tag_title( '', false ) . '</span>' );
- <?php
- /* Include the Post-Format-specific template for the content.
- * If you want to overload 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() );
- ?>
-
- <?php endwhile; ?>
+ } elseif ( is_author() ) {
+ /* Queue the first post, that way we know
+ * what author we're dealing with (if that is the case).
+ */
+ the_post();
+ printf( __( 'Author Archives: %s', '_s' ), '<span class="vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( "ID" ) ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></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.
+ */
+ rewind_posts();
- <?php _s_content_nav( 'nav-below' ); ?>
+ } elseif ( is_day() ) {
+ printf( __( 'Daily Archives: %s', '_s' ), '<span>' . get_the_date() . '</span>' );
- <?php else : ?>
+ } elseif ( is_month() ) {
+ printf( __( 'Monthly Archives: %s', '_s' ), '<span>' . get_the_date( 'F Y' ) . '</span>' );
- <?php get_template_part( 'no-results', 'archive' ); ?>
+ } elseif ( is_year() ) {
+ printf( __( 'Yearly Archives: %s', '_s' ), '<span>' . get_the_date( 'Y' ) . '</span>' );
- <?php endif; ?>
+ } else {
+ _e( 'Archives', '_s' );
- </div><!-- #content .site-content -->
- </section><!-- #primary .content-area -->
+ }
+ ?>
+ </h1>
+ <?php
+ if ( is_category() ) {
+ // show an optional category description
+ $category_description = category_description();
+ if ( ! empty( $category_description ) )
+ echo apply_filters( 'category_archive_meta', '<div class="taxonomy-description">' . $category_description . '</div>' );
+
+ } elseif ( is_tag() ) {
+ // show an optional tag description
+ $tag_description = tag_description();
+ if ( ! empty( $tag_description ) )
+ echo apply_filters( 'tag_archive_meta', '<div class="taxonomy-description">' . $tag_description . '</div>' );
+ }
+ ?>
+ </header><!-- .page-header -->
+
+ <?php /* Start the Loop */ ?>
+ <?php while ( have_posts() ) : the_post(); ?>
+
+ <?php
+ /* Include the Post-Format-specific template for the content.
+ * If you want to overload 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() );
+ ?>
+
+ <?php endwhile; ?>
+
+ <?php _s_content_nav( 'nav-below' ); ?>
+
+ <?php else : ?>
+
+ <?php get_template_part( 'no-results', 'archive' ); ?>
+
+ <?php endif; ?>
+
+ </div><!-- #content -->
+ </section><!-- #primary -->
<?php get_sidebar(); ?>
<?php get_footer(); ?>
View
4 comments.php
@@ -52,7 +52,7 @@
*/
wp_list_comments( array( 'callback' => '_s_comment' ) );
?>
- </ol><!-- .commentlist -->
+ </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" role="navigation">
@@ -73,4 +73,4 @@
<?php comment_form(); ?>
-</div><!-- #comments .comments-area -->
+</div><!-- #comments -->
View
2 content-page.php
@@ -17,4 +17,4 @@
<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', '_s' ), 'after' => '</div>' ) ); ?>
</div><!-- .entry-content -->
<?php edit_post_link( __( 'Edit', '_s' ), '<footer class="entry-meta"><span class="edit-link">', '</span></footer>' ); ?>
-</article><!-- #post-<?php the_ID(); ?> -->
+</article><!-- #post-## -->
View
2 content-single.php
@@ -56,4 +56,4 @@
<?php edit_post_link( __( 'Edit', '_s' ), '<span class="edit-link">', '</span>' ); ?>
</footer><!-- .entry-meta -->
-</article><!-- #post-<?php the_ID(); ?> -->
+</article><!-- #post-## -->
View
2 content.php
@@ -58,4 +58,4 @@
<?php edit_post_link( __( 'Edit', '_s' ), '<span class="sep"> | </span><span class="edit-link">', '</span>' ); ?>
</footer><!-- .entry-meta -->
-</article><!-- #post-<?php the_ID(); ?> -->
+</article><!-- #post-## -->
View
6 footer.php
@@ -9,7 +9,7 @@
*/
?>
- </div><!-- #main .site-main -->
+ </div><!-- #main -->
<footer id="colophon" class="site-footer" role="contentinfo">
<div class="site-info">
@@ -18,8 +18,8 @@
<span class="sep"> | </span>
<?php printf( __( 'Theme: %1$s by %2$s.', '_s' ), '_s', '<a href="http://automattic.com/" rel="designer">Automattic</a>' ); ?>
</div><!-- .site-info -->
- </footer><!-- #colophon .site-footer -->
-</div><!-- #page .hfeed .site -->
+ </footer><!-- #colophon -->
+</div><!-- #page -->
<?php wp_footer(); ?>
View
14 functions.php
@@ -122,12 +122,12 @@ function _s_register_custom_background() {
*/
function _s_widgets_init() {
register_sidebar( array(
- 'name' => __( 'Sidebar', '_s' ),
- 'id' => 'sidebar-1',
+ 'name' => __( 'Sidebar', '_s' ),
+ 'id' => 'sidebar-1',
'before_widget' => '<aside id="%1$s" class="widget %2$s">',
- 'after_widget' => '</aside>',
- 'before_title' => '<h1 class="widget-title">',
- 'after_title' => '</h1>',
+ 'after_widget' => '</aside>',
+ 'before_title' => '<h1 class="widget-title">',
+ 'after_title' => '</h1>',
) );
}
add_action( 'widgets_init', '_s_widgets_init' );
@@ -138,9 +138,9 @@ function _s_widgets_init() {
function _s_scripts() {
wp_enqueue_style( 'style', get_stylesheet_uri() );
- wp_enqueue_script( 'navigation', get_template_directory_uri() . '/js/navigation.js', null, '20120206', true );
+ wp_enqueue_script( 'navigation', get_template_directory_uri() . '/js/navigation.js', array(), '20120206', true );
- wp_enqueue_script( 'skip-link-focus-fix', get_template_directory_uri() . '/js/skip-link-focus-fix.js', array( ), '20130115', true );
+ wp_enqueue_script( 'skip-link-focus-fix', get_template_directory_uri() . '/js/skip-link-focus-fix.js', array(), '20130115', true );
if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
wp_enqueue_script( 'comment-reply' );
View
4 header.php
@@ -36,7 +36,7 @@
<div class="assistive-text skip-link"><a href="#content" title="<?php esc_attr_e( 'Skip to content', '_s' ); ?>"><?php _e( 'Skip to content', '_s' ); ?></a></div>
<?php wp_nav_menu( array( 'theme_location' => 'primary' ) ); ?>
- </nav><!-- .site-navigation .main-navigation -->
- </header><!-- #masthead .site-header -->
+ </nav><!-- .site-navigation -->
+ </header><!-- #masthead -->
<div id="main" class="site-main">
View
212 image.php
@@ -9,115 +9,115 @@
get_header();
?>
- <div id="primary" class="content-area image-attachment">
- <div id="content" class="site-content" role="main">
-
- <?php while ( have_posts() ) : the_post(); ?>
-
- <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
- <header class="entry-header">
- <h1 class="entry-title"><?php the_title(); ?></h1>
-
- <div class="entry-meta">
+ <div id="primary" class="content-area image-attachment">
+ <div id="content" class="site-content" role="main">
+
+ <?php while ( have_posts() ) : the_post(); ?>
+
+ <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
+ <header class="entry-header">
+ <h1 class="entry-title"><?php the_title(); ?></h1>
+
+ <div class="entry-meta">
+ <?php
+ $metadata = wp_get_attachment_metadata();
+ printf( __( 'Published <span class="entry-date"><time class="entry-date" datetime="%1$s">%2$s</time></span> at <a href="%3$s" title="Link to full-size image">%4$s &times; %5$s</a> in <a href="%6$s" title="Return to %7$s" rel="gallery">%8$s</a>', '_s' ),
+ esc_attr( get_the_date( 'c' ) ),
+ esc_html( get_the_date() ),
+ wp_get_attachment_url(),
+ $metadata['width'],
+ $metadata['height'],
+ get_permalink( $post->post_parent ),
+ esc_attr( get_the_title( $post->post_parent ) ),
+ get_the_title( $post->post_parent )
+ );
+ ?>
+ <?php edit_post_link( __( 'Edit', '_s' ), '<span class="sep"> | </span> <span class="edit-link">', '</span>' ); ?>
+ </div><!-- .entry-meta -->
+
+ <nav id="image-navigation" class="navigation-image">
+ <span class="previous"><?php previous_image_link( false, __( '&larr; Previous', '_s' ) ); ?></span>
+ <span class="next"><?php next_image_link( false, __( 'Next &rarr;', '_s' ) ); ?></span>
+ </nav><!-- #image-navigation -->
+ </header><!-- .entry-header -->
+
+ <div class="entry-content">
+
+ <div class="entry-attachment">
+ <div class="attachment">
<?php
- $metadata = wp_get_attachment_metadata();
- printf( __( 'Published <span class="entry-date"><time class="entry-date" datetime="%1$s">%2$s</time></span> at <a href="%3$s" title="Link to full-size image">%4$s &times; %5$s</a> in <a href="%6$s" title="Return to %7$s" rel="gallery">%8$s</a>', '_s' ),
- esc_attr( get_the_date( 'c' ) ),
- esc_html( get_the_date() ),
- wp_get_attachment_url(),
- $metadata['width'],
- $metadata['height'],
- get_permalink( $post->post_parent ),
- esc_attr( get_the_title( $post->post_parent ) ),
- get_the_title( $post->post_parent )
- );
+ /**
+ * Grab the IDs of all the image attachments in a gallery so we can get the URL of the next adjacent image in a gallery,
+ * or the first image (if we're looking at the last image in a gallery), or, in a gallery of one, just the link to that image file
+ */
+ $attachments = array_values( get_children( array(
+ 'post_parent' => $post->post_parent,
+ 'post_status' => 'inherit',
+ 'post_type' => 'attachment',
+ 'post_mime_type' => 'image',
+ 'order' => 'ASC',
+ 'orderby' => 'menu_order ID'
+ ) ) );
+ foreach ( $attachments as $k => $attachment ) {
+ if ( $attachment->ID == $post->ID )
+ break;
+ }
+ $k++;
+ // If there is more than 1 attachment in a gallery
+ if ( count( $attachments ) > 1 ) {
+ if ( isset( $attachments[ $k ] ) )
+ // get the URL of the next image attachment
+ $next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
+ else
+ // or get the URL of the first image attachment
+ $next_attachment_url = get_attachment_link( $attachments[ 0 ]->ID );
+ } else {
+ // or, if there's only 1 image, get the URL of the image
+ $next_attachment_url = wp_get_attachment_url();
+ }
?>
- <?php edit_post_link( __( 'Edit', '_s' ), '<span class="sep"> | </span> <span class="edit-link">', '</span>' ); ?>
- </div><!-- .entry-meta -->
-
- <nav id="image-navigation" class="navigation-image">
- <span class="previous"><?php previous_image_link( false, __( '&larr; Previous', '_s' ) ); ?></span>
- <span class="next"><?php next_image_link( false, __( 'Next &rarr;', '_s' ) ); ?></span>
- </nav><!-- #image-navigation -->
- </header><!-- .entry-header -->
-
- <div class="entry-content">
-
- <div class="entry-attachment">
- <div class="attachment">
- <?php
- /**
- * Grab the IDs of all the image attachments in a gallery so we can get the URL of the next adjacent image in a gallery,
- * or the first image (if we're looking at the last image in a gallery), or, in a gallery of one, just the link to that image file
- */
- $attachments = array_values( get_children( array(
- 'post_parent' => $post->post_parent,
- 'post_status' => 'inherit',
- 'post_type' => 'attachment',
- 'post_mime_type' => 'image',
- 'order' => 'ASC',
- 'orderby' => 'menu_order ID'
- ) ) );
- foreach ( $attachments as $k => $attachment ) {
- if ( $attachment->ID == $post->ID )
- break;
- }
- $k++;
- // If there is more than 1 attachment in a gallery
- if ( count( $attachments ) > 1 ) {
- if ( isset( $attachments[ $k ] ) )
- // get the URL of the next image attachment
- $next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
- else
- // or get the URL of the first image attachment
- $next_attachment_url = get_attachment_link( $attachments[ 0 ]->ID );
- } else {
- // or, if there's only 1 image, get the URL of the image
- $next_attachment_url = wp_get_attachment_url();
- }
- ?>
-
- <a href="<?php echo $next_attachment_url; ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php
- $attachment_size = apply_filters( '_s_attachment_size', array( 1200, 1200 ) ); // Filterable image size.
- echo wp_get_attachment_image( $post->ID, $attachment_size );
- ?></a>
- </div><!-- .attachment -->
-
- <?php if ( ! empty( $post->post_excerpt ) ) : ?>
- <div class="entry-caption">
- <?php the_excerpt(); ?>
- </div><!-- .entry-caption -->
- <?php endif; ?>
- </div><!-- .entry-attachment -->
-
- <?php the_content(); ?>
- <?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', '_s' ), 'after' => '</div>' ) ); ?>
-
- </div><!-- .entry-content -->
-
- <footer class="entry-meta">
- <?php if ( comments_open() && pings_open() ) : // Comments and trackbacks open ?>
- <?php printf( __( '<a class="comment-link" href="#respond" title="Post a comment">Post a comment</a> or leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', '_s' ), get_trackback_url() ); ?>
- <?php elseif ( ! comments_open() && pings_open() ) : // Only trackbacks open ?>
- <?php printf( __( 'Comments are closed, but you can leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', '_s' ), get_trackback_url() ); ?>
- <?php elseif ( comments_open() && ! pings_open() ) : // Only comments open ?>
- <?php _e( 'Trackbacks are closed, but you can <a class="comment-link" href="#respond" title="Post a comment">post a comment</a>.', '_s' ); ?>
- <?php elseif ( ! comments_open() && ! pings_open() ) : // Comments and trackbacks closed ?>
- <?php _e( 'Both comments and trackbacks are currently closed.', '_s' ); ?>
- <?php endif; ?>
- <?php edit_post_link( __( 'Edit', '_s' ), ' <span class="edit-link">', '</span>' ); ?>
- </footer><!-- .entry-meta -->
- </article><!-- #post-<?php the_ID(); ?> -->
-
- <?php
- // If comments are open or we have at least one comment, load up the comment template
- if ( comments_open() || '0' != get_comments_number() )
- comments_template( '', true );
- ?>
- <?php endwhile; // end of the loop. ?>
+ <a href="<?php echo $next_attachment_url; ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php
+ $attachment_size = apply_filters( '_s_attachment_size', array( 1200, 1200 ) ); // Filterable image size.
+ echo wp_get_attachment_image( $post->ID, $attachment_size );
+ ?></a>
+ </div><!-- .attachment -->
- </div><!-- #content .site-content -->
- </div><!-- #primary .content-area .image-attachment -->
+ <?php if ( ! empty( $post->post_excerpt ) ) : ?>
+ <div class="entry-caption">
+ <?php the_excerpt(); ?>
+ </div><!-- .entry-caption -->
+ <?php endif; ?>
+ </div><!-- .entry-attachment -->
+
+ <?php the_content(); ?>
+ <?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', '_s' ), 'after' => '</div>' ) ); ?>
+
+ </div><!-- .entry-content -->
+
+ <footer class="entry-meta">
+ <?php if ( comments_open() && pings_open() ) : // Comments and trackbacks open ?>
+ <?php printf( __( '<a class="comment-link" href="#respond" title="Post a comment">Post a comment</a> or leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', '_s' ), get_trackback_url() ); ?>
+ <?php elseif ( ! comments_open() && pings_open() ) : // Only trackbacks open ?>
+ <?php printf( __( 'Comments are closed, but you can leave a trackback: <a class="trackback-link" href="%s" title="Trackback URL for your post" rel="trackback">Trackback URL</a>.', '_s' ), get_trackback_url() ); ?>
+ <?php elseif ( comments_open() && ! pings_open() ) : // Only comments open ?>
+ <?php _e( 'Trackbacks are closed, but you can <a class="comment-link" href="#respond" title="Post a comment">post a comment</a>.', '_s' ); ?>
+ <?php elseif ( ! comments_open() && ! pings_open() ) : // Comments and trackbacks closed ?>
+ <?php _e( 'Both comments and trackbacks are currently closed.', '_s' ); ?>
+ <?php endif; ?>
+ <?php edit_post_link( __( 'Edit', '_s' ), ' <span class="edit-link">', '</span>' ); ?>
+ </footer><!-- .entry-meta -->
+ </article><!-- #post-<?php the_ID(); ?> -->
+
+ <?php
+ // If comments are open or we have at least one comment, load up the comment template
+ if ( comments_open() || '0' != get_comments_number() )
+ comments_template();
+ ?>
+
+ <?php endwhile; // end of the loop. ?>
+
+ </div><!-- #content -->
+ </div><!-- #primary -->
<?php get_footer(); ?>
View
8 inc/wpcom.php
@@ -15,9 +15,9 @@
* @since _s 1.0
*/
$themecolors = array(
- 'bg' => '',
+ 'bg' => '',
'border' => '',
- 'text' => '',
- 'link' => '',
- 'url' => '',
+ 'text' => '',
+ 'link' => '',
+ 'url' => '',
);
View
38 index.php
@@ -14,34 +14,34 @@
get_header(); ?>
- <div id="primary" class="content-area">
- <div id="content" class="site-content" role="main">
+ <div id="primary" class="content-area">
+ <div id="content" class="site-content" role="main">
- <?php if ( have_posts() ) : ?>
+ <?php if ( have_posts() ) : ?>
- <?php /* Start the Loop */ ?>
- <?php while ( have_posts() ) : the_post(); ?>
+ <?php /* Start the Loop */ ?>
+ <?php while ( have_posts() ) : the_post(); ?>
- <?php
- /* Include the Post-Format-specific template for the content.
- * If you want to overload 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() );
- ?>
+ <?php
+ /* Include the Post-Format-specific template for the content.
+ * If you want to overload 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() );
+ ?>
- <?php endwhile; ?>
+ <?php endwhile; ?>
- <?php _s_content_nav( 'nav-below' ); ?>
+ <?php _s_content_nav( 'nav-below' ); ?>
- <?php else : ?>
+ <?php else : ?>
- <?php get_template_part( 'no-results', 'index' ); ?>
+ <?php get_template_part( 'no-results', 'index' ); ?>
- <?php endif; ?>
+ <?php endif; ?>
- </div><!-- #content .site-content -->
- </div><!-- #primary .content-area -->
+ </div><!-- #content -->
+ </div><!-- #primary -->
<?php get_sidebar(); ?>
<?php get_footer(); ?>
View
40 js/skip-link-focus-fix.js
@@ -1,25 +1,19 @@
( function() {
-var is_webkit = navigator.userAgent.toLowerCase().indexOf('webkit') > -1;
-var is_opera = navigator.userAgent.toLowerCase().indexOf('opera') > -1;
-var is_ie = navigator.userAgent.toLowerCase().indexOf('msie') > -1;
-
-if((is_webkit || is_opera || is_ie ) && typeof(document.getElementById) !== 'undefined' ) {
- var eventMethod = (window.addEventListener) ? 'addEventListener' : 'attachEvent' ;
- window[eventMethod]("hashchange", function(event) {
-
- var element = document.getElementById(location.hash.substring(1));
-
- if (element) {
-
- if (!/^(?:a|select|input|button|textarea)$/i.test(element.tagName)) {
- element.tabIndex = -1;
- }
-
- element.focus();
- }
-
- }, false);
-
-}
-
+ var is_webkit = navigator.userAgent.toLowerCase().indexOf( 'webkit' ) > -1,
+ is_opera = navigator.userAgent.toLowerCase().indexOf( 'opera' ) > -1,
+ is_ie = navigator.userAgent.toLowerCase().indexOf( 'msie' ) > -1;
+
+ if ( ( is_webkit || is_opera || is_ie ) && 'undefined' !== typeof( document.getElementById ) ) {
+ var eventMethod = ( window.addEventListener ) ? 'addEventListener' : 'attachEvent';
+ window[ eventMethod ]( 'hashchange', function() {
+ var element = document.getElementById( location.hash.substring( 1 ) );
+
+ if ( element ) {
+ if ( ! /^(?:a|select|input|button|textarea)$/i.test( element.tagName ) )
+ element.tabIndex = -1;
+
+ element.focus();
+ }
+ }, false );
+ }
})();
View
24 page.php
@@ -13,23 +13,23 @@
get_header(); ?>
- <div id="primary" class="content-area">
- <div id="content" class="site-content" role="main">
+ <div id="primary" class="content-area">
+ <div id="content" class="site-content" role="main">
- <?php while ( have_posts() ) : the_post(); ?>
+ <?php while ( have_posts() ) : the_post(); ?>
- <?php get_template_part( 'content', 'page' ); ?>
+ <?php get_template_part( 'content', 'page' ); ?>
- <?php
- // If comments are open or we have at least one comment, load up the comment template
- if ( comments_open() || '0' != get_comments_number() )
- comments_template( '', true );
- ?>
+ <?php
+ // If comments are open or we have at least one comment, load up the comment template
+ if ( comments_open() || '0' != get_comments_number() )
+ comments_template();
+ ?>
- <?php endwhile; // end of the loop. ?>
+ <?php endwhile; // end of the loop. ?>
- </div><!-- #content .site-content -->
- </div><!-- #primary .content-area -->
+ </div><!-- #content -->
+ </div><!-- #primary -->
<?php get_sidebar(); ?>
<?php get_footer(); ?>
View
32 search.php
@@ -8,32 +8,32 @@
get_header(); ?>
- <section id="primary" class="content-area">
- <div id="content" class="site-content" role="main">
+ <section id="primary" class="content-area">
+ <div id="content" class="site-content" role="main">
- <?php if ( have_posts() ) : ?>
+ <?php if ( have_posts() ) : ?>
- <header class="page-header">
- <h1 class="page-title"><?php printf( __( 'Search Results for: %s', '_s' ), '<span>' . get_search_query() . '</span>' ); ?></h1>
- </header><!-- .page-header -->
+ <header class="page-header">
+ <h1 class="page-title"><?php printf( __( 'Search Results for: %s', '_s' ), '<span>' . get_search_query() . '</span>' ); ?></h1>
+ </header><!-- .page-header -->
- <?php /* Start the Loop */ ?>
- <?php while ( have_posts() ) : the_post(); ?>
+ <?php /* Start the Loop */ ?>
+ <?php while ( have_posts() ) : the_post(); ?>
- <?php get_template_part( 'content', 'search' ); ?>
+ <?php get_template_part( 'content', 'search' ); ?>
- <?php endwhile; ?>
+ <?php endwhile; ?>
- <?php _s_content_nav( 'nav-below' ); ?>
+ <?php _s_content_nav( 'nav-below' ); ?>
- <?php else : ?>
+ <?php else : ?>
- <?php get_template_part( 'no-results', 'search' ); ?>
+ <?php get_template_part( 'no-results', 'search' ); ?>
- <?php endif; ?>
+ <?php endif; ?>
- </div><!-- #content .site-content -->
- </section><!-- #primary .content-area -->
+ </div><!-- #content -->
+ </section><!-- #primary -->
<?php get_sidebar(); ?>
<?php get_footer(); ?>
View
44 sidebar.php
@@ -6,29 +6,29 @@
* @since _s 1.0
*/
?>
- <div id="secondary" class="widget-area" role="complementary">
- <?php do_action( 'before_sidebar' ); ?>
- <?php if ( ! dynamic_sidebar( 'sidebar-1' ) ) : ?>
+ <div id="secondary" class="widget-area" role="complementary">
+ <?php do_action( 'before_sidebar' ); ?>
+ <?php if ( ! dynamic_sidebar( 'sidebar-1' ) ) : ?>
- <aside id="search" class="widget widget_search">
- <?php get_search_form(); ?>
- </aside>
+ <aside id="search" class="widget widget_search">
+ <?php get_search_form(); ?>
+ </aside>
- <aside id="archives" class="widget">
- <h1 class="widget-title"><?php _e( 'Archives', '_s' ); ?></h1>
- <ul>
- <?php wp_get_archives( array( 'type' => 'monthly' ) ); ?>
- </ul>
- </aside>
+ <aside id="archives" class="widget">
+ <h1 class="widget-title"><?php _e( 'Archives', '_s' ); ?></h1>
+ <ul>
+ <?php wp_get_archives( array( 'type' => 'monthly' ) ); ?>
+ </ul>
+ </aside>
- <aside id="meta" class="widget">
- <h1 class="widget-title"><?php _e( 'Meta', '_s' ); ?></h1>
- <ul>
- <?php wp_register(); ?>
- <li><?php wp_loginout(); ?></li>
- <?php wp_meta(); ?>
- </ul>
- </aside>
+ <aside id="meta" class="widget">
+ <h1 class="widget-title"><?php _e( 'Meta', '_s' ); ?></h1>
+ <ul>
+ <?php wp_register(); ?>
+ <li><?php wp_loginout(); ?></li>
+ <?php wp_meta(); ?>
+ </ul>
+ </aside>
- <?php endif; // end sidebar widget area ?>
- </div><!-- #secondary .widget-area -->
+ <?php endif; // end sidebar widget area ?>
+ </div><!-- #secondary -->
View
26 single.php
@@ -8,25 +8,25 @@
get_header(); ?>
- <div id="primary" class="content-area">
- <div id="content" class="site-content" role="main">
+ <div id="primary" class="content-area">
+ <div id="content" class="site-content" role="main">
- <?php while ( have_posts() ) : the_post(); ?>
+ <?php while ( have_posts() ) : the_post(); ?>
- <?php get_template_part( 'content', 'single' ); ?>
+ <?php get_template_part( 'content', 'single' ); ?>
- <?php _s_content_nav( 'nav-below' ); ?>
+ <?php _s_content_nav( 'nav-below' ); ?>
- <?php
- // If comments are open or we have at least one comment, load up the comment template
- if ( comments_open() || '0' != get_comments_number() )
- comments_template( '', true );
- ?>
+ <?php
+ // If comments are open or we have at least one comment, load up the comment template
+ if ( comments_open() || '0' != get_comments_number() )
+ comments_template();
+ ?>
- <?php endwhile; // end of the loop. ?>
+ <?php endwhile; // end of the loop. ?>
- </div><!-- #content .site-content -->
- </div><!-- #primary .content-area -->
+ </div><!-- #content -->
+ </div><!-- #primary -->
<?php get_sidebar(); ?>
<?php get_footer(); ?>
View
32 style.css
@@ -227,26 +227,26 @@ input[type="submit"] {
border-color: #ccc #ccc #bbb #ccc;
border-radius: 3px;
background: #e6e6e6;
- -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,0.5), inset 0 15px 17px rgba(255,255,255,0.5), inset 0 -5px 12px rgba(0,0,0,0.05);
- -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,0.5), inset 0 15px 17px rgba(255,255,255,0.5), inset 0 -5px 12px rgba(0,0,0,0.05);
- box-shadow: inset 0 1px 0 rgba(255,255,255,0.5), inset 0 15px 17px rgba(255,255,255,0.5), inset 0 -5px 12px rgba(0,0,0,0.05);
- color: rgba(0,0,0,.8);
+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.5), inset 0 15px 17px rgba(255, 255, 255, 0.5), inset 0 -5px 12px rgba(0, 0, 0, 0.05);
+ -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.5), inset 0 15px 17px rgba(255, 255, 255, 0.5), inset 0 -5px 12px rgba(0, 0, 0, 0.05);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.5), inset 0 15px 17px rgba(255, 255, 255, 0.5), inset 0 -5px 12px rgba(0, 0, 0, 0.05);
+ color: rgba(0, 0, 0, .8);
cursor: pointer; /* Improves usability and consistency of cursor style between image-type 'input' and others */
-webkit-appearance: button; /* Corrects inability to style clickable 'input' types in iOS */
font-size: 12px;
font-size: 1.2rem;
line-height: 1;
padding: .6em 1em .4em;
- text-shadow: 0 1px 0 rgba(255,255,255,.8);
+ text-shadow: 0 1px 0 rgba(255, 255, 255, 0.8);
}
button:hover,
html input[type="button"]:hover,
input[type="reset"]:hover,
input[type="submit"]:hover {
border-color: #ccc #bbb #aaa #bbb;
- -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,0.8), inset 0 15px 17px rgba(255,255,255,0.8), inset 0 -5px 12px rgba(0,0,0,0.02);
- -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,0.8), inset 0 15px 17px rgba(255,255,255,0.8), inset 0 -5px 12px rgba(0,0,0,0.02);
- box-shadow: inset 0 1px 0 rgba(255,255,255,0.8), inset 0 15px 17px rgba(255,255,255,0.8), inset 0 -5px 12px rgba(0,0,0,0.02);
+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.8), inset 0 15px 17px rgba(255, 255, 255, 0.8), inset 0 -5px 12px rgba(0, 0, 0, 0.02);
+ -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.8), inset 0 15px 17px rgba(255, 255, 255, 0.8), inset 0 -5px 12px rgba(0, 0, 0, 0.02);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.8), inset 0 15px 17px rgba(255, 255, 255, 0.8), inset 0 -5px 12px rgba(0, 0, 0, 0.02);
}
button:focus,
html input[type="button"]:focus,
@@ -257,9 +257,9 @@ html input[type="button"]:active,
input[type="reset"]:active,
input[type="submit"]:active {
border-color: #aaa #bbb #bbb #bbb;
- -webkit-box-shadow: inset 0 -1px 0 rgba(255,255,255,0.5), inset 0 2px 5px rgba(0,0,0,0.15);
- -moz-box-shadow: inset 0 -1px 0 rgba(255,255,255,0.5), inset 0 2px 5px rgba(0,0,0,0.15);
- box-shadow: inset 0 -1px 0 rgba(255,255,255,0.5), inset 0 2px 5px rgba(0,0,0,0.15);
+ -webkit-box-shadow: inset 0 -1px 0 rgba(255, 255, 255, 0.5), inset 0 2px 5px rgba(0, 0, 0, 0.15);
+ -moz-box-shadow: inset 0 -1px 0 rgba(255, 255, 255, 0.5), inset 0 2px 5px rgba(0, 0, 0, 0.15);
+ box-shadow: inset 0 -1px 0 rgba(255, 255, 255, 0.5), inset 0 2px 5px rgba(0, 0, 0, 0.15);
}
input[type="checkbox"],
input[type="radio"] {
@@ -268,9 +268,9 @@ input[type="radio"] {
}
input[type="search"] {
-webkit-appearance: textfield; /* Addresses appearance set to searchfield in S5, Chrome */
- -moz-box-sizing: content-box;
-webkit-box-sizing: content-box; /* Addresses box sizing set to border-box in S5, Chrome (include -moz to future-proof) */
- box-sizing: content-box;
+ -moz-box-sizing: content-box;
+ box-sizing: content-box;
}
input[type="search"]::-webkit-search-decoration { /* Corrects inner padding displayed oddly in S5, Chrome on OSX */
-webkit-appearance: none;
@@ -370,9 +370,9 @@ a:active {
text-decoration: none;
}
.navigation-main ul ul {
- -moz-box-shadow: 0 3px 3px rgba(0,0,0,0.2);
- -webkit-box-shadow: 0 3px 3px rgba(0,0,0,0.2);
- box-shadow: 0 3px 3px rgba(0,0,0,0.2);
+ -webkit-box-shadow: 0 3px 3px rgba(0, 0, 0, 0.2);
+ -moz-box-shadow: 0 3px 3px rgba(0, 0, 0, 0.2);
+ box-shadow: 0 3px 3px rgba(0, 0, 0, 0.2);
display: none;
float: left;
position: absolute;

0 comments on commit c4f2aa3

Please sign in to comment.