Merge pull request #34 from ScottSmith95/3.0.6

Decode 3.0.6

.gitignore

@@ -9,6 +9,7 @@ editor-style.css
 styles/*.css
 styles/*.map
 styles/src/.sass-cache/
+styles/src/reset/_normalize.scss
 scripts/*.js
 scripts/srcmaps/
 scripts/src/modernizr.js

.travis.yml

@@ -26,14 +26,14 @@ env:
     # @link https://github.com/WordPress/WordPress
     - WP_VERSION=master WP_MULTISITE=0
     - WP_VERSION=master WP_MULTISITE=1
-    # WordPress 3.9
-    # @link https://github.com/WordPress/WordPress/tree/3.9-branch
+    # WordPress 4.1
+    # @link https://github.com/WordPress/WordPress/tree/4.1-branch
+    - WP_VERSION=4.1 WP_MULTISITE=0
+    - WP_VERSION=4.1 WP_MULTISITE=1
+    # WordPress 4.0
+    # @link https://github.com/WordPress/WordPress/tree/4.0-branch
     - WP_VERSION=4.0 WP_MULTISITE=0
     - WP_VERSION=4.0 WP_MULTISITE=1
-    # WordPress 3.8
-    # @link https://github.com/WordPress/WordPress/tree/3.8-branch
-    - WP_VERSION=3.9 WP_MULTISITE=0
-    - WP_VERSION=3.9 WP_MULTISITE=1
 
 # Declare 5.6 beta in test matrix.
 # @link https://buddypress.trac.wordpress.org/ticket/5620

README.md

@@ -39,6 +39,7 @@ Lastly, Decode has social icons that can link to your profiles from every side o
 - Pinboard
 - Delicious
 - Instagram
+- VSCO Grid
 - 500px
 - Flickr
 - deviantART
@@ -71,12 +72,11 @@ Lastly, Decode has social icons that can link to your profiles from every side o
 - Playstation Network
 - Xbox Live
 - Steam
+- Twitch
 - Skype
 - Website
 - Email
 
-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 "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, button, input, select, textarea {font-family: 'name-of-font-family';}` to override the default Decode font. This allows you more flexibility and ease when adding or changing fonts. 

archive.php

@@ -46,7 +46,7 @@
 
 	</main><!-- #main -->
 
-	<?php decode_paging_nav(); ?>
+	<?php the_posts_navigation(); ?>
 
 </div><!-- #primary -->
 

author.php

@@ -55,7 +55,7 @@
 
 	</main><!-- #main -->
 
-	<?php decode_paging_nav(); ?>
+	<?php the_posts_navigation(); ?>
 
 </section><!-- #primary -->
 

docs/src/CustomCSS.md

@@ -1,5 +1,5 @@
 # Helpful Custom CSS entries
-*A collection of CSS snippets that anyone can use in Decode's Custom CSS feature in the Other Options section of the theme Customize menu.*
+*A collection of CSS snippets that anyone can use in Jetpack's Custom CSS feature. [Download Jetpack](http://jetpack.me/install/) | [Get Help](http://jetpack.me/support/custom-css/)*
 
 ### Change the size of the header image:
 `.site-logo { max-height: 8.5em; }`<br>
@@ -18,6 +18,9 @@ I suggest that you do not change this without using media queries because the so
 ### Change the color of the menu and menu close icons:
 `.menu-icon, .close-icon { fill: #00B0CC; }`
 
+### Change font family:
+`body, button, input, select, textarea { font-family: 'name-of-font-family'; }`
+
 ### Change the font size of posts and pages:
 `.entry-content { font-size: 1em; }`<br>
 1em is the default.

docs/src/README.md

@@ -39,6 +39,7 @@ Lastly, Decode has social icons that can link to your profiles from every side o
 - Pinboard
 - Delicious
 - Instagram
+- VSCO Grid
 - 500px
 - Flickr
 - deviantART
@@ -71,12 +72,11 @@ Lastly, Decode has social icons that can link to your profiles from every side o
 - Playstation Network
 - Xbox Live
 - Steam
+- Twitch
 - Skype
 - Website
 - Email
 
-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 "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, button, input, select, textarea {font-family: 'name-of-font-family';}` to override the default Decode font. This allows you more flexibility and ease when adding or changing fonts. 

functions.php

@@ -113,7 +113,7 @@ function decode_setup() {
 
 function decode_scripts() {
 
-	wp_enqueue_style( 'decode-style', get_stylesheet_uri(), array(), '3.0.1' );
+	wp_enqueue_style( 'decode-style', get_stylesheet_uri(), array(), '3.0.6' );
 
 	if ( get_theme_mod( 'latin_extended_font', false ) == true ) {
 		wp_enqueue_style( 'decode-font-stylesheet', '//fonts.googleapis.com/css?family=Oxygen&subset=latin-ext' );
@@ -122,7 +122,7 @@ function decode_scripts() {
 		wp_enqueue_style( 'decode-font-stylesheet', '//fonts.googleapis.com/css?family=Oxygen' );
 	}
 
-	wp_enqueue_script( 'decode-scripts', get_template_directory_uri() . '/scripts/decode.js', array(), '3.0.0', true );
+	wp_enqueue_script( 'decode-scripts', get_template_directory_uri() . '/scripts/decode.js', array(), '3.0.6', true );
 
 	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) && get_theme_mod( 'enable_comments', true ) == true ) {
 		wp_enqueue_script( 'comment-reply' );

gruntfile.js

@@ -45,7 +45,7 @@ module.exports = function(grunt) {
 					sourceMapName: 'scripts/srcmaps/decode.js.map'
 				},
 				files: {
-					'scripts/decode.js': ['scripts/src/modernizr.js', 'scripts/src/fastclick.js', 'scripts/src/sidebar.js', 'scripts/src/dropdown.js', 'scripts/src/decode.js' ],
+					'scripts/decode.js': ['scripts/src/modernizr.js', 'node_modules/fastclick/lib/fastclick.js', 'scripts/src/sidebar.js', 'scripts/src/dropdown.js', 'scripts/src/decode.js' ],
 				}
 			},
 			customizer: {
@@ -57,6 +57,40 @@ module.exports = function(grunt) {
 				}
 			}
 		},
+
+		markdown: {
+			readme: {
+				options: {
+					template: 'docs/src/READMETemplate.html'
+				},
+				files: {
+					'docs/README.html': 'docs/src/README.md'
+				}
+			},
+			customcss: {
+				options: {
+					template: 'docs/src/CustomCSSTemplate.html'
+				},
+				files: {
+					'docs/CustomCSS.html': 'docs/src/CustomCSS.md'
+				}
+			}
+		},
+
+		copy: {
+			/* Move and rename Normalize so grunt-sass can import and concatenate it. */
+			normalize: {
+				files: {
+					'styles/src/reset/_normalize.scss': 'node_modules/normalize.css/normalize.css'
+				}
+			},
+			/* Copy Readme.md to project root. */
+			readme: {
+				files: {
+					'README.md': 'docs/src/README.md'
+				}
+			}
+		},
 
 		sass: {
 			options: {
@@ -116,34 +150,6 @@ module.exports = function(grunt) {
 				ext: '.css'
 			}
 		},
-
-		markdown: {
-			readme: {
-				options: {
-					template: 'docs/src/READMETemplate.html'
-				},
-				files: {
-					'docs/README.html': ['docs/src/README.md']
-				}
-			},
-			customcss: {
-				options: {
-					template: 'docs/src/CustomCSSTemplate.html'
-				},
-				files: {
-					'docs/CustomCSS.html': ['docs/src/CustomCSS.md']
-				}
-			}
-		},
-
-		/* Copy Readme.md to project root */
-		copy: {
-			copy_readme: {
-				files: {
-					'README.md': ['docs/src/README.md']
-				}
-			}
-		},
 
 		watch: {
 			scripts: {
@@ -169,12 +175,12 @@ module.exports = function(grunt) {
 	grunt.loadNpmTasks("grunt-modernizr");
 	grunt.loadNpmTasks('grunt-contrib-jshint');
 	grunt.loadNpmTasks('grunt-contrib-uglify');
+	grunt.loadNpmTasks('grunt-markdown');
+	grunt.loadNpmTasks('grunt-contrib-copy');
 	grunt.loadNpmTasks('grunt-sass');
 	grunt.loadNpmTasks('grunt-csscomb');
 	grunt.loadNpmTasks('grunt-autoprefixer');
 	grunt.loadNpmTasks('grunt-contrib-cssmin');
-	grunt.loadNpmTasks('grunt-contrib-copy');
-	grunt.loadNpmTasks('grunt-markdown');
 	grunt.loadNpmTasks('grunt-contrib-watch');
 
 
@@ -184,12 +190,12 @@ module.exports = function(grunt) {
 		'modernizr',
 		'jshint',
 		'uglify',
+		'markdown',
+		'copy',
 		'sass',
 		'csscomb',
 		'autoprefixer',
 		'cssmin',
-		'markdown',
-		'copy',
 		'watch'
 	]);
 
@@ -198,12 +204,12 @@ module.exports = function(grunt) {
 		'modernizr',
 		'jshint',
 		'uglify',
+		'markdown',
+		'copy',
 		'sass',
 		'csscomb',
 		'autoprefixer',
-		'cssmin',
-		'markdown',
-		'copy'
+		'cssmin'
 	]);
 
 	// $ grunt dev: Watches for changes while developing.

image.php

@@ -31,8 +31,8 @@
 				</div><!-- .entry-meta -->
 
 				<nav role="navigation" id="image-navigation" class="image-navigation">
-					<div class="nav-previous"><?php previous_image_link( false, __( '<span class="meta-nav">&larr;</span> Previous', 'decode' ) ); ?></div>
-					<div class="nav-next"><?php next_image_link( false, __( 'Next <span class="meta-nav">&rarr;</span>', 'decode' ) ); ?></div>
+					<div class="nav-previous"><?php previous_image_link( false, __( 'Previous', 'decode' ) ); ?></div>
+					<div class="nav-next"><?php next_image_link( false, __( 'Next', 'decode' ) ); ?></div>
 				</nav><!-- #image-navigation -->
 			</header><!-- .entry-header -->