Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge tag '0.3.0'

Tagging version 0.3.0.
  • Loading branch information...
commit 0d259f118889d612da564e4c19ab947f51fd7072 2 parents 64b83b2 + 7d67bf4
@justintadlock authored
Showing with 91 additions and 131 deletions.
  1. +1 −1  404.php
  2. +1 −1  attachment-image.php
  3. +1 −1  comment-pingback.php
  4. +1 −1  comment-trackback.php
  5. +1 −1  comment.php
  6. +1 −1  comments.php
  7. +1 −1  content-aside.php
  8. +1 −1  content-attachment.php
  9. +1 −1  content-audio.php
  10. +2 −2 content-gallery.php
  11. +1 −1  content-image.php
  12. +2 −2 content-link.php
  13. +1 −1  content-page.php
  14. +1 −1  content-quote.php
  15. +1 −1  content-status.php
  16. +1 −1  content-video.php
  17. +1 −1  content.php
  18. +1 −1  docs/readme.html
  19. +1 −1  footer.php
  20. +48 −84 functions.php
  21. +6 −7 header.php
  22. +1 −1  index.php
  23. +1 −1  library
  24. +1 −1  loop-error.php
  25. +1 −1  loop-meta.php
  26. +1 −1  loop-nav.php
  27. +1 −1  menu-primary.php
  28. +1 −1  menu-secondary.php
  29. +1 −1  menu-subsidiary.php
  30. +1 −1  search.php
  31. +1 −1  searchform.php
  32. +1 −1  sidebar-primary.php
  33. +1 −1  sidebar-secondary.php
  34. +1 −4 style.css
  35. +1 −1  taxonomy-post_format-gallery.php
  36. +1 −1  taxonomy-post_format-image.php
  37. +1 −1  taxonomy-post_format-link.php
View
2  404.php
@@ -9,7 +9,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
View
2  attachment-image.php
@@ -9,7 +9,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
View
2  comment-pingback.php
@@ -8,7 +8,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
View
2  comment-trackback.php
@@ -8,7 +8,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
View
2  comment.php
@@ -10,7 +10,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
View
2  comments.php
@@ -9,7 +9,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
View
2  content-aside.php
@@ -8,7 +8,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
View
2  content-attachment.php
@@ -8,7 +8,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
View
2  content-audio.php
@@ -8,7 +8,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
View
4 content-gallery.php
@@ -8,7 +8,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
@@ -44,7 +44,7 @@
wp_link_pages( array( 'before' => '<p class="page-links">' . __( 'Pages:', 'my-life' ), 'after' => '</p>' ) );
} ?>
- <?php $count = my_life_get_image_attachment_count(); ?>
+ <?php $count = post_format_tools_get_image_attachment_count(); ?>
<p class="image-count"><?php printf( _n( 'This gallery contains %s image.', 'This gallery contains %s images.', $count, 'my-life' ), $count ); ?></p>
</div><!-- .entry-summary -->
View
2  content-image.php
@@ -8,7 +8,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
View
4 content-link.php
@@ -8,7 +8,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
@@ -36,7 +36,7 @@
<?php if ( get_the_title() ) { ?>
- <h2 class="entry-title"><a href="<?php echo esc_url( my_life_url_grabber() ); ?>" title="<?php the_title_attribute(); ?>"><?php printf( '%s <span class="meta-nav">&rarr;</span>', the_title( '', '', false ) ); ?></a></h2>
+ <h2 class="entry-title"><a href="<?php echo esc_url( post_format_tools_url_grabber() ); ?>" title="<?php the_title_attribute(); ?>"><?php printf( '%s <span class="meta-nav">&rarr;</span>', the_title( '', '', false ) ); ?></a></h2>
<?php } else { ?>
View
2  content-page.php
@@ -8,7 +8,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
View
2  content-quote.php
@@ -8,7 +8,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
View
2  content-status.php
@@ -8,7 +8,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
View
2  content-video.php
@@ -8,7 +8,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
View
2  content.php
@@ -8,7 +8,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
View
2  docs/readme.html
@@ -81,7 +81,7 @@
<p>This theme is copyrighted to <a href="http://justintadlock.com" title="Justin Tadlock">Justin Tadlock</a>.</p>
-<p>2011&thinsp;&ndash;&thinsp;2012 &copy; Justin Tadlock.</p>
+<p>2011&thinsp;&ndash;&thinsp;2013 &copy; Justin Tadlock.</p>
</body>
</html>
View
2  footer.php
@@ -11,7 +11,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
View
132 functions.php
@@ -20,10 +20,10 @@
*
* @package MyLife
* @subpackage Functions
- * @version 0.2.0
+ * @version 0.3.0
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
@@ -52,12 +52,17 @@ function my_life_theme_setup() {
add_theme_support( 'hybrid-core-widgets' );
add_theme_support( 'hybrid-core-shortcodes' );
add_theme_support( 'hybrid-core-theme-settings', array( 'about', 'footer' ) );
- add_theme_support( 'hybrid-core-drop-downs' );
+ add_theme_support( 'hybrid-core-scripts', array( 'comment-reply', 'drop-downs' ) );
+ add_theme_support( 'hybrid-core-styles', array( 'style' ) );
add_theme_support( 'hybrid-core-template-hierarchy' );
- //add_theme_support( 'hybrid-core-seo' );
/* Add theme support for framework extensions. */
- add_theme_support( 'theme-layouts', array( '1c', '2c-l', '2c-r', '3c-l', '3c-r', '3c-c' ) );
+ add_theme_support(
+ 'theme-layouts',
+ array( '1c', '2c-l', '2c-r', '3c-l', '3c-r', '3c-c' ),
+ array( 'default' => '2c-l', 'customize' => true )
+ );
+
add_theme_support( 'post-stylesheets' );
add_theme_support( 'dev-stylesheet' );
add_theme_support( 'loop-pagination' );
@@ -108,12 +113,6 @@ function my_life_theme_setup() {
/* Add custom image sizes. */
add_action( 'init', 'my_life_add_image_sizes' );
- /* Wraps <blockquote> around quote posts. */
- add_filter( 'the_content', 'my_life_quote_content' );
-
- /* Adds the featured image to image posts if no content is found. */
- add_filter( 'the_content', 'my_life_image_content' );
-
/* Filter the header image on singular views. */
add_filter( 'theme_mod_header_image', 'my_life_header_image' );
@@ -181,65 +180,6 @@ function my_life_header_image( $url ) {
}
/**
- * Wraps the output of the quote post format content in a <blockquote> element if the user hasn't added a
- * <blockquote> in the post editor.
- *
- * @since 0.1.0
- * @param string $content The post content.
- * @return string $content
- */
-function my_life_quote_content( $content ) {
-
- if ( has_post_format( 'quote' ) ) {
- preg_match( '/<blockquote.*?>/', $content, $matches );
-
- if ( empty( $matches ) )
- $content = "<blockquote>{$content}</blockquote>";
- }
-
- return $content;
-}
-
-/**
- * Returns the featured image for the image post format if the user didn't add any content to the post.
- *
- * @since 0.1.0
- * @param string $content The post content.
- * @return string $content
- */
-function my_life_image_content( $content ) {
-
- if ( has_post_format( 'image' ) && '' == $content ) {
- if ( is_singular() )
- $content = get_the_image( array( 'size' => 'full', 'meta_key' => false, 'link_to_post' => false ) );
- else
- $content = get_the_image( array( 'size' => 'full', 'meta_key' => false ) );
- }
-
- return $content;
-}
-
-/**
- * Grabs the first URL from the post content of the current post. This is meant to be used with the link post
- * format to easily find the link for the post.
- *
- * @since 0.1.0
- * @return string The link if found. Otherwise, the permalink to the post.
- *
- * @note This is a modified version of the twentyeleven_url_grabber() function in the TwentyEleven theme.
- * @author wordpressdotorg
- * @copyright Copyright (c) 2011 - 2012, wordpressdotorg
- * @link http://wordpress.org/extend/themes/twentyeleven
- * @license http://wordpress.org/about/license
- */
-function my_life_url_grabber() {
- if ( ! preg_match( '/<a\s[^>]*?href=[\'"](.+?)[\'"]/is', get_the_content(), $matches ) )
- return get_permalink( get_the_ID() );
-
- return esc_url_raw( $matches[1] );
-}
-
-/**
* Adds custom image sizes for featured images. The 'feature' image size is used for sticky posts.
*
* @since 0.1.0
@@ -256,10 +196,10 @@ function my_life_add_image_sizes() {
function my_life_one_column() {
if ( !is_active_sidebar( 'primary' ) && !is_active_sidebar( 'secondary' ) )
- add_filter( 'get_theme_layout', 'my_life_theme_layout_one_column' );
+ add_filter( 'theme_mod_theme_layout', 'my_life_theme_layout_one_column' );
- elseif ( is_attachment() && 'layout-default' == theme_layouts_get_layout() )
- add_filter( 'get_theme_layout', 'my_life_theme_layout_one_column' );
+ elseif ( is_attachment() && wp_attachment_is_image() && 'default' == get_post_layout( get_queried_object_id() ) )
+ add_filter( 'theme_mod_theme_layout', 'my_life_theme_layout_one_column' );
}
/**
@@ -270,7 +210,7 @@ function my_life_one_column() {
* @return string
*/
function my_life_theme_layout_one_column( $layout ) {
- return 'layout-1c';
+ return '1c';
}
/**
@@ -339,16 +279,6 @@ function my_life_next_comments_link_attributes( $attributes ) {
return $attributes . ' class="next"';
}
-/**
- * Returns the number of images attached to the current post in the loop.
- *
- * @since 0.1.0
- * @return int
- */
-function my_life_get_image_attachment_count() {
- $images = get_children( array( 'post_parent' => get_the_ID(), 'post_type' => 'attachment', 'post_mime_type' => 'image', 'numberposts' => -1 ) );
- return count( $images );
-}
/**
* Returns a set of image attachment links based on size.
@@ -446,4 +376,38 @@ function my_life_entry_permalink_shortcode() {
_deprecated_function( __FUNCTION__, '0.2.0' );
}
+/**
+ * @since 0.1.0
+ * @deprecated 0.3.0
+ */
+function my_life_quote_content() {
+ _deprecated_function( __FUNCTION__, '0.3.0' );
+}
+
+/**
+ * @since 0.1.0
+ * @deprecated 0.3.0
+ */
+function my_life_image_content() {
+ _deprecated_function( __FUNCTION__, '0.3.0' );
+}
+
+/**
+ * @since 0.1.0
+ * @deprecated 0.3.0
+ */
+function my_life_get_image_attachment_count() {
+ _deprecated_function( __FUNCTION__, '0.3.0', 'post_format_tools_get_image_attachment_count' );
+ post_format_tools_get_image_attachment_count();
+}
+
+/**
+ * @since 0.1.0
+ * @deprecated 0.3.0
+ */
+function my_life_url_grabber() {
+ _deprecated_function( __FUNCTION__, '0.3.0', 'post_format_tools_url_grabber' );
+ post_format_tools_url_grabber();
+}
+
?>
View
13 header.php
@@ -10,7 +10,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
@@ -18,10 +18,9 @@
<!DOCTYPE html>
<html <?php language_attributes(); ?>>
<head>
+
<meta http-equiv="Content-Type" content="<?php bloginfo( 'html_type' ); ?>; charset=<?php bloginfo( 'charset' ); ?>" />
<title><?php hybrid_document_title(); ?></title>
-
-<link rel="stylesheet" href="<?php echo get_stylesheet_uri(); ?>" type="text/css" media="all" />
<link rel="profile" href="http://gmpg.org/xfn/11" />
<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
@@ -45,10 +44,10 @@
<div class="wrap">
- <div id="branding">
- <?php hybrid_site_title(); ?>
- <?php hybrid_site_description(); ?>
- </div><!-- #branding -->
+ <hgroup id="branding">
+ <h1 id="site-title"><a href="<?php echo home_url(); ?>" title="<?php echo esc_attr( get_bloginfo( 'name' ) ); ?>"><?php bloginfo( 'name' ); ?></a></h1>
+ <h2 id="site-description"><?php bloginfo( 'description' ); ?></h2>
+ </hgroup><!-- #branding -->
<?php do_atomic( 'header' ); // my-life_header ?>
View
2  index.php
@@ -9,7 +9,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
2  library
@@ -1 +1 @@
-Subproject commit 94cc99e6781c5153040feb9f36c9dade1fc3c459
+Subproject commit 32f5773a43722a7b10f125017207e7b6fde6dc82
View
2  loop-error.php
@@ -8,7 +8,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
View
2  loop-meta.php
@@ -9,7 +9,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
View
2  loop-nav.php
@@ -9,7 +9,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
View
2  menu-primary.php
@@ -8,7 +8,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
View
2  menu-secondary.php
@@ -8,7 +8,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
View
2  menu-subsidiary.php
@@ -8,7 +8,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
View
2  search.php
@@ -9,7 +9,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
View
2  searchform.php
@@ -8,7 +8,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
View
2  sidebar-primary.php
@@ -9,7 +9,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
View
2  sidebar-secondary.php
@@ -9,7 +9,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
View
5 style.css
@@ -2,15 +2,12 @@
* Theme Name: My Life
* Theme URI: http://themehybrid.com/themes/my-life
* Description: A serene blogging theme that emphasizes your content with readable typography. It uses post formats; has three nav menu locations; and supports one-, two-, and three-column layouts.
- * Version: 0.2
+ * Version: 0.3
* Author: Justin Tadlock
* Author URI: http://justintadlock.com
* Tags: theme-options, threaded-comments, microformats, translation-ready, rtl-language-support, one-column, two-columns, three-columns, right-sidebar, left-sidebar, fixed-width, sticky-post, custom-background, custom-header, custom-menu, full-width-template, post-formats, featured-images, featured-image-header
* License: GNU General Public License v2.0
* License URI: http://www.gnu.org/licenses/gpl-2.0.html
- *
- * Copyright (c) 2011 - 2012 Justin Tadlock.
- * http://justintadlock.com
*/
html,body,div,span,object,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,samp,small,strong,sub,sup,tt,var,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,time,mark,audio,video{margin:0;padding:0;vertical-align:baseline;outline:none;font-size:100%;background:transparent;border:none;text-decoration:none}article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section{display:block}b,i,hr,u,center,menu,layer,s,strike,font,xmp{margin:0;padding:0;vertical-align:baseline;outline:none;font-size:100%;font-weight:normal;font-style:normal;background:transparent;border:none;text-decoration:none}body{line-height:25px;font-family:Georgia,Times,"Times New Roman",serif;color:#333;background:#fff}h1,h2,h3,h4,h5,h6{font-style:normal;font-weight:normal;margin:0 0 25px 0}h1{font-size:1.8em}h2{font-size:1.7em}h3{font-size:1.55em}h4{font-size:1.4em}h5{font-size:1.25em}h6{font-size:1.1em}p{margin:0 0 25px 0}ol,ul{list-style:none}ul{list-style:disc;margin:0 0 25px 2.5em}ol{list-style-type:decimal;margin:0 0 25px 3em}ol ol{list-style:upper-roman}ol ol ol{list-style:lower-roman}ol ol ol ol{list-style:upper-alpha}ol ol ol ol ol{list-style:lower-alpha}ul ul,ol ol,ul ol,ol ul{margin-bottom:0}dl{margin:0 0 25px 5px}dl dt{font-weight:bold;margin:10px 0 0 0}dl dd{margin:5px 0 0 1.5em}strong{font-weight:bold}strong strong{font-weight:normal}em,cite{font-style:italic}em em,cite cite{font-style:normal}abbr{cursor:help}acronym{text-transform:uppercase;border-bottom:1px dashed #666;cursor:help}big{font-size:120%}small,sup,sub{font-size:80%}sup{vertical-align:baseline;position:relative;bottom:0.3em}sub{vertical-align:baseline;position:relative;top:0.3em}address{font-style:italic;margin:0 0 25px 0}li address,dd address{margin:0}blockquote{margin:0 25px;font-style:normal}blockquote em,blockquote cite{font-style:italic}blockquote,q{quotes:none}blockquote:before,blockquote:after,q:before,q:after{content:'';content:none}a{cursor:pointer}a img{border:none}pre{overflow:auto;font:.9em Monaco,monospace,Courier,"Courier New";line-height:25px;margin-bottom:25px;padding:10px}code{font:.9em Monaco,monospace,Courier,"Courier New"}pre code{font-size:1em}ins,dfn{font-style:italic;text-decoration:none;border-bottom:1px solid #666}del,s,strike{text-decoration:line-through}object{margin-bottom:25px}input,textarea{font-size:1em;padding:3px}input[type="submit"]{cursor:pointer}:focus{outline:none}form label{cursor:pointer}option{padding:1px 2px}table{border-collapse:collapse;border-spacing:0;margin-bottom:25px}th,td{text-align:left}hr{height:1px;margin-bottom:25px;background:#333}img.wp-smiley{max-height:12px;margin:0;padding:0;border:none}.gallery{display:block;text-align:center;margin-bottom:25px}.alignleft,.left{float:left;margin-right:20px}.alignright,.right{float:right;margin-left:20px}.aligncenter,.center{display:block;margin:0 auto 25px auto}.alignnone,.block{clear:both;margin:0 0 25px 0}.clear{clear:both}blockquote.alignleft,blockquote.alignright{width:33%}div.menu ul{margin:0;padding:0;list-style:none;line-height:1.0}div.menu ul ul{position:absolute;top:-999em;width:10em}div.menu ul ul li{width:100%}div.menu li:hover{visibility:inherit}div.menu li{float:left;position:relative}div.menu a{display:block;position:relative}div.menu li:hover ul,li.sfHover ul{left:0;top:2em;z-index:99}div.menu li:hover li ul,li.sfHover li ul{top:-999em}div.menu li li:hover ul,li li.sfHover ul{left:10em;top:0}div.menu li li:hover li ul,li li.sfHover li ul{top:-999em}div.menu li li li:hover ul,li li li.sfHover ul{left:10em;top:0}.gallery{display:block;clear:both;overflow:hidden;margin:0 auto}.gallery .gallery-row{display:block;clear:both;overflow:hidden;margin:0}.gallery .gallery-item{overflow:hidden;float:left;margin:0;text-align:center;list-style:none;padding:0}.gallery .gallery-item .gallery-icon img{width:auto;max-width:89%;height:auto;padding:1%;margin:0 auto}.gallery-caption{margin-left:0}.gallery .col-0{width:100%}.gallery .col-1{width:100%}.gallery .col-2{width:50%}.gallery .col-3{width:33.33%}.gallery .col-4{width:25%}.gallery .col-5{width:20%}.gallery .col-6{width:16.66%}.gallery .col-7{width:14.28%}.gallery .col-8{width:12.5%}.gallery .col-9{width:11.11%}.gallery .col-10{width:10%}.gallery .col-11{width:9.09%}.gallery .col-12{width:8.33%}.gallery .col-13{width:7.69%}.gallery .col-14{width:7.14%}.gallery .col-15{width:6.66%}.gallery .col-16{width:6.25%}.gallery .col-17{width:5.88%}.gallery .col-18{width:5.55%}.gallery .col-19{width:5.26%}.gallery .col-20{width:5%}.gallery .col-21{width:4.76%}.gallery .col-22{width:4.54%}.gallery .col-23{width:4.34%}.gallery .col-24{width:4.16%}.gallery .col-25{width:4%}.gallery .col-26{width:3.84%}.gallery .col-27{width:3.7%}.gallery .col-28{width:3.57%}.gallery .col-29{width:3.44%}.gallery .col-30{width:3.33%}@font-face{font-family:'SortsMillGoudyItalic';src:url('fonts/goudystm/GoudyStM-Italic-webfont.eot');src:url('fonts/goudystm/GoudyStM-Italic-webfont.eot?#iefix') format('embedded-opentype'),url('fonts/goudystm/GoudyStM-Italic-webfont.woff') format('woff'),url('fonts/goudystm/GoudyStM-Italic-webfont.ttf') format('truetype'),url('fonts/goudystm/GoudyStM-Italic-webfont.svg#SortsMillGoudyItalic') format('svg');font-weight:normal;font-style:normal}body{display:table;width:100%;font:normal normal normal 16px/25px Georgia,Palatino,"Palatino Linotype","Book Antiqua",serif;border-top:5px solid #847e79;border-bottom:5px solid #847e79}#main{line-height:26px}.layout-1c #main{font-size:17px;line-height:28px}.layout-3c-l #main,.layout-3c-r #main,.layout-3c-c #main{font-size:15px;line-height:24px}a{color:#70a0b2}a:hover{text-decoration:underline}h1,h2,h3,h4,h5,h6{font-family:'SortsMillGoudyItalic',"Goudy Old Style",Garamond,"Big Caslon","Times New Roman",serif}ul{list-style-type:square}dl dt{font-size:.95em;font-family:Arial,"Helvetica Neue",Helvetica,sans-serif}dl dd{color:#888}blockquote{height:100%;margin:0;padding:12px 60px 0 60px;font-size:.95em;color:#999;background:url(images/quotes.png) no-repeat 0 0}blockquote blockquote{font-size:1em;padding:4px 45px 0 45px;background-image:url(images/quotes-alt.png)}.hentry blockquote p{line-height:25px}code{padding:0 3px;color:#5e5752;background:#f3f0e0}pre{padding:25px;font-size:.9em;color:#5e5752;background:#f3f0e0;border:1px solid #edeada}pre code{padding:0}acronym,abbr{border-bottom:1px dotted #999}table{margin:0 0 25px 0;width:100%;background:#f4f2e7;border-left:1px solid #f4f2e7;border-right:1px solid #f4f2e7}table caption{font-size:.85em;text-transform:uppercase;color:#999}th{font:normal normal bold .85em/25px Arial,"Helvetica Neue",Helvetica,sans-serif;padding:4px 2%;text-align:left;border-top:1px solid #f4f2e7;border-bottom:1px solid #f4f2e7;border-right:1px solid #f4f2e7}td,tbody th{padding:4px 2%;font-size:.9em;color:#666;background:#ece9da;border-bottom:1px solid #f4f2e7;border-right:1px solid #f4f2e7}tr:hover td,tr:hover th{background:#e0dcca}thead th,tfoot th,thead tr:hover th,tfoot tr:hover th{color:#f3f0e0;background:#635a52}td.pad,th.pad{background:#f3f0e0}#wp-calendar{}#wp-calendar a{font-weight:bold;display:block;color:#f3f0e0;background:#635a52}#wp-calendar a:hover{background:#4e4844}#wp-calendar th{}#wp-calendar th,#wp-calendar td{padding:0;text-align:center}#wp-calendar td.pad,#wp-calendar #prev,#wp-calendar #next{background:transparent}#wp-calendar #prev{text-align:left}#wp-calendar #next{text-align:right}#wp-calendar #prev a,#wp-calendar #next a{display:inline;font-family:Arial,"Helvetica Neue",Helvetica,sans-serif;color:#635a52;background:transparent}hr{height:1px;background:#e2e6e2}.hfeed img,.avatar{width:auto;height:auto;padding:9px;background:#e0dfdd url('images/image-bg.png') repeat 0 0;border:1px solid #d5d3d1}.layout-default .hentry img,.layout-2c-l .hentry img{max-width:580px}.layout-3c-l .hentry img,.layout-3c-r .hentry img,.layout-3c-c .hentry img{max-width:450px}.layout-1c .hentry img{max-width:788px}.avatar{float:left;margin:0 25px 5px 0}.format-status .avatar{width:65px;height:65px;margin-bottom:25px}.wp-caption{overflow:visible;padding:0}.wp-caption.alignright{margin-right:20px}.wp-caption.alignleft{margin-right:45px}.layout-1c .wp-caption{max-width:808px}.layout-default .wp-caption,.layout-2c-l .wp-caption,.layout-2c-r .wp-caption{max-width:600px}.layout-3c-l .wp-caption,.layout-3c-r .wp-caption,.layout-3c-c .wp-caption{max-width:470px}.wp-caption img{width:100%;margin:0}.wp-caption-text{max-width:560px;margin:-7px 10px 7px 10px;padding:8px 10px;font:normal normal normal 12px/12px Arial,"Helvetica Neue",Helvetica,sans-serif;text-align:center;color:#888;background:#f3f0e0;border-bottom:1px solid #d5d3d1}.layout-1c .wp-caption-text{max-width:768px}.layout-3c-l .wp-caption-text,.layout-3c-r .wp-caption-text,.layout-3c-c .wp-caption-text{max-width:430px}.alignright .wp-caption-text,.alignleft .wp-caption-text,.aligncenter .wp-caption-text,.alignnone .wp-caption-text{margin-right:-10px}.thumbnail{float:right;max-width:150px;max-height:150px;margin:0 0 5px 25px}.format-gallery .thumbnail,.taxonomy-post_format-gallery .gallery .gallery-icon .thumbnail{width:150px;height:150px;padding:18px 18px 10px 10px;background:url('images/gallery-thumb.png') no-repeat right 0;border:none}.taxonomy-post_format-gallery .gallery .gallery-icon .thumbnail{float:none}.taxonomy-post_format-image .gallery .gallery-icon .thumbnail{float:none;width:auto;max-width:89%;height:auto;margin:0 auto;padding:10px}.gallery{margin-bottom:25px !important}.gallery-caption{margin-bottom:5px;font:normal normal normal 13px/25px Arial,"Helvetica Neue",Helvetica,sans-serif;color:#999}.singular-attachment .gallery-caption{display:none}.hentry .gallery .gallery-icon .attachment-thumbnail{padding:3%}img.wp-smiley{max-height:12px !important;margin:0 !important;padding:0 !important;background:transparent !important;border:none !important}#menu-primary{position:relative;z-index:99;width:100%;height:35px;background:url('images/menu-primary-bg.png') repeat 0 0;border-bottom:2px solid #4e4844}#menu-primary .wrap{width:1010px;margin:0 auto}#menu-primary li a{float:left;padding:6px 25px;font:normal normal bold 12px/25px Arial,"Helvetica Neue",Helvetica,sans-serif;text-transform:uppercase;color:#f3f0e0}#menu-primary li a:hover,#menu-primary li.sfHover a,#menu-primary li.current-menu-item a{background:#4e4844}#menu-primary li li a{margin:0 15px;padding:6px 15px;font-weight:normal;text-transform:none;color:#dad6c9;border-bottom:1px dotted #5a544f}#menu-primary li ul{padding-bottom:15px;background:#4e4844;border-bottom-right-radius:5px;border-bottom-left-radius:5px}#menu-primary li:hover ul,#menu-primary li.sfHover ul{top:35px}#menu-primary li:hover li ul,#menu-primary li.sfHover li ul{top:-999em}#menu-primary li li:hover ul,#menu-primary li li.sfHover ul{top:0}#menu-primary a.sf-with-ul{padding-right:28px}#menu-primary li .sf-sub-indicator{overflow:hidden;position:absolute;top:16px;right:12px;width:9px;height:5px;text-indent:-9999em;background:url(images/menu-primary-arrows.png) no-repeat 0 0}#menu-primary li a:hover .sf-sub-indicator,#menu-primary li.sfHover .sf-sub-indicator,#menu-primary li.current-menu-item .sf-sub-indicator{background-position:0 -5px}#menu-primary li ul li .sf-sub-indicator,#menu-primary li ul li.current-menu-item li .sf-sub-indicator{top:14px;width:5px;height:9px;background-position:0 -10px !important}#menu-primary form{overflow:hidden;width:200px;float:right;margin-top:5px}#menu-primary input[type="text"]{float:right;width:111px;margin:0;padding:5px 0 6px 29px;font-family:Georgia,Times,'Times New Roman',serif;font-style:italic;font-size:12px;color:#c6c3c0;background:#4e4844 url('images/search.png') no-repeat 6px 3px;border:none}#menu-primary input[type="text"]:focus{width:171px;color:#f4f2e7;background-color:#847e79}#menu-primary .search-submit{display:none}#header{width:1010px;height:50px;margin:0 auto;padding:25px 0}#branding{position:relative;z-index:98}#site-title{float:left;margin:0 25px 0 0;font:normal normal normal 50px/50px 'SortsMillGoudyItalic',"Goudy Old Style",Garamond,"Big Caslon","Times New Roman",serif}#site-title a{color:#5e5752}#site-description{float:left;margin:0;font-size:14px;line-height:50px;font-family:Georgia,serif;color:#70a0b2}.header-image{display:block;width:1000px;height:200px;margin:0 auto 25px auto;padding:4px;background:#f4f2e7;border:1px solid #d5d3d1}#menu-secondary{position:relative;width:1010px;height:35px;margin:-70px auto 35px auto}#menu-secondary ul{float:right}#menu-secondary li{margin-left:25px}#menu-secondary li li{margin-left:0}#menu-secondary li a{padding:10px 20px;font:normal normal bold 11px/14px Arial,"Helvetica Neue",Helvetica,sans-serif;text-transform:uppercase;color:#f3f0e0;background:#70a0b2}#menu-secondary li a:hover,#menu-secondary li.sfHover a,#menu-secondary li.current-menu-item a{background:#628e9f}#menu-secondary li li a{margin:0 15px;padding:10px 15px;font-weight:normal;text-transform:none;background:#628e9f;border-bottom:1px dotted #70a0b2}#menu-secondary li ul{padding-bottom:15px;background:#628e9f;border-bottom-right-radius:5px;border-bottom-left-radius:5px}#menu-secondary li:hover ul,#menu-secondary li.sfHover ul{top:34px}#menu-secondary li:hover li ul,#menu-secondary li.sfHover li ul{top:-999em}#menu-secondary li li:hover ul,#menu-secondary li li.sfHover ul{top:0}#menu-secondary a.sf-with-ul{padding-right:28px}#menu-secondary li .sf-sub-indicator{overflow:hidden;position:absolute;top:15px;right:12px;width:9px;height:5px;text-indent:-9999em;background:url(images/menu-secondary-arrows.png) no-repeat 0 0}#menu-secondary li a:hover .sf-sub-indicator,#menu-secondary li.sfHover .sf-sub-indicator,#menu-secondary li.current-menu-item .sf-sub-indicator{background-position:0 -5px}#menu-secondary li ul li .sf-sub-indicator,#menu-secondary li ul li.current-menu-item li .sf-sub-indicator{top:14px;width:5px;height:9px;background-position:0 -10px !important}.breadcrumbs{margin:0 0 50px 0;font-size:.9em;color:#9f9994}.breadcrumbs .trail-before{margin-right:5px}.breadcrumbs .sep{display:inline-block;width:5px;height:25px;margin:0 5px;text-indent:-9999em;background:url('images/breadcrumb-sep.png') no-repeat 0 8px}.breadcrumbs .trail-end{font-style:italic;color:#bab7b5}.breadcrumbs a{color:#807871}.hentry{margin-bottom:25px;padding-bottom:25px;border-bottom:1px solid #e2e6e2}.singular .hentry{margin-bottom:50px;padding-bottom:0;border-bottom:none}.sticky{padding:25px;background:#f3f0e0;border:1px solid #edeada}.entry-title{font-size:20px;margin-bottom:25px}.singular .entry-title,.error-404 .entry-title{margin-bottom:25px;padding-bottom:25px;font-size:25px;text-align:center;border-bottom:1px solid #e2e6e2}.singular-post .entry-title,.format-standard .entry-title,.singular.attachment-image .entry-title{margin-bottom:10px;padding-bottom:0;border-bottom:none}.singular .entry-title a{color:#5e5752}.home .format-link .entry-title,.archive .format-link .entry-title{margin-bottom:10px}.byline{margin-bottom:10px;font:normal normal normal 12px/25px Arial,"Helvetica Neue",Helvetica,sans-serif;color:#aaa}.singular .byline{margin-bottom:25px;padding-bottom:25px;text-align:center;border-bottom:1px solid #e2e6e2}.byline .published{font-family:Georgia,Times,'Times New Roman',serif;font-style:italic}.format-standard{overflow:hidden}.singular-post .entry-content{padding-top:0;border-top:none}.entry-meta{clear:both;font:normal normal normal 12px/25px Arial,"Helvetica Neue",Helvetica,sans-serif;color:#aaa}.format-standard .entry-meta{clear:none;margin-top:-15px}.singular .format-standard .entry-meta{clear:both;margin-top:0}.singular .entry-meta{margin-top:0;padding-top:25px;border-top:1px solid #e2e6e2}.singular .entry-meta .category,.singular .entry-meta .post_tag{display:block}a.post-format-link{padding-left:21px;background:url('images/icons.png') no-repeat 0 0}.format-aside a.post-format-link{padding-left:19px}.format-audio a.post-format-link{background-position:0 -30px}.format-chat a.post-format-link{background-position:0 -60px}.format-gallery a.post-format-link{padding-left:19px;background-position:0 -90px}.format-image a.post-format-link{background-position:0 -120px}.format-link a.post-format-link{padding-left:19px;background-position:0 -150px}.format-quote a.post-format-link{background-position:0 -178px}.format-status a.post-format-link{background-position:0 -210px}.format-video a.post-format-link{background-position:0 -239px}.format-gallery .image-count{font-style:italic;color:#999}.taxonomy-post_format-link .hentry ul.links{list-style:none;margin-left:10px}.taxonomy-post_format-link .hentry ul.links li{padding-left:19px;background:url('images/icon-link.png') no-repeat 0 4px}.loop-meta{overflow:hidden;margin-bottom:25px;border-bottom:1px solid #e2e6e2}.loop-meta .loop-title{font-size:25px;text-align:center}.loop-meta .loop-description{color:#bab7b5;color:#999;font-style:italic;color:#aaa7a5}.pagination,.page-links,.comment-pagination{overflow:hidden;clear:both;font-size:13px;font-weight:bold;line-height:13px;margin:0 0 25px 0}.pagination{margin-bottom:23px;padding-bottom:2px;text-align:center}.page-links{padding:7px 0 0 0}.pagination .page-numbers,.page-links a{display:inline-block;margin:0 10px 0 0px;padding:11px 15px;padding:13px 15px 11px 15px;font:normal normal bold 12px/13px Arial,"Helvetica Neue",Helvetica,sans-serif;text-transform:uppercase;color:#f3f0e0;background:#847e79}.pagination .next{margin-right:0}.pagination .meta-nav,.loop-nav .meta-nav{font-size:13px}.page-links a{margin:0 3px;padding:8px 12px}.entry-summary .page-links a{padding:5px 9px}.pagination .page-numbers:hover,.page-links a:hover{background:#5e5752}.pagination .dots:hover{background:#847e79}.pagination .current{background:#5e5752}.loop-nav,.loop-pagination{overflow:hidden;margin:0 0 50px 0;font-size:13px;font-weight:bold;line-height:13px}.loop-nav .previous,.loop-nav .next{float:left;margin:0;padding:13px 15px 11px 15px;font:normal normal bold 12px/13px Arial,"Helvetica Neue",Helvetica,sans-serif;text-transform:uppercase;color:#f3f0e0;background:#847e79}.loop-nav .next{float:right;text-align:right}.loop-nav a:hover span{background:#5e5752}.widget{font-size:.9em;color:#888}.widget-title{font:normal normal bold 18px/25px Arial,"Helvetica Neue",Helvetica,sans-serif;color:#666}.widget img{max-width:100%}.widget-search{padding-bottom:25px !important}.widget-search input[type="text"]{display:block;width:94%;padding:5px 3%;text-indent:5px;font:italic normal normal 14px/25px Georgia,Times,'Times New Roman',serif;color:#5e5752;background:#fff;border:none}.widget-search input[type="submit"],.widget-search label{display:none}#comments-number{padding-bottom:25px;border-bottom:1px solid #e2e6e2}.comments-closed{padding:25px;color:#999;background:#f3f0e0;border:1px solid #e2e6e2}.comments-nav{float:right;position:relative;line-height:29px;margin:-75px 25px 10px 0}.comments-nav .page-numbers{font-size:10px;text-transform:uppercase;color:#777}.comments-nav .prev,.comments-nav .next{background:url('images/comments-nav.png') 0 0 no-repeat;display:inline-block;margin:0 0 0 10px;height:29px;width:29px;text-indent:-9999px}.comments-nav .next{background-position:0 -29px}.comment-list,.comment-list ol.children{list-style:none;margin:0 0 25px 0}.comment-list ol.children{margin-left:50px;margin-bottom:0}.comment-list li.comment,.comment-list li.pingback,.comment-list li.trackback{clear:both;overflow:hidden;margin-bottom:25px;border-bottom:1px solid #e2e6e2}.comment-list li li.comment{overflow:hidden;padding:25px 0 0 0;margin-bottom:0;border-bottom:none}.comment-list li.pingback,.comment-list li.trackback{padding:0 10px}.comment-list .avatar{float:left;width:80px;height:80px;margin:0 25px 25px 0}.comment-list li li .avatar{width:40px;height:40px;margin-bottom:5px;padding:4px}.comment-meta{margin-bottom:10px;font:normal normal normal 12px/25px Arial,"Helvetica Neue",Helvetica,sans-serif;color:#aaa}.comment-list li.pingback .comment-meta,.comment-list li.trackback .comment-meta{margin-bottom:25px}.comment-meta .published abbr{font-family:Georgia,Times,'Times New Roman',serif;font-style:italic}.comment-author{display:block}.comment-author cite{font:normal normal bold 16px/25px Arial,"Helvetica Neue",Helvetica,sans-serif}.pingback .comment-author cite,.trackback .comment-author cite{font:italic normal normal 14px/25px Georgia,Times,'Times New Roman',serif}.comment-reply-link{}.comment-text{overflow:hidden}.comment-list li li.comment .comment-text{overflow:visible}.comment-list li li.has-avatar .comment-text{margin-left:75px}.comment-text .moderation{font-style:italic;color:#888}#respond{overflow:hidden;margin-bottom:25px}#reply-title small a{font-family:Arial,"Helvetica Neue",Helvetica,sans-serif;font-size:12px;font-weight:bold}#respond p.form-author{float:left;width:50%}#respond p.form-email{overflow:hidden;float:right;width:50%}#respond p.form-url{clear:both}#respond label{font:normal normal normal 13px/25px Arial,"Helvetica Neue",Helvetica,sans-serif}#respond p.form-email label{padding:0 9px}#respond span.required{font-size:16px;font-weight:bold}#respond input[type="text"],#respond textarea{display:block;width:98.5%;color:#666;font-family:Georgia,Times,'Times New Roman',serif}#respond p.form-author input[type="text"]{width:90%}#respond p.form-email input[type="text"],#respond p.form-email label{width:90%;float:right}#respond #submit{float:right;margin:0 0 25px 25px;padding:13px 15px 11px 15px;font:normal normal bold 12px/12px Arial,"Helvetica Neue",Helvetica,sans-serif;text-transform:uppercase;color:#f3f0e0;background:#847e79;border:none}#respond #submit:hover{background:#5e5752}#footer{overflow:hidden;width:960px;margin:0 auto;padding:0 25px;color:#999}#footer .copyright,#footer .credit{float:left;width:50%}#footer .credit{text-align:right}#menu-subsidiary{clear:both;height:37px;background:url('images/menu-primary-bg.png') repeat 0 0;border-top:2px solid #4e4844}#menu-subsidiary .wrap{width:1010px;margin:0 auto}#menu-subsidiary li a{float:left;padding:6px 25px;font:normal normal bold 12px/25px Arial,"Helvetica Neue",Helvetica,sans-serif;text-transform:uppercase;color:#f3f0e0}#menu-subsidiary li a:hover,#menu-subsidiary li.current-menu-item a{background:#4e4844}#main{clear:both;overflow:hidden;width:908px;margin:0 auto 25px auto;padding:50px 50px 0 50px;color:#666;background:#f4f2e7;border:1px solid #d5d3d1}.layout-1c #main{width:808px;padding:50px 100px 0 100px}.layout-2c-l #content,.layout-default #content{float:left;width:600px}.layout-2c-l #sidebar-primary,.layout-default #sidebar-primary,.layout-2c-l #sidebar-secondary,.layout-default #sidebar-secondary{float:right;width:250px}.layout-2c-l #sidebar-secondary,.layout-default #sidebar-secondary{clear:right}.layout-2c-r #content{float:right;width:600px}.layout-2c-r #sidebar-primary,.layout-2c-r #sidebar-secondary{float:left;width:250px}.layout-2c-r #sidebar-secondary{clear:left}.layout-default #sidebar-secondary,.layout-2c-l #sidebar-secondary,.layout-2c-r #sidebar-secondary{width:200px;margin-bottom:50px;padding:25px 25px 0 25px;background:#f3f0e0;border:1px solid #edeada}.layout-3c-l #content{float:left;width:470px}.layout-3c-l #sidebar-primary,.layout-3c-l #sidebar-secondary{float:left;width:169px;margin:0 0 0 50px}.layout-3c-r #content{float:right;width:470px}.layout-3c-r #sidebar-primary,.layout-3c-r #sidebar-secondary{float:left;width:169px;margin:0 50px 0 0}.layout-3c-c #content{float:left;margin-left:219px;width:470px}.layout-3c-c #sidebar-primary{float:left;margin-left:-689px;width:169px}.layout-3c-c #sidebar-secondary{float:right;width:169px}
View
2  taxonomy-post_format-gallery.php
@@ -9,7 +9,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
View
2  taxonomy-post_format-image.php
@@ -9,7 +9,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
View
2  taxonomy-post_format-link.php
@@ -9,7 +9,7 @@
* @subpackage Template
* @since 0.1.0
* @author Justin Tadlock <justin@justintadlock.com>
- * @copyright Copyright (c) 2011 - 2012, Justin Tadlock
+ * @copyright Copyright (c) 2011 - 2013, Justin Tadlock
* @link http://themehybrid.com/themes/my-life
* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
*/
Please sign in to comment.
Something went wrong with that request. Please try again.