Merge branch '3.0.0'

Conflicts: languages/zh_CN.mo languages/zh_CN.po
WPChill · Aug 27, 2014 · 1b1364f · 1b1364f
2 parents 5dcc825 + d7c3683
commit 1b1364f
Show file tree

Hide file tree

Showing 129 changed files with 6,840 additions and 9,216 deletions.
diff --git a/README.md b/README.md
@@ -1,10 +1,11 @@
-# Decode 2.9
-[![Built with Grunt](https://cdn.gruntjs.com/builtwith.png)](http://gruntjs.com/)
-[![devDependency Status](https://david-dm.org/ScottSmith95/Decode/dev-status.png)](https://david-dm.org/ScottSmith95/Decode#info=devDependencies)
+# Decode 3.0
+[![GitHub Release](http://img.shields.io/github/release/ScottSmith95/Decode.svg?style=flat)](https://github.com/ScottSmith95/Decode/releases/latest)
+[![Built with Grunt](http://img.shields.io/badge/built_with-GRUNT-orange.svg?style=flat)](http://gruntjs.com/)
+[![devDependency Status](http://img.shields.io/david/dev/ScottSmith95/Decode.svg?style=flat)](https://david-dm.org/ScottSmith95/Decode#info=devDependencies)
 
 Changelogs for each version can be found [on GitHub](https://github.com/ScottSmith95/Decode/releases).
 
-*Note: This version of Decode does not support Internet Explorer 8* An Internet Explorer 8-compatible version is available for download [on GitHub](https://github.com/ScottSmith95/Decode/tree/IE8-Support) and via [direct download](https://github.com/ScottSmith95/Decode/archive/IE8-Support.zip).
+*Note: Decode does not support Internet Explorer 8* An Internet Explorer 8-compatible version is available for download [on GitHub](https://github.com/ScottSmith95/Decode/tree/IE8-Support) and via [direct download](https://github.com/ScottSmith95/Decode/archive/IE8-Support.zip).
 
 I built Decode, the theme I use on [Beyond The Code](http://beyondtheco.de), to be a beautifully crafted, mobile first theme that uses media queries to bring in CSS for larger screens. 
 
@@ -41,20 +42,24 @@ Lastly, Decode has social icons in the header that can link to your profiles fro
 - Flickr
 - deviantART
 - SoundCloud
+- Bandcamp
 - Rdio
 - Spotify
 - Last.Fm
 - Vine
 - Vimeo
 - YouTube
 - Kickstarter
+- Gittip
+- Goodreads
 - Tumblr
 - Medium
 - Svbtle
 - WordPress.com
 - Stack Overflow
 - reddit
 - GitHub
+- Bitbucket
 - Runkeeper
 - Strava
 - Foursquare
@@ -72,7 +77,7 @@ Lastly, Decode has social icons in the header that can link to your profiles fro
 
 The Custom CSS feature allows you to change virtually anything about the style of your site. Refer to the "CustomCSS.md" file in the "docs" folder theme for common and helpful entries and experiment with creating your own to make Decode yours.
 
-To find un-minified, vendor-prefixed CSS, look no further than the .css files in the CSS directory. No seriously, don't look any further because the css/src directory bass files that you may not want to work with.
+To find un-minified, vendor-prefixed CSS, look no further than the .css files in the "styles" directory. No seriously, don't look any further because the styles/src directory containes un-prefixed sass files that you may not want to work with.
 
 If you desire to add Typekit fonts to your blog, I recommend the [Typekit Fonts for WordPress plugin](http://wordpress.org/plugins/typekit-fonts-for-wordpress/). In the CSS field, add: `body {font-family: "name-of-font-family";}` to override the default Decode font. This allows you more flexibility and ease when adding or changing fonts. 
 

diff --git a/comments.php b/comments.php
@@ -72,22 +72,15 @@
 	<?php endif; ?>
 
 	<?php
-	if (get_theme_mod( 'show_allowed_tags', false ) == true ) {
-		$comments_args = array(
+	$comments_args = array(
 			'title_reply'          => __( 'Leave a Reply', 'decode' ),
 			'title_reply_to'       => __( 'Leave a Reply to %s', 'decode' ),
 			'cancel_reply_link'    => __( 'Cancel reply', 'decode' ),
-			'label_submit'         => __( 'Post Comment', 'decode' ),
+			'label_submit'         => __( 'Post Comment', 'decode' )
 		);
-	}
-
-	else {
+	if (get_theme_mod( 'show_allowed_tags', false ) == false ) {
 		$comments_args = array(
-			'comment_notes_after'  => '',
-			'title_reply'          => __( 'Leave a Reply', 'decode' ),
-			'title_reply_to'       => __( 'Leave a Reply to %s', 'decode' ),
-			'cancel_reply_link'    => __( 'Cancel reply', 'decode' ),
-			'label_submit'         => __( 'Post Comment', 'decode' ),
+			'comment_notes_after'  => ''
 		);
 	}
 	?>

diff --git a/content-excerpt.php b/content-excerpt.php
@@ -29,9 +29,11 @@
 	<footer class="entry-footer">
 	<a class="read-more-link" href="<?php echo get_permalink(); ?>"><?php _e('Read More&hellip;', 'decode'); ?></a>
 	<?php edit_post_link( __( 'Edit', 'decode' ), '<div class="edit-link">', '</div>' ); ?>
-	<?php if ( get_theme_mod( 'entry_date_position', 'below' ) == 'below' && get_theme_mod( 'show_entry_date_on_excerpts', false ) == true ) : ?>
-			<p class="date"><?php decode_posted_on(); ?></p>
-		<?php endif; ?>
+		<div class="entry-meta">
+			<?php if ( get_theme_mod( 'entry_date_position', 'below' ) == 'below' && get_theme_mod( 'show_entry_date_on_excerpts', false ) == true ) : ?>
+				<p class="date"><?php decode_posted_on(); ?></p>
+			<?php endif; ?>
+		</div>
 	</footer><!-- .entry-footer -->
 
 	<?php tha_entry_bottom(); ?>

diff --git a/content-link.php b/content-link.php
@@ -25,23 +25,24 @@
 	<div class="entry-content">
 		<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'decode' ) ); ?>
 	</div><!-- .entry-content -->
-
 	<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'decode' ), 'after' => '</div>' ) ); ?>
 
 	<footer class="entry-footer">
 		<?php if (get_theme_mod( 'enable_comments', true ) == true && ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) : ?>
 			<div class="comments-link <?php echo get_theme_mod( 'enable_comments', '' ); ?>"><?php comments_popup_link( __( 'Leave a comment', 'decode' ), __( '1 Comment', 'decode' ), __( '% Comments', 'decode' ) ); ?></div>
 		<?php endif; ?>
 		<?php edit_post_link( __( 'Edit', 'decode' ), '<div class="edit-link">', '</div>' ); ?>
-		<?php if (get_theme_mod( 'show_tags', false ) == true ) : ?>
-			<p class="tags"><?php the_tags(__( 'Tagged as: ', 'decode' ),', '); ?></p>
-		<?php endif; ?>
-		<?php if (get_theme_mod( 'show_categories', false ) == true ) : ?>
-			<p class="categories"><?php _e( 'Categorized in&#58; ', 'decode' ) . the_category(', '); ?></p>
-		<?php endif; ?>
-		<?php if ( get_theme_mod( 'entry_date_position', 'below' ) == 'below' ) : ?>
-			<p class="date"><?php decode_posted_on(); ?></p>
-		<?php endif; ?>
+		<div class="entry-meta">
+			<?php if ( get_theme_mod( 'show_tags', false ) == true ) : ?>
+				<p class="tags"><?php the_tags( __( 'Tagged as: ', 'decode' ),', ' ); ?></p>
+			<?php endif; ?>
+			<?php if ( get_theme_mod( 'show_categories', false ) == true ) : ?>
+				<p class="categories"><?php _e( 'Categorized in&#58; ', 'decode' ) . the_category(', '); ?></p>
+			<?php endif; ?>
+			<?php if ( get_theme_mod( 'entry_date_position', 'below' ) == 'below' ) : ?>
+				<p class="date"><?php decode_posted_on(); ?></p>
+			<?php endif; ?>
+		</div>
 	</footer><!-- .entry-footer -->
 
 	<?php tha_entry_bottom(); ?>

diff --git a/content-page.php b/content-page.php
@@ -19,6 +19,7 @@
 	<div class="entry-content">
 
 		<?php the_content(); ?>
+
 		<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'decode' ), 'after' => '</div>' ) ); ?>	
 
 	</div><!-- .entry-content -->

diff --git a/content-quote.php b/content-quote.php
@@ -19,13 +19,15 @@
 			<div class="comments-link <?php echo get_theme_mod( 'enable_comments', '' ); ?>"><?php comments_popup_link( __( 'Leave a comment', 'decode' ), __( '1 Comment', 'decode' ), __( '% Comments', 'decode' ) ); ?></div>
 		<?php endif; ?>
 		<?php edit_post_link( __( 'Edit', 'decode' ), '<span class="edit-link">', '</span>' ); ?>
-		<?php if (get_theme_mod( 'show_tags', false ) == true ) : ?>
-			<p class="tags"><?php the_tags(__( 'Tagged as: ', 'decode' ),', '); ?></p>
-		<?php endif; ?>
-		<?php if (get_theme_mod( 'show_categories', false ) == true ) : ?>
-			<p class="categories"><?php _e( 'Categorized in&#58; ', 'decode')  . the_category(', '); ?></p>
-		<?php endif; ?>
-		<p class="date"><?php decode_posted_on(); ?></p>
+		<div class="entry-meta">
+			<?php if ( get_theme_mod( 'show_tags', false ) == true ) : ?>
+				<p class="tags"><?php the_tags( __( 'Tagged as: ', 'decode' ),', ' ); ?></p>
+			<?php endif; ?>
+			<?php if ( get_theme_mod( 'show_categories', false ) == true ) : ?>
+				<p class="categories"><?php _e( 'Categorized in&#58; ', 'decode')  . the_category(', '); ?></p>
+			<?php endif; ?>
+			<p class="date"><?php decode_posted_on(); ?></p>
+		</div>
 	</footer><!-- .entry-footer -->
 
 	<?php tha_entry_bottom(); ?>

diff --git a/content-search.php b/content-search.php
@@ -16,6 +16,6 @@
 		</div><!-- .entry-summary -->
 	</a>
 
-	<?php edit_post_link( __( 'Edit', '_s' ), '<footer class="entry-footer"><span class="edit-link">', '</span></footer>' ); ?>
+	<?php edit_post_link( __( 'Edit', 'decode' ), '<footer class="entry-footer"><span class="edit-link">', '</span></footer>' ); ?>
 
 </article><!-- #post-<?php the_ID(); ?> -->
diff --git a/content-single.php b/content-single.php
@@ -10,10 +10,14 @@
 	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 		<?php tha_entry_top(); ?>
 
-			<div class="entry-content"><?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'decode' ) ); ?></div>
-			<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'decode' ), 'after' => '</div>' ) ); ?>
+		<div class="entry-content">
+			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'decode' ) ); ?>
+		</div>
+
+		<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'decode' ), 'after' => '</div>' ) ); ?>
+
 		<footer class="entry-footer">
-			<?php if (get_theme_mod( 'show_author_section', false ) == true ) : ?>
+			<?php if ( get_theme_mod( 'show_author_section', false ) == true ) : ?>
 				<section class="author-section cf">
 					<div class="author-image"><a href="<?php echo esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) )?>" rel="author"><?php echo get_avatar( get_the_author_meta( 'ID' ), 250 ); ?></a></div>
 					<div class="author-text">
@@ -25,9 +29,11 @@
 				</section>
 			<?php endif; ?>
 			<?php edit_post_link( __( 'Edit', 'decode' ), '<div class="edit-link">', '</div>' ); ?>
-			<p class="tags"><?php the_tags(__( 'Tagged as: ', 'decode' ),', '); ?></p>
-			<p class="categories"><?php _e( 'Categorized in&#58; ', 'decode' ) . the_category(', '); ?></p>
-			<p class="date"><?php decode_posted_on(); ?></p>
+			<div class="entry-meta">
+				<p class="tags"><?php the_tags( __( 'Tagged as: ', 'decode' ),', ' ); ?></p>
+				<p class="categories"><?php _e( 'Categorized in&#58; ', 'decode' ) . the_category(', '); ?></p>
+				<p class="date"><?php decode_posted_on(); ?></p>
+			</div>
 		</footer><!-- .entry-footer -->
 
 		<?php tha_entry_bottom(); ?>
@@ -53,9 +59,13 @@
 			</div><!-- .entry-meta -->
 			<?php endif; ?>
 		</header>
-		<div class="entry-content"><?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'decode' ) ); ?></div>
+
+		<div class="entry-content">
+			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'decode' ) ); ?>
+		</div>
+
 		<footer class="entry-footer">
-			<?php if (get_theme_mod( 'show_author_section', false ) == true ) : ?>
+			<?php if ( get_theme_mod( 'show_author_section', false ) == true ) : ?>
 				<section class="author-section cf">
 					<div class="author-image"><a href="<?php echo esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) )?>" rel="author"><?php echo get_avatar( get_the_author_meta( 'ID' ), 250 ); ?></a></div>
 					<div class="author-text">
@@ -67,11 +77,13 @@
 				</section>
 			<?php endif; ?>
 			<?php edit_post_link( __( 'Edit', 'decode' ), '<div class="edit-link">', '</div>' ); ?>
-			<p class="tags"><?php the_tags(__( 'Tagged as: ', 'decode' ),', '); ?></p>
-			<p class="categories"><?php _e( 'Categorized in&#58; ', 'decode' ) . the_category(', '); ?></p>
-			<?php if ( get_theme_mod( 'entry_date_position', 'below' ) == 'below' ) : ?>
-				<p class="date"><?php decode_posted_on(); ?></p>
-			<?php endif; ?>
+			<div class="entry-meta">
+				<p class="tags"><?php the_tags( __( 'Tagged as: ', 'decode' ),', ' ); ?></p>
+				<p class="categories"><?php _e( 'Categorized in&#58; ', 'decode' ) . the_category(', '); ?></p>
+				<?php if ( get_theme_mod( 'entry_date_position', 'below' ) == 'below' ) : ?>
+					<p class="date"><?php decode_posted_on(); ?></p>
+				<?php endif; ?>
+			</div>
 		</footer><!-- .entry-footer -->
 
 		<?php tha_entry_bottom(); ?>
@@ -97,10 +109,15 @@
 			</div><!-- .entry-meta -->
 			<?php endif; ?>
 		</header><!-- .entry-header -->
-		<div class="entry-content"><?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'decode' ) ); ?></div>
+
+		<div class="entry-content">
+			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'decode' ) ); ?>
+		</div>
+
 		<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'decode' ), 'after' => '</div>' ) ); ?>
+
 		<footer class="entry-footer">
-			<?php if (get_theme_mod( 'show_author_section', false ) == true ) : ?>
+			<?php if ( get_theme_mod( 'show_author_section', false ) == true ) : ?>
 				<section class="author-section cf">
 					<div class="author-image"><a href="<?php echo esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) )?>" rel="author"><?php echo get_avatar( get_the_author_meta( 'ID' ), 250 ); ?></a></div>
 					<div class="author-text">
@@ -112,11 +129,13 @@
 				</section>
 			<?php endif; ?>
 			<?php edit_post_link( __( 'Edit', 'decode' ), '<div class="edit-link">', '</div>' ); ?>
-			<p class="tags"><?php the_tags(__( 'Tagged as: ', 'decode' ),', '); ?></p>
-			<p class="categories"><?php _e( 'Categorized in&#58; ', 'decode' ) . the_category(', '); ?></p>
-			<?php if ( get_theme_mod( 'entry_date_position', 'below' ) == 'below' ) : ?>
-				<p class="date"><?php decode_posted_on(); ?></p>
-			<?php endif; ?>
+			<div class="entry-meta">
+				<p class="tags"><?php the_tags( __( 'Tagged as: ', 'decode' ),', ' ); ?></p>
+				<p class="categories"><?php _e( 'Categorized in&#58; ', 'decode' ) . the_category(', '); ?></p>
+				<?php if ( get_theme_mod( 'entry_date_position', 'below' ) == 'below' ) : ?>
+					<p class="date"><?php decode_posted_on(); ?></p>
+				<?php endif; ?>
+			</div>
 		</footer><!-- .entry-footer -->
 
 		<?php tha_entry_bottom(); ?>

diff --git a/content.php b/content.php
@@ -28,20 +28,24 @@
 
 	<?php wp_link_pages( array( 'before' => '<div class="page-links">' . __( 'Pages:', 'decode' ), 'after' => '</div>' ) ); ?>
 
-	<footer class="entry-footer below-content">
-		<?php if (get_theme_mod( 'enable_comments', true ) == true && ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) : ?>
-			<div class="comments-link <?php echo get_theme_mod( 'enable_comments', '' ); ?>"><?php comments_popup_link( __( 'Leave a comment', 'decode' ), __( '1 Comment', 'decode' ), __( '% Comments', 'decode' ) ); ?></div>
+	<footer class="entry-footer">
+		<?php if ( get_theme_mod( 'enable_comments', true ) == true && ! post_password_required() && ( comments_open() || '0' != get_comments_number() ) ) : ?>
+			<div class="comments-link">
+				<?php comments_popup_link( __( 'Leave a comment', 'decode' ), __( '1 Comment', 'decode' ), __( '% Comments', 'decode' ) ); ?>
+			</div>
 		<?php endif; ?>
 		<?php edit_post_link( __( 'Edit', 'decode' ), '<div class="edit-link">', '</div>' ); ?>
-		<?php if (get_theme_mod( 'show_tags', false ) == true ) : ?>
-			<p class="tags"><?php the_tags(__( 'Tagged as: ', 'decode' ),', '); ?></p>
-		<?php endif; ?>
-		<?php if (get_theme_mod( 'show_categories', false ) == true ) : ?>
-			<p class="categories"><?php _e( 'Categorized in&#58; ', 'decode' ) . the_category(', '); ?></p>
-		<?php endif; ?>
-		<?php if ( get_theme_mod( 'entry_date_position', 'below' ) == 'below' ) : ?>
-			<p class="date"><?php decode_posted_on(); ?></p>
-		<?php endif; ?>
+		<div class="entry-meta">
+			<?php if ( get_theme_mod( 'show_tags', false ) == true ) : ?>
+				<p class="tags"><?php the_tags( __( 'Tagged as: ', 'decode' ),', ' ); ?></p>
+			<?php endif; ?>
+			<?php if ( get_theme_mod( 'show_categories', false ) == true ) : ?>
+				<p class="categories"><?php _e( 'Categorized in&#58; ', 'decode' ) . the_category(', '); ?></p>
+			<?php endif; ?>
+			<?php if ( get_theme_mod( 'entry_date_position', 'below' ) == 'below' ) : ?>
+				<p class="date"><?php decode_posted_on(); ?></p>
+			<?php endif; ?>
+		</div>
 	</footer><!-- .entry-footer -->
 
 	<?php tha_entry_bottom(); ?>