Remove all frameworks except Bootstrap (roots#251)

- Remove all frameworks except Bootstrap - Remove roots-options.php and replace with a more simple roots-config.php - Include all Bootstrap Javascript plugins by default in js/plugins.js - Use Bootstrap Responsive and Topbar navigation by default - Use Bootstrap markup on forms, page titles, image galleries, alerts and errors, post and comment navigation - Remove Roots styles from style.css and introduce app.css for site-specific CSS. Remove almost all previous default Roots styles. - Add latest updates from H5BP project
abkfenris · Feb 3, 2012 · 3c3b71f · 3c3b71f
1 parent 7266dae
commit 3c3b71f
Show file tree

Hide file tree

Showing 143 changed files with 7,479 additions and 17,482 deletions.
diff --git a/404.php b/404.php
@@ -1,21 +1,24 @@
 <?php get_header(); ?>
   <?php roots_content_before(); ?>
-    <div id="content" class="<?php echo $roots_options['container_class']; ?>">
+    <div id="content" class="<?php echo CONTAINER_CLASSES; ?>">
     <?php roots_main_before(); ?>
-      <div id="main" class="<?php echo $roots_options['fullwidth_class']; ?>" role="main">
-        <div class="container">
+      <div id="main" class="<?php echo FULLWIDTH_CLASSES; ?>" role="main">
+        <div class="page-header">
           <h1><?php _e('File Not Found', 'roots'); ?></h1>
+        </div>
+        <div class="alert alert-block fade in">
+          <a class="close" data-dismiss="alert">×</a>
           <p><?php _e('The page you are looking for might have been removed, had its name changed, or is temporarily unavailable.', 'roots'); ?></p>
-          <p><?php _e('Please try the following:', 'roots'); ?></p>
-          <ul>
-            <li><?php _e('Check your spelling', 'roots'); ?></li>
-            <li><?php printf(__('Return to the <a href="%s">home page</a>', 'roots'), home_url()); ?></li>
-            <li><?php _e('Click the <a href="javascript:history.back()">Back</a> button', 'roots'); ?></li>
-          </ul>
-          <?php get_search_form(); ?>
         </div>
+        <p><?php _e('Please try the following:', 'roots'); ?></p>
+        <ul>
+          <li><?php _e('Check your spelling', 'roots'); ?></li>
+          <li><?php printf(__('Return to the <a href="%s">home page</a>', 'roots'), home_url()); ?></li>
+          <li><?php _e('Click the <a href="javascript:history.back()">Back</a> button', 'roots'); ?></li>
+        </ul>
+        <?php get_search_form(); ?>
       </div><!-- /#main -->
     <?php roots_main_after(); ?>
     </div><!-- /#content -->
   <?php roots_content_after(); ?>
-<?php get_footer(); ?>
+<?php get_footer(); ?>
diff --git a/README.md b/README.md
@@ -1,8 +1,6 @@
 # [Roots Theme](http://rootstheme.com/)
 
-Roots is a starting WordPress theme made for developers that’s based on [HTML5 Boilerplate](http://html5boilerplate.com/), Starkers, and the most popular CSS frameworks.
-
-Roots includes support for Blueprint CSS, 960 Grid System, 1140px Grid, Adapt.js, Less Framework, Foundation, and Bootstrap with the ability to set site-wide classes for the main content area and the sidebar. There's also the option to not use any CSS framework.
+Roots is a starting WordPress theme made for developers that’s based on [HTML5 Boilerplate](http://html5boilerplate.com/), and Bootstrap from Twitter.
 
 ## Quick start
 
@@ -11,8 +9,8 @@ Roots includes support for Blueprint CSS, 960 Grid System, 1140px Grid, Adapt.js
 
 ## Features
 
-* HTML5 Boilerplate's markup, style, and .htaccess
-* Popular CSS frameworks included (with the option to use none)
+* HTML5 Boilerplate’s markup, style, and .htaccess
+* Bootstrap from Twitter
 * Clean URLs (no more `/wp-content/`)
 * All static theme assets are rewritten to the website root (`/css/`, `/img/`, and `/js/`)
 * Cleaner HTML output of navigation menus
@@ -23,9 +21,6 @@ Roots includes support for Blueprint CSS, 960 Grid System, 1140px Grid, Adapt.js
 * Robots.txt optimized for SEO
 * [Multilingual ready](http://www.rootstheme.com/wpml/) (English, Spanish, French, Italian, Dutch, Brazilian Portuguese, Macedonian, Finnish, Danish, and Turkish)
 
-### Theme Options
-![Theme Options](http://www.rootstheme.com/img/roots-settings.png)
-
 ## Contributing
 
 Anyone and everyone is welcome to contribute. There are several ways you can help out:
@@ -52,12 +47,6 @@ Anyone and everyone is welcome to contribute. There are several ways you can hel
 * Modernizr: MIT/BSD license
 * jQuery: MIT/GPL license
 * Normalize.css: Public Domain
-* Blueprint CSS: Modified MIT License
-* 960 Grid System: MIT/GPL License
-* The 1140px Grid: CC BY-SA 3.0 Australia License
-* Adapt.js: MIT/GPL license
-* Less Framework 4: MIT license
-* Foundation: MIT license
 * Bootstrap: Apache 2.0 license
 
 ### Everything else:

diff --git a/archive.php b/archive.php
@@ -1,9 +1,9 @@
 <?php get_header(); ?>
   <?php roots_content_before(); ?>
-    <div id="content" class="<?php echo $roots_options['container_class']; ?>">
+    <div id="content" class="<?php echo CONTAINER_CLASSES; ?>">
     <?php roots_main_before(); ?>
-      <div id="main" class="<?php echo $roots_options['main_class']; ?>" role="main">
-        <div class="container">
+      <div id="main" class="<?php echo MAIN_CLASSES; ?>" role="main">
+        <div class="page-header">
           <h1>
             <?php
               $term = get_term_by('slug', get_query_var('term'), get_query_var('taxonomy'));
@@ -24,21 +24,19 @@
               }
             ?>
           </h1>
-          <?php roots_loop_before(); ?>
-          <?php get_template_part('loop', 'category'); ?>
-          <?php roots_loop_after(); ?>
         </div>
+        <?php roots_loop_before(); ?>
+        <?php get_template_part('loop', 'category'); ?>
+        <?php roots_loop_after(); ?>
       </div><!-- /#main -->
     <?php roots_main_after(); ?>
     <?php roots_sidebar_before(); ?>
-      <aside id="sidebar" class="<?php echo $roots_options['sidebar_class']; ?>" role="complementary">
+      <aside id="sidebar" class="<?php echo SIDEBAR_CLASSES; ?>" role="complementary">
       <?php roots_sidebar_inside_before(); ?>
-        <div class="container">
-          <?php get_sidebar(); ?>
-        </div>
+        <?php get_sidebar(); ?>
       <?php roots_sidebar_inside_after(); ?>
       </aside><!-- /#sidebar -->
     <?php roots_sidebar_after(); ?>
     </div><!-- /#content -->
   <?php roots_content_after(); ?>
-<?php get_footer(); ?>
+<?php get_footer(); ?>
diff --git a/comments.php b/comments.php
@@ -10,7 +10,10 @@
       </header>
 
       <?php if ($comment->comment_approved == '0') { ?>
-        <p><?php _e('Your comment is awaiting moderation.', 'roots') ?></p>
+        <div class="alert alert-block fade in">
+          <a class="close" data-dismiss="alert">×</a>
+          <p><?php _e('Your comment is awaiting moderation.', 'roots'); ?></p>
+        </div>
       <?php } ?>
 
       <section class="comment">
@@ -24,7 +27,10 @@
 
 <?php if (post_password_required()) { ?>
   <section id="comments">
-    <p><?php _e('This post is password protected. Enter the password to view comments.', 'roots'); ?></p>
+    <div class="alert alert-block fade in">
+      <a class="close" data-dismiss="alert">×</a>
+      <p><?php _e('This post is password protected. Enter the password to view comments.', 'roots'); ?></p>
+    </div>
   </section><!-- /#comments -->
 <?php
   return;
@@ -39,21 +45,28 @@
     </ol>
 
     <?php if (get_comment_pages_count() > 1 && get_option('page_comments')) { // are there comments to navigate through ?>
-      <nav id="comments-nav">
-        <div class="comments-previous"><?php previous_comments_link(__('&larr; Older comments', 'roots')); ?></div>
-        <div class="comments-next"><?php next_comments_link(__('Newer comments &rarr;', 'roots')); ?></div>
+      <nav id="comments-nav" class="pager">
+        <div class="previous"><?php previous_comments_link(__('&larr; Older comments', 'roots')); ?></div>
+        <div class="next"><?php next_comments_link(__('Newer comments &rarr;', 'roots')); ?></div>
       </nav>
+
     <?php } // check for comment navigation ?>
 
     <?php if (!comments_open() && !is_page() && post_type_supports(get_post_type(), 'comments')) { ?>
-      <p><?php _e('Comments are closed.', 'roots'); ?></p>
+      <div class="alert alert-block fade in">
+        <a class="close" data-dismiss="alert">×</a>
+        <p><?php _e('Comments are closed.', 'roots'); ?></p>
+      </div>
     <?php } ?>
   </section><!-- /#comments -->
 <?php } ?>
 
 <?php if (!have_comments() && !comments_open() && !is_page() && post_type_supports(get_post_type(), 'comments')) { ?>
   <section id="comments">
-    <p><?php _e('Comments are closed.', 'roots'); ?></p>
+    <div class="alert alert-block fade in">
+      <a class="close" data-dismiss="alert">×</a>
+      <p><?php _e('Comments are closed.', 'roots'); ?></p>
+    </div>
   </section><!-- /#comments -->
 <?php } ?>
 
@@ -68,24 +81,16 @@
         <?php if (is_user_logged_in()) { ?>
           <p><?php printf(__('Logged in as <a href="%s/wp-admin/profile.php">%s</a>.', 'roots'), get_option('siteurl'), $user_identity); ?> <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="<?php __('Log out of this account', 'roots'); ?>"><?php _e('Log out &raquo;', 'roots'); ?></a></p>
         <?php } else { ?>
-          <p>
-            <label for="author"><?php _e('Name', 'roots'); if ($req) _e(' (required)', 'roots'); ?></label>
-            <input type="text" class="text" name="author" id="author" value="<?php echo esc_attr($comment_author); ?>" size="22" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?>>
-          </p>
-          <p>
-            <label for="email"><?php _e('Email (will not be published)', 'roots'); if ($req) _e(' (required)', 'roots'); ?></label>
-            <input type="email" class="text" name="email" id="email" value="<?php echo esc_attr($comment_author_email); ?>" size="22" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?>>
-          </p>
-          <p>
-            <label for="url"><?php _e('Website', 'roots'); ?></label>
-            <input type="url" class="text" name="url" id="url" value="<?php echo esc_attr($comment_author_url); ?>" size="22" tabindex="3">
-          </p>
+          <label for="author"><?php _e('Name', 'roots'); if ($req) _e(' (required)', 'roots'); ?></label>
+          <input type="text" class="text" name="author" id="author" value="<?php echo esc_attr($comment_author); ?>" size="22" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?>>
+          <label for="email"><?php _e('Email (will not be published)', 'roots'); if ($req) _e(' (required)', 'roots'); ?></label>
+          <input type="email" class="text" name="email" id="email" value="<?php echo esc_attr($comment_author_email); ?>" size="22" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?>>
+          <label for="url"><?php _e('Website', 'roots'); ?></label>
+          <input type="url" class="text" name="url" id="url" value="<?php echo esc_attr($comment_author_url); ?>" size="22" tabindex="3">
         <?php } ?>
-        <p>
-          <label for="comment"><?php _e('Comment', 'roots'); ?></label>
-          <textarea name="comment" id="comment" tabindex="4"></textarea>
-        </p>
-        <p><input name="submit" class="button" type="submit" id="submit" tabindex="5" value="<?php _e('Submit Comment', 'roots'); ?>"></p>
+        <label for="comment"><?php _e('Comment', 'roots'); ?></label>
+        <textarea name="comment" id="comment" class="input-xlarge" tabindex="4"></textarea>
+        <input name="submit" class="btn btn-primary" type="submit" id="submit" tabindex="5" value="<?php _e('Submit Comment', 'roots'); ?>">
         <?php comment_id_fields(); ?>
         <?php do_action('comment_form', $post->ID); ?>
       </form>

diff --git a/css/1140/1140.css b/css/1140/1140.css
diff --git a/css/1140/ie.css b/css/1140/ie.css