Merge branch 'master' of github.com:twbs/bootstrap

Gruntfile.js

@@ -296,7 +296,15 @@ module.exports = function (grunt) {
     },
 
     jekyll: {
-      docs: {}
+      options: {
+        config: '_config.yml'
+      },
+      docs: {},
+      github: {
+        options: {
+          raw: 'github: true'
+        }
+      }
     },
 
     jade: {
@@ -382,7 +390,7 @@ module.exports = function (grunt) {
   require('time-grunt')(grunt);
 
   // Docs HTML validation task
-  grunt.registerTask('validate-html', ['jekyll', 'validation']);
+  grunt.registerTask('validate-html', ['jekyll:docs', 'validation']);
 
   var runSubset = function (subset) {
     return !process.env.TWBS_TEST || process.env.TWBS_TEST === subset;
@@ -456,6 +464,8 @@ module.exports = function (grunt) {
   grunt.registerTask('lint-docs-js', ['jshint:assets', 'jscs:assets']);
   grunt.registerTask('docs', ['docs-css', 'lint-docs-css', 'docs-js', 'lint-docs-js', 'clean:docs', 'copy:docs', 'build-customizer']);
 
+  grunt.registerTask('docs-github', ['jekyll:github']);
+
   // Task for updating the cached npm packages used by the Travis build (which are controlled by test-infra/npm-shrinkwrap.json).
   // This task should be run and the updated file should be committed whenever Bootstrap's dependencies change.
   grunt.registerTask('update-shrinkwrap', ['exec:npmUpdate', '_update-shrinkwrap']);

docs/_includes/components/media.html

@@ -9,7 +9,7 @@
     <div class="media">
       <div class="media-left">
         <a href="#">
-          <img data-src="holder.js/64x64" alt="Generic placeholder image">
+          <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
         </a>
       </div>
       <div class="media-body">
@@ -20,7 +20,7 @@
     <div class="media">
       <div class="media-left">
         <a href="#">
-          <img data-src="holder.js/64x64" alt="Generic placeholder image">
+          <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
         </a>
       </div>
       <div class="media-body">
@@ -29,7 +29,7 @@
         <div class="media">
           <div class="media-left">
             <a href="#">
-              <img data-src="holder.js/64x64" alt="Generic placeholder image">
+              <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
             </a>
           </div>
           <div class="media-body">
@@ -46,14 +46,14 @@
       </div>
       <div class="media-right">
         <a href="#">
-          <img data-src="holder.js/64x64" alt="Generic placeholder image">
+          <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
         </a>
       </div>
     </div>
     <div class="media">
       <div class="media-left">
         <a href="#">
-          <img data-src="holder.js/64x64" alt="Generic placeholder image">
+          <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
         </a>
       </div>
       <div class="media-body">
@@ -62,7 +62,7 @@
       </div>
       <div class="media-right">
         <a href="#">
-          <img data-src="holder.js/64x64" alt="Generic placeholder image">
+          <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
         </a>
       </div>
     </div>
@@ -71,7 +71,7 @@
 <div class="media">
   <div class="media-left">
     <a href="#">
-      <img src="..." alt="...">
+      <img class="media-object" src="..." alt="...">
     </a>
   </div>
   <div class="media-body">
@@ -88,7 +88,7 @@
     <div class="media">
       <div class="media-left">
         <a href="#">
-          <img data-src="holder.js/64x64" alt="Generic placeholder image">
+          <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
         </a>
       </div>
       <div class="media-body">
@@ -100,7 +100,7 @@
     <div class="media">
       <div class="media-left media-middle">
         <a href="#">
-          <img data-src="holder.js/64x64" alt="Generic placeholder image">
+          <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
         </a>
       </div>
       <div class="media-body">
@@ -112,7 +112,7 @@
     <div class="media">
       <div class="media-left media-bottom">
         <a href="#">
-          <img data-src="holder.js/64x64" alt="Generic placeholder image">
+          <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
         </a>
       </div>
       <div class="media-body">
@@ -126,7 +126,7 @@
 <div class="media">
   <div class="media-left media-middle">
     <a href="#">
-      <img src="..." alt="...">
+      <img class="media-object" src="..." alt="...">
     </a>
   </div>
   <div class="media-body">
@@ -143,7 +143,7 @@
       <li class="media">
         <div class="media-left">
           <a href="#">
-            <img data-src="holder.js/64x64" alt="Generic placeholder image">
+            <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
           </a>
         </div>
         <div class="media-body">
@@ -153,7 +153,7 @@
           <div class="media">
             <div class="media-left">
               <a href="#">
-                <img data-src="holder.js/64x64" alt="Generic placeholder image">
+                <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
               </a>
             </div>
             <div class="media-body">
@@ -163,7 +163,7 @@
               <div class="media">
                 <div class="media-left">
                   <a href="#">
-                    <img data-src="holder.js/64x64" alt="Generic placeholder image">
+                    <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
                   </a>
                 </div>
                 <div class="media-body">
@@ -177,7 +177,7 @@
           <div class="media">
             <div class="media-left">
               <a href="#">
-                <img data-src="holder.js/64x64" alt="Generic placeholder image">
+                <img class="media-object" data-src="holder.js/64x64" alt="Generic placeholder image">
               </a>
             </div>
             <div class="media-body">
@@ -194,7 +194,7 @@
   <li class="media">
     <div class="media-left">
       <a href="#">
-        <img src="..." alt="...">
+        <img class="media-object" src="..." alt="...">
       </a>
     </div>
     <div class="media-body">

less/carousel.less

@@ -148,6 +148,7 @@
     width:  20px;
     height: 20px;
     margin-top: -10px;
+    line-height: 1;
     font-family: serif;
   }
 

package.json

@@ -32,9 +32,9 @@
   },
   "devDependencies": {
     "btoa": "~1.1.2",
-    "glob": "~4.0.6",
+    "glob": "~4.2.1",
     "grunt": "~0.4.5",
-    "grunt-autoprefixer": "~1.0.1",
+    "grunt-autoprefixer": "~2.0.0",
     "grunt-banner": "~0.2.3",
     "grunt-contrib-clean": "~0.6.0",
     "grunt-contrib-concat": "~0.5.0",
@@ -52,12 +52,12 @@
     "grunt-exec": "~0.4.6",
     "grunt-html-validation": "~0.1.18",
     "grunt-jekyll": "~0.4.2",
-    "grunt-jscs": "~0.8.1",
-    "grunt-saucelabs": "~8.3.2",
+    "grunt-jscs": "~1.0.0",
+    "grunt-saucelabs": "~8.3.3",
     "grunt-sed": "~0.1.1",
     "load-grunt-tasks": "~1.0.0",
     "npm-shrinkwrap": "5.0.0",
-    "remarkable": "~1.4.1",
+    "remarkable": "~1.4.2",
     "time-grunt": "~1.0.0"
   },
   "engines": {