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

README.md

@@ -1,7 +1,7 @@
 BootstrapWP - Bootstrap Theme for WordPress
 =================
 
-![image](http://f.cl.ly/items/0o0N0e1k2X0B0l0r0n1P/BootstrapWP-Bootstrap-starter-theme.jpg)
+![image](http://f.cl.ly/items/3x1o3V042y3n1X3z1t1O/BootstrapWP-v91-home.png) 
 
 
 Bootstrap is a responsive front-end toolkit from Twitter designed to kickstart web development, complete with core HTML, CSS, and JS for grids, type, forms, navigation, and many more components. Now you can use it with **WordPress** as a solid base to build custom themes quickly and easily.
@@ -23,35 +23,74 @@ Usage
 
 Download the BootstrapWP theme, and install on a WordPress local or development site.
 
-This is meant to be a base theme for WordPress custom theme development.  A knowledge of WordPress theme development practices as well as understanding of HTML, CSS/LESS, jQuery and PHP are required.
-
-**Important!** To safely retain the ability to update the less files with future versions of Bootstrap or BootstrapWP, add all custom edits/changes inside the `less/bswp-custom.less` file.
+This is meant to be a base theme for WordPress custom theme development.  Your knowledge of WordPress theme development practices as well as understanding of HTML, CSS/LESS, jQuery and PHP are required.
 
 
 Getting Started
 -------
 
-1. Create a page that uses the template `Hero Homepage Template`, then under `Settings->Reading`  set your site to use a static front page selecting your new page.
+1. Create a page that uses the template `Page - Home Hero`, then under `Settings->Reading`  set your site to use a static front page selecting your new page.
 
 2. Add content to the three "Home" widget areas under `Appearances->Widgets`.
 
 3. Create a menu under `Appearances->Menus` and assign it be your site's Main Menu.
 
+Customization
+-------
+
+**Comfortable with LESS?**
+
+Check out the /assets/css/less folder where the `bootstrapwp.less` file is the master complier.  The included files compile the `bootstrapwp.css` file that is located in the /assets/css folder.
+**Important!** To safely retain the ability to update the less files with future versions of Bootstrap or BootstrapWP, add all custom edits/changes inside the `less/bswp-custom.less` file.
+
+
+**Not comfortable with LESS?**
+
+You can override the compiled bootstrapwp.css file by adding custom styles to the style.css in the theme's root directory.
+
+
+**Prefer to create a Child Theme?**
+
+BootstrapWP is Child Theme compatible.  For more information on how to create a [Child Theme check out the WordPress Codex](http://codex.wordpress.org/Child_Themes#Directory_structure).  
 
 
 Bug tracker
 -----------
 
+Please report all issues on the repo's Issue Tracker. Remember to provide as much information as possible regarding the bug/issue you are reporting so a patch can be released.
+
 **Report theme bugs** [https://github.com/rachelbaker/bootstrapwp-Twitter-Bootstrap-for-WordPress/issues](https://github.com/rachelbaker/bootstrapwp-Twitter-Bootstrap-for-WordPress/issues)
 
-##v.90 of BootstrapWP - Release September 9, 2012
 
-__Release Highlights:__
+##v.91 of BootstrapWP ##
+
+**Release Highlights:**
+
+1.  Updated to Bootstrap 2.2.1 scripts and styles
+2.  Fix Child Theme compatibility
+3.  Improved file organization with assets and template folders
+4.  Merged internationalization/translation contributions from [santiagogil](https://github.com/santiagogil) and [zedejose](https://github.com/zedejose)
+
+__Assets Folder__
+
+* Now contains the following folders: css, js, img, fonts and ico
+* Removed assets/css/less/bswp-docs.less file as it is now only loaded on documentation templates.
+* Updated all LESS and JS files from Bootstrap 2.2.1
+
+__Templates-Documentation Folder__
+
+* Holds documentation page templates and related assets
+* Updated documentation templates and docs.css file from Bootstrap 2.2.1
+
+__Templates-Pages Folder__
+
+* Holds theme's page templates
+* Changed layout on `page-home.php` to match hero template
+* Removed "jumbotron" class from h1 title on `page-blog.php` template
+
+__404.php__
 
-1.  Updated to Bootstrap 2.1 scripts and styles
-2. Fixed `Custom Walker Menu` PHP error
-3.  Fixed Automatic Thumbnail PHP errors
-4.  Cleaned up unnecessary theme files
+* Removed masthead comment to clean up template file
 
 __Archive.php__
 

css/bootstrapwp.css → assets/css/bootstrapwp.css

@@ -12,7 +12,7 @@ License URI: license.txt
 This theme, like WordPress, is licensed under the GPL.
 Use it to make something cool, have fun, and share what you've learned with others.
 */
-/* Loading Standard Bootstrap 2.2.1 LESS Files
+/* Loading Standard Bootstrap 2.2 LESS Files
 ----------------------------------------------------------------------------------------*/
 article,
 aside,
@@ -196,7 +196,7 @@ textarea {
   clear: both;
 }
 .hide-text {
-  font: a;
+  font: 0/0 a;
   color: transparent;
   text-shadow: none;
   background-color: transparent;
@@ -5108,7 +5108,7 @@ a.badge:hover {
 .affix {
   position: fixed;
 }
-/* Loading Responsive Bootstrap 2.1 LESS Files
+/* Loading Responsive Bootstrap 2.2 LESS Files
 ----------------------------------------------------------------------------------------*/
 .hidden {
   display: none;
@@ -6098,8 +6098,34 @@ a.badge:hover {
 }
 /* Custom BootstrapWP Overrides and Styles
 ----------------------------------------------------------------------------------------*/
-/********************************************************
-Overriding some defaults from the Bootstrap defaults to improve/fix integration with WordPress
+/********************************************************/
+.container > hr {
+  margin: 60px 0;
+}
+.jumbotron {
+  margin: 80px 0;
+  text-align: center;
+}
+.jumbotron h1 {
+  font-size: 100px;
+  line-height: 1;
+}
+.jumbotron .lead {
+  font-size: 24px;
+  line-height: 1.25;
+}
+.jumbotron .btn {
+  font-size: 21px;
+  padding: 14px 24px;
+}
+/* Supporting marketing content */
+.marketing {
+  margin: 60px 0;
+}
+.marketing p + h4 {
+  margin-top: 28px;
+}
+/**Overriding some defaults from the Bootstrap defaults to improve/fix integration with WordPress
 -------------------------------------------------- */
 #content-wrapper {
   padding: 40px 0 20px 0;
@@ -6270,7 +6296,7 @@ h4.widget-title {
   background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
   background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
   background-repeat: no-repeat;
-  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
   border: 1px solid #CCC;
   border-bottom-color: #BBB;
   -webkit-border-radius: 4px;
@@ -6427,10 +6453,10 @@ ol.comment-list li p.meta strong {
   background-image: -o-linear-gradient(top, #0088cc, #0044cc);
   background-image: linear-gradient(top, #0088cc, #0044cc);
   background-repeat: repeat-x;
-  filter: progid:dximagetransform.microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
   border-color: #04C #04C #002A80;
   border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
 }
 .button:hover,
 #submit:hover,

css/less/bootstrapwp.less → assets/css/less/bootstrapwp.less

@@ -13,11 +13,11 @@ This theme, like WordPress, is licensed under the GPL.
 Use it to make something cool, have fun, and share what you've learned with others.
 */
 
-////////   IMPORTANT!  Make custom edits/changes in the less/bswp-custom.less file
+////////   IMPORTANT!  Make custom edits/changes in the /assets/less/bswp-custom.less file
 ////////   to safely retain the ability to update the less files with future
 ////////   versions of Bootstrap or BootstrapWP
 
-/* Loading Standard Bootstrap 2.2.1 LESS Files
+/* Loading Standard Bootstrap 2.2 LESS Files
 ----------------------------------------------------------------------------------------*/
 // CSS Reset
 @import "reset.less";
@@ -72,7 +72,7 @@ Use it to make something cool, have fun, and share what you've learned with othe
 // Utility classes
 @import "utilities.less"; // Has to be last to override when necessary
 
-/* Loading Responsive Bootstrap 2.1 LESS Files
+/* Loading Responsive Bootstrap 2.2 LESS Files
 ----------------------------------------------------------------------------------------*/
 // RESPONSIVE CLASSES
 // ------------------
@@ -101,7 +101,6 @@ Use it to make something cool, have fun, and share what you've learned with othe
 
 
 
-
 /* Custom BootstrapWP Overrides and Styles
 ----------------------------------------------------------------------------------------*/
 // BSWP OVERRIDES

css/less/bswp-overrides.less → assets/css/less/bswp-overrides.less

@@ -1,6 +1,39 @@
-// BSWP OVERRIDES v0.90
-/********************************************************
-Overriding some defaults from the Bootstrap defaults to improve/fix integration with WordPress
+// BSWP OVERRIDES v0.91
+/********************************************************/
+
+// HOME Template Styles
+// --------------------------------------------------
+
+      .container > hr {
+        margin: 60px 0;
+      }
+
+      .jumbotron {
+        margin: 80px 0;
+        text-align: center;
+      }
+      .jumbotron h1 {
+        font-size: 100px;
+        line-height: 1;
+      }
+      .jumbotron .lead {
+        font-size: 24px;
+        line-height: 1.25;
+      }
+      .jumbotron .btn {
+        font-size: 21px;
+        padding: 14px 24px;
+      }
+
+      /* Supporting marketing content */
+      .marketing {
+        margin: 60px 0;
+      }
+      .marketing p + h4 {
+        margin-top: 28px;
+      }
+
+/**Overriding some defaults from the Bootstrap defaults to improve/fix integration with WordPress
 -------------------------------------------------- */
 
 // Wrapping content