Merge branch 'refs/heads/1-WIP' into v.91

Conflicts: .gitignore functions.php
twbs · Nov 11, 2012 · 95c062e · 95c062e
2 parents 9bc2021 + db969fc
commit 95c062e
Show file tree

Hide file tree

Showing 68 changed files with 4,053 additions and 2,615 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,4 @@
 
+README.md
+
+.phptidy-cache
diff --git a/404.php b/404.php
@@ -5,8 +5,6 @@
  * @package WordPress
  * @subpackage WP-Bootstrap
  * @since WP-Bootstrap 0.7
- *
- * Last Revised: January 22, 2012
  */
 get_header(); ?>
   <div class="row">
@@ -16,17 +14,14 @@
    </div><!--/.row -->
    <div class="container">
 
-
- <!-- Masthead
-      ================================================== -->
       <header class="jumbotron subhead" id="overview">
         <h1><?php _e( 'This is Embarrassing', 'bootstrapwp' ); ?></h1>
         <p class="lead"><?php _e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching, or one of the links below, can help.', 'bootstrapwp' ); ?></p>
       </header>
-	  
+
         <div class="row content">
 <div class="span8">
-					
+
 
 <div class="well">
 					<?php get_search_form(); ?>
@@ -40,12 +35,12 @@
 <div class="span4">
 					<?php the_widget( 'WP_Widget_Recent_Posts' ); ?>
 
-					
+
 						<h2><?php _e( 'Most Used Categories', 'bootstrapwp' ); ?></h2>
 						<ul>
 						<?php wp_list_categories( array( 'orderby' => 'count', 'order' => 'DESC', 'show_count' => 1, 'title_li' => '', 'number' => 10 ) ); ?>
 						</ul>
-					
+
 </div><!--/.span4 -->
 </div><!--/.row -->
 					</div><!--/.span8 -->

diff --git a/README.md b/README.md
@@ -13,9 +13,9 @@ Demo
 ----
 You can view a demo of this WordPress theme running the latest development branch code at: [http://bootstrapwp.rachelbaker.me/](http://bootstrapwp.rachelbaker.me/)
 
-View the theme style guide at: [http://bootstrapwp.rachelbaker.me/style-guide/](http://bootstrapwp.rachelbaker.me/style-guide/)
+View the theme's base CSS elements at: [http://bootstrapwp.rachelbaker.me/base-css/](http://bootstrapwp.rachelbaker.me/base-css/)
 
-View the javascript guide at: [http://bootstrapwp.rachelbaker.me/javascript-guide/](http://bootstrapwp.rachelbaker.me/javascript-guide/)
+View the theme's JavaScript guide at: [http://bootstrapwp.rachelbaker.me/javascript/](http://bootstrapwp.rachelbaker.me/javascript/)
 
 
 Usage

diff --git a/archive.php b/archive.php
@@ -10,16 +10,17 @@
  * @package WordPress
  * @subpackage WP-Bootstrap
  * @since WP-Bootstrap 0.6
+ *
  */
-
 get_header();
 if (have_posts() ) ;?>
-<div class="row">
-	<div class="container">
-		<?php if (function_exists('bootstrapwp_breadcrumbs')) bootstrapwp_breadcrumbs(); ?>
-	</div><!--/.container -->
-</div><!--/.row -->
-<div class="container">
+    <div class="container">
+        <div class="row">
+          <div class="span12">
+             <?php if (function_exists('bootstrapwp_breadcrumbs')) bootstrapwp_breadcrumbs(); ?>
+         </div><!--/.span12 -->
+   </div><!--/.row -->
+
 	<header class="jumbotron subhead" id="overview">
 		<h1><?php
 		if ( is_day() ) {
@@ -44,7 +45,6 @@
 			_e( 'Blog Archives', 'bootstrapwp' );
 		}
 		?></h1>
-	</h1>
 </header>
 
 <div class="row content">

diff --git a/author.php b/author.php
@@ -5,8 +5,8 @@
  * @package WordPress
  * @subpackage WP-Bootstrap
  * @since WP-Bootstrap 0.1
+ *
  */
-
 get_header(); ?>
 
 <?php if ( have_posts() ) : ?>
@@ -20,12 +20,13 @@
 	 */
 	the_post();
 	?>
-	<div class="row">
-		<div class="container">
-			<?php if (function_exists('bootstrapwp_breadcrumbs')) bootstrapwp_breadcrumbs(); ?>
-		</div><!--/.container -->
-	</div><!--/.row -->
-	<div class="container">
+	    <div class="container">
+        <div class="row">
+          <div class="span12">
+             <?php if (function_exists('bootstrapwp_breadcrumbs')) bootstrapwp_breadcrumbs(); ?>
+         </div><!--/.span12 -->
+   </div><!--/.row -->
+
 		<header class="jumbotron subhead" id="overview">
 			<h1 class="page-title author"><?php printf( __( 'Author Archives: %s', 'bootstrapwp' ), '<span class="vcard"><a class="url fn n" href="' . get_author_posts_url( get_the_author_meta( "ID" ) ) . '" title="' . esc_attr( get_the_author() ) . '" rel="me">' . get_the_author() . '</a></span>' ); ?></h1>
 		</header>