Merge pull request #15851 from twbs/deps

Bump devDependencies

Gruntfile.js

@@ -280,12 +280,17 @@ module.exports = function (grunt) {
 
     copy: {
       fonts: {
+        expand: true,
         src: 'fonts/*',
         dest: 'dist/'
       },
       docs: {
-        src: 'dist/*/*',
-        dest: 'docs/'
+        expand: true,
+        cwd: 'dist/',
+        src: [
+          '**/*'
+        ],
+        dest: 'docs/dist/'
       }
     },
 

docs/dist/css/bootstrap.css

@@ -2576,10 +2576,13 @@ output {
 .form-control[disabled],
 .form-control[readonly],
 fieldset[disabled] .form-control {
-  cursor: not-allowed;
   background-color: #eee;
   opacity: 1;
 }
+.form-control[disabled],
+fieldset[disabled] .form-control {
+  cursor: not-allowed;
+}
 textarea.form-control {
   height: auto;
 }
@@ -2679,6 +2682,7 @@ fieldset[disabled] .checkbox label {
   cursor: not-allowed;
 }
 .form-control-static {
+  min-height: 34px;
   padding-top: 7px;
   padding-bottom: 7px;
   margin-bottom: 0;
@@ -2720,6 +2724,7 @@ select[multiple].form-group-sm .form-control {
 }
 .form-group-sm .form-control-static {
   height: 30px;
+  min-height: 32px;
   padding: 5px 10px;
   font-size: 12px;
   line-height: 1.5;
@@ -2756,6 +2761,7 @@ select[multiple].form-group-lg .form-control {
 }
 .form-group-lg .form-control-static {
   height: 46px;
+  min-height: 38px;
   padding: 10px 16px;
   font-size: 18px;
   line-height: 1.3333333;

package.json

@@ -32,22 +32,22 @@
   },
   "devDependencies": {
     "btoa": "~1.1.2",
-    "glob": "~4.3.5",
+    "glob": "~4.4.0",
     "grunt": "~0.4.5",
     "grunt-autoprefixer": "~2.2.0",
     "grunt-banner": "~0.3.1",
     "grunt-contrib-clean": "~0.6.0",
     "grunt-contrib-compress": "~0.13.0",
-    "grunt-contrib-concat": "~0.5.0",
+    "grunt-contrib-concat": "~0.5.1",
     "grunt-contrib-connect": "~0.9.0",
-    "grunt-contrib-copy": "~0.7.0",
+    "grunt-contrib-copy": "~0.8.0",
     "grunt-contrib-csslint": "~0.4.0",
-    "grunt-contrib-cssmin": "~0.11.0",
+    "grunt-contrib-cssmin": "~0.12.2",
     "grunt-contrib-jade": "~0.14.1",
     "grunt-contrib-jshint": "~0.11.0",
     "grunt-contrib-less": "~1.0.0",
     "grunt-contrib-qunit": "~0.5.2",
-    "grunt-contrib-uglify": "~0.7.0",
+    "grunt-contrib-uglify": "~0.8.0",
     "grunt-contrib-watch": "~0.6.1",
     "grunt-csscomb": "~3.0.0",
     "grunt-exec": "~0.4.6",
@@ -57,7 +57,7 @@
     "grunt-saucelabs": "~8.5.0",
     "grunt-sed": "~0.1.1",
     "load-grunt-tasks": "~3.1.0",
-    "markdown-it": "^3.0.5",
+    "markdown-it": "^3.0.6",
     "npm-shrinkwrap": "^200.1.0",
     "time-grunt": "~1.0.0"
   },