Merge pull request #46 from WebDevStudios/svg

SVG!

Gruntfile.js

@@ -23,6 +23,32 @@ module.exports = function(grunt) {
 			}
 		},
 
+		svgmin: {
+			dist: {
+				files: [{
+					expand: true,
+					cwd: 'images/svg',
+					src: ['*.svg'],
+					dest: 'images/svg'
+				}]
+			}
+		},
+
+		svgstore: {
+			options: {
+				prefix: 'icon-',
+				cleanup: ['fill', 'style'],
+				svg: {
+					style: 'display: none;'
+				}
+			},
+			default: {
+				files: {
+					'images/svg-defs.svg': ['images/svg/*.svg'],
+				}
+			}
+		},
+
 		sass: {
 			options: {
 				sourceMap: true,
@@ -145,6 +171,15 @@ module.exports = function(grunt) {
 				},
 			},
 
+			svg: {
+				files: ['images/svg/*.svg'],
+				tasks: ['svgstore'],
+				options: {
+					spawn: false,
+					livereload: true,
+				},
+			},
+
 		},
 
 		shell: {
@@ -248,7 +283,8 @@ module.exports = function(grunt) {
 	grunt.registerTask('javascript', ['concat', 'uglify']);
 	grunt.registerTask('imageminnewer', ['newer:imagemin']);
 	grunt.registerTask('sprites', ['sprite']);
+	grunt.registerTask('icons', ['svgmin', 'svgstore']);
 	grunt.registerTask('i18n', ['makepot']);
-	grunt.registerTask('default', ['styles', 'javascript', 'imageminnewer', 'i18n', 'sassdoc']);
+	grunt.registerTask('default', ['styles', 'javascript', 'imageminnewer', 'icons', 'i18n', 'sassdoc']);
 
 };

README.md

@@ -65,16 +65,18 @@ After you've installed _s, and run `npm install && bower install` from the comma
 
 ##### 2) Grunt tasks available:
 
-`grunt watch` - Automatically handle changes to CSS, javascript, and image sprites
+`grunt watch` - Automatically handle changes to CSS, javascript, SVG and image sprites.
 
-`grunt javascript` - Concatenate and minify javascript files
+`grunt javascript` - Concatenate and minify javascript files.
 
-`grunt styles` - Comb, compile, prefix, combine media queries, and minify CSS files
+`grunt styles` - Comb, compile, prefix, combine media queries, and minify CSS files.
 
-`grunt imageminnewer` - Minify images
+`grunt imageminnewer` - Minify images.
 
-`grunt sprites` - Generate image sprites and the associated CSS
+`grunt sprites` - Generate image sprites and the associated CSS.
 
-`grunt i18n` - Generate a translation file
+`grunt icons` - Generate SVG sprites.
+
+`grunt i18n` - Generate a translation file.
 
 `grunt` - Do it all once!

footer.php

@@ -19,19 +19,7 @@
 				<?php printf( esc_html__( 'Theme: %1$s by %2$s.', '_s' ), '_s', '<a href="http://automattic.com/" rel="designer">Automattic</a>' ); ?>
 			</div><!-- .site-info -->
 
-			<?php
-				if ( has_nav_menu( 'social' ) ) :
-					// Social menu
-					wp_nav_menu( array(
-						'theme_location' => 'social',
-						'container'      => false,
-						'menu_class'     => 'menu-social menu menu-horizontal',
-						'link_before'    => '<span class="screen-reader-text">',
-						'link_after'     => '</span>'
-						)
-					);
-				endif;
-			?>
+			<?php _s_do_social_icons(); ?>
 
 		</div><!-- .wrap -->
 	</footer><!-- #colophon -->