Permalink
Browse files

Merge branch 'dev'

  • Loading branch information...
2 parents 7c51f6f + 88d4a4d commit da0e7818e3b0704e4b7b1768815d3a10b0afe705 @nathanstaines nathanstaines committed Mar 21, 2011
Showing with 430 additions and 437 deletions.
  1. +18 −15 README.md
  2. +4 −95 attachment.php
  3. +15 −15 author.php
  4. +31 −80 css/reset.css
  5. +13 −4 functions.php
  6. +40 −29 header.php
  7. +4 −6 index.php
  8. +105 −0 loop-attachment.php
  9. +33 −0 loop-page.php
  10. +53 −0 loop-single.php
  11. +109 −102 loop.php
  12. +1 −21 onecolumn-page.php
  13. +2 −26 page.php
  14. +1 −43 single.php
  15. +1 −1 style.css
View
@@ -1,22 +1,25 @@
Starkers HTML5
==============
-
+
+Just like [Elliot Jay Stocks'](http://elliotjaystocks.com) original version of ['Starkers'](http://starkerstheme.com) this theme is based on the current WordPress default - 'TwentyTen'.
+
Starkers HTML5 is a bare-bones WordPress theme created to act as a starting point for the theme designer.
-
+
Free of all presentational elements and non-semantic markup, Starkers HTML5 is the perfect 'blank slate' for your WordPress projects, as it's a stripped-back version of the 'Default' theme.
-
+
Best of all: it's free and fully GPL-licensed, so you can use it for whatever you like - even your commercial projects.
-
-Version 3.0
--------------
-
-_Updated 22.07.2010_
-
+
+20.12.2010
+----------
+
+Replaced the HTML5 shiv with [Modernizr](http://modernizr.com)
+
+22.07.2010 - Version 3.0
+------------------------
+
Re-built entirely from the ground up using both 'Starkers' and the 'Twenty Ten' theme as a base
-
-Version 2.8.5
--------------
-
-_Updated 25.01.2010_
-
+
+25.01.2010 - Version 2.8.5
+--------------------------
+
Starkers HTML5 was born
View
@@ -6,100 +6,9 @@
* @subpackage Starkers
* @since Starkers HTML5 3.0
*/
-
+
get_header(); ?>
-
-<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
-
- <p><a href="<?php echo get_permalink( $post->post_parent ); ?>" title="<?php esc_attr( printf( __( 'Return to %s', 'starkers' ), get_the_title( $post->post_parent ) ) ); ?>" rel="gallery"><?php /* translators: %s - title of parent post */ printf( __( '&larr; %s', 'starkers' ), get_the_title( $post->post_parent ) ); ?></a></p>
-
- <article <?php post_class() ?> id="post-<?php the_ID(); ?>">
-
- <header>
- <h2><?php the_title(); ?></h2>
-
- <?php
- printf(__('By %2$s', 'starkers'),
- 'meta-prep meta-prep-author',
- sprintf( '<a href="%1$s" title="%2$s">%3$s</a>',
- get_author_posts_url( get_the_author_meta( 'ID' ) ),
- sprintf( esc_attr__( 'View all posts by %s', 'starkers' ), get_the_author() ),
- get_the_author()
- )
- );
- ?>
- |
- <?php
- printf( __('Published %2$s', 'starkers'),
- 'meta-prep meta-prep-entry-date',
- sprintf( '<abbr title="%1$s">%2$s</abbr>',
- esc_attr( get_the_time() ),
- get_the_date()
- )
- );
- if ( wp_attachment_is_image() ) {
- echo ' | ';
- $metadata = wp_get_attachment_metadata();
- printf( __( 'Full size is %s pixels', 'starkers'),
- sprintf( '<a href="%1$s" title="%2$s">%3$s &times; %4$s</a>',
- wp_get_attachment_url(),
- esc_attr( __('Link to full-size image', 'starkers') ),
- $metadata['width'],
- $metadata['height']
- )
- );
- }
- ?>
- <?php edit_post_link( __( 'Edit', 'starkers' ), '', '' ); ?>
- </header>
-
-<?php if ( wp_attachment_is_image() ) :
- $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 image 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 attachment, get the URL of the image
- $next_attachment_url = wp_get_attachment_url();
- }
-?>
- <p><a href="<?php echo $next_attachment_url; ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php
- $attachment_size = apply_filters( 'starkers_attachment_size', 900 );
- echo wp_get_attachment_image( $post->ID, array( $attachment_size, 9999 ) ); ?></a></p>
-
- <nav>
- <?php previous_image_link( false ); ?>
- <?php next_image_link( false ); ?>
- </nav>
-
-<?php else : ?>
- <a href="<?php echo wp_get_attachment_url(); ?>" title="<?php echo esc_attr( get_the_title() ); ?>" rel="attachment"><?php echo basename( get_permalink() ); ?></a>
-<?php endif; ?>
- <?php if ( !empty( $post->post_excerpt ) ) the_excerpt(); ?>
-
- <?php the_content( __( 'Continue reading &rarr;', 'starkers' ) ); ?>
-
- <?php wp_link_pages( array( 'before' => '<nav>' . __( 'Pages:', 'starkers' ), 'after' => '</nav>' ) ); ?>
-
- <footer>
- <?php starkers_posted_in(); ?>
- <?php edit_post_link( __( 'Edit', 'starkers' ), ' ', '' ); ?>
- </footer>
-
- <?php comments_template(); ?>
-
- </article>
-
-<?php endwhile; ?>
-
+
+ <?php get_template_part( 'loop', 'attachment' ); ?>
+
<?php get_footer(); ?>
View
@@ -6,29 +6,29 @@
* @subpackage Starkers
* @since Starkers HTML5 3.0
*/
-
+
get_header(); ?>
-
+
<?php
- if ( have_posts() )
- the_post();
+ if ( have_posts() )
+ the_post();
?>
-
- <h1><?php printf( __( 'Author Archives: %s', 'starkers' ), "<a href='" . get_author_posts_url( get_the_author_meta( 'ID' ) ) . "' title='" . esc_attr( get_the_author() ) . "' rel='me'>" . get_the_author() . "</a>" ); ?></h1>
-
+
+ <h1><?php printf( __( 'Author Archives: %s', 'starkers' ), "<span class='vcard'><a class='url fn n' href='" . get_author_posts_url( get_the_author_meta( 'ID' ) ) . "' title='" . esc_attr( get_the_author() ) . "' rel='me'>" . get_the_author() . "</a></span>" ); ?></h1>
+
<?php
// If a user has filled out their description, show a bio on their entries.
if ( get_the_author_meta( 'description' ) ) : ?>
- <?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'starkers_author_bio_avatar_size', 60 ) ); ?>
- <h2><?php printf( __( 'About %s', 'starkers' ), get_the_author() ); ?></h2>
- <?php the_author_meta( 'description' ); ?>
+ <?php echo get_avatar( get_the_author_meta( 'user_email' ), apply_filters( 'starkers_author_bio_avatar_size', 60 ) ); ?>
+ <h2><?php printf( __( 'About %s', 'starkers' ), get_the_author() ); ?></h2>
+ <?php the_author_meta( 'description' ); ?>
<?php endif; ?>
-
+
<?php
- rewind_posts();
-
- get_template_part( 'loop', 'author' );
+ rewind_posts();
+
+ get_template_part( 'loop', 'author' );
?>
-
+
<?php get_sidebar(); ?>
<?php get_footer(); ?>
View
@@ -2,102 +2,53 @@
/* ----------------------------------------- */
/**
- * html5doctor.com Reset Stylesheet
+ * Eric Meyer's Reset Stylesheet
*
- * v1.4.1
- * 2010-03-01
- * Author: Richard Clark - http://richclarkdesign.com
+ * v2.0
+ * 2011-01-26
+ * Author: Eric Meyer - http://meyerweb.com/eric/tools/css/reset/
*/
-html, body, div, span, object, iframe,
+html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-abbr, address, cite, code,
-del, dfn, em, img, ins, kbd, q, samp,
-small, strong, sub, sup, var,
-b, i,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section, summary,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
time, mark, audio, video {
- margin:0;
- padding:0;
- border:0;
- outline:0;
- font-size:100%;
- vertical-align:baseline;
- background:transparent;
+ margin: 0;
+ padding: 0;
+ border: 0;
+ font-size: 100%;
+ font: inherit;
+ vertical-align: baseline;
+}
+/* HTML5 display-role reset for older browsers */
+article, aside, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section {
+ display: block;
}
-
body {
- line-height:1;
-}
-
-article,aside,canvas,details,figcaption,figure,
-footer,header,hgroup,menu,nav,section,summary {
- display:block;
+ line-height: 1;
}
-
-nav ul {
- list-style:none;
+ol, ul {
+ list-style: none;
}
-
blockquote, q {
- quotes:none;
+ quotes: none;
}
-
blockquote:before, blockquote:after,
q:before, q:after {
- content:'';
- content:none;
+ content: '';
+ content: none;
}
-
-a {
- margin:0;
- padding:0;
- border:0;
- font-size:100%;
- vertical-align:baseline;
- background:transparent;
-}
-
-ins {
- background-color:#ff9;
- color:#000;
- text-decoration:none;
-}
-
-mark {
- background-color:#ff9;
- color:#000;
- font-style:italic;
- font-weight:bold;
-}
-
-del {
- text-decoration: line-through;
-}
-
-abbr[title], dfn[title] {
- border-bottom:1px dotted #000;
- cursor:help;
-}
-
table {
- border-collapse:collapse;
- border-spacing:0;
-}
-
-hr {
- display:block;
- height:1px;
- border:0;
- border-top:1px solid #cccccc;
- margin:1em 0;
- padding:0;
-}
-
-input, select {
- vertical-align:middle;
+ border-collapse: collapse;
+ border-spacing: 0;
}
View
@@ -96,12 +96,22 @@ function starkers_menu() {
/**
* Remove inline styles printed when the gallery shortcode is used.
*
+ * @since Starkers HTML5 3.2
+ */
+add_filter( 'use_default_gallery_style', '__return_false' );
+
+/**
* @since Starkers HTML5 3.0
+ * @deprecated in Starkers HTML5 3.2 for WordPress 3.1
+ *
+ * @return string The gallery style filter, with the styles themselves removed.
*/
function starkers_remove_gallery_css( $css ) {
return preg_replace( "#<style type='text/css'>(.*?)</style>#s", '', $css );
}
-add_filter( 'gallery_style', 'starkers_remove_gallery_css' );
+// Backwards compatibility with WordPress 3.0.
+if ( version_compare( $GLOBALS['wp_version'], '3.1', '<' ) )
+ add_filter( 'gallery_style', 'starkers_remove_gallery_css' );
if ( ! function_exists( 'starkers_comment' ) ) :
/**
@@ -253,11 +263,10 @@ function starkers_widgets_init() {
/**
* Removes the default styles that are packaged with the Recent Comments widget.
*
- * @since Starkers HTML5 3.0
+ * @updated Starkers HTML5 3.2
*/
function starkers_remove_recent_comments_style() {
- global $wp_widget_factory;
- remove_action( 'wp_head', array( $wp_widget_factory->widgets['WP_Widget_Recent_Comments'], 'recent_comments_style' ) );
+ add_filter( 'show_recent_comments_widget_style', '__return_false' );
}
add_action( 'widgets_init', 'starkers_remove_recent_comments_style' );
Oops, something went wrong.

0 comments on commit da0e781

Please sign in to comment.