Clean up

README.md

@@ -1,9 +1,11 @@
 # barebones
 
-An (almost) blank WordPress theme for HTML5 and beyond. Great as a starting point for any project with powerful features to encourage rapid development.
+A lightweight, skinny WordPress theme for HTML5 and beyond. Great as a starting point for any project with powerful features to encourage rapid development for most projects
 
 ## Features
 
 * Base reset and normalisation styles
 * Index and page Loop templates
 * Customised functions file containing useful starting points
+* Tidy and organised folder structure
+* Comes pre-bundled with latest CDN version of jQuery and fallback

footer.php

@@ -3,8 +3,8 @@
 			<p>&copy; <?php bloginfo( 'name' ); ?> <?php echo date( 'Y' ); ?></p>
 		</div>
 	</footer>
-		<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
-        <script>window.jQuery || document.write('<script src="<?php bloginfo( 'template_url' ); ?>/js/libs/jquery-1.7.1.min.js"><\/script>')</script>
+	<script src="//code.jquery.com/jquery.min.js"></script>
+	<script>window.jQuery || document.write('<script src="<?php bloginfo( 'template_url' ); ?>/_/js/libs/jquery.min.js"><\/script>')</script>
 	<script src="<?php bloginfo( 'template_url' ); ?>/js/script.js"></script>
 	<?php wp_footer(); ?>
 	</body>

header.php

@@ -5,7 +5,6 @@
 		<meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0" />
 		<title><?php wp_title( ' &ndash; ', true, 'right' ); bloginfo( 'name' ); ?></title>
 		<link rel="stylesheet" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
-        <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
 		<?php wp_head(); ?>
 		<!--[if lt IE 9]>
 		<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>

index.php

@@ -1,6 +1,5 @@
 <?php get_header(); ?>
 
-<<<<<<< HEAD
 <div class="content container">
 
 	<div class="main">
@@ -33,10 +32,5 @@
 	</aside>
 
 </div>
-=======
-<?php while ( have_posts() ) : the_post(); ?>
-
-<?php endwhile; ?>
->>>>>>> e5b0a5f1e5b29ff6247673f4f848f03a9d4209f2
 
 <?php get_footer(); ?>

page.php

@@ -1,30 +0,0 @@
-<?php get_header(); ?>
-
-<div class="content container">
-
-	<div class="main">
-
-		<?php while ( have_posts() ) : the_post(); ?>
-        
-        <article <?php post_class(); ?>>
-            
-            <?php the_content(); ?>
-        
-        </article>
-        
-        <?php endwhile; ?>
-        
-        <div class="pagination">
-            <div class="alignleft"><?php previous_posts_link( 'Previous Entries' ) ?></div>
-            <div class="alignright"><?php next_posts_link( 'Next Entries','' ) ?></div>
-        </div>
-    
-    </div>
-    
-    <aside class="sidebar">
-    	<?php get_sidebar(); ?>
-    </aside>
-
-</div>
-
-<?php get_footer(); ?>

single.php

@@ -1,35 +0,0 @@
-<?php get_header(); ?>
-
-<div class="content container">
-
-	<div class="main">
-
-		<?php while ( have_posts() ) : the_post(); ?>
-        
-        <article <?php post_class(); ?>>
-        	
-            <header>
-            	<h1 class="title"><?php the_title(); ?></h1>
-            	<p class="date"><time pubdate datetime="<?php echo $post->post_date; ?>"><?php the_time( get_option( 'date_format' ) ); ?></time></p>
-            </header>
-            
-            <?php the_content( __( 'Read More' ) ); ?>
-        
-        </article>
-        
-        <?php endwhile; ?>
-        
-        <div class="pagination">
-            <div class="alignleft"><?php previous_posts_link( 'Previous Entries' ) ?></div>
-            <div class="alignright"><?php next_posts_link( 'Next Entries','' ) ?></div>
-        </div>
-    
-    </div>
-    
-    <aside class="sidebar">
-    	<?php get_sidebar(); ?>
-    </aside>
-
-</div>
-
-<?php get_footer(); ?>