Merge branch 'master' into jo-separate-polyfill-file

bundlesize.config.json

@@ -0,0 +1,52 @@
+{
+  "files": [
+    {
+      "path": "./dist/css/bootstrap-grid.css",
+      "maxSize": "8 kB"
+    },
+    {
+      "path": "./dist/css/bootstrap-grid.min.css",
+      "maxSize": "7.2 kB"
+    },
+    {
+      "path": "./dist/css/bootstrap-reboot.css",
+      "maxSize": "2 kB"
+    },
+    {
+      "path": "./dist/css/bootstrap-reboot.min.css",
+      "maxSize": "2 kB"
+    },
+    {
+      "path": "./dist/css/bootstrap.css",
+      "maxSize": "25 kB"
+    },
+    {
+      "path": "./dist/css/bootstrap.min.css",
+      "maxSize": "23 kB"
+    },
+    {
+      "path": "./dist/js/bootstrap.bundle.js",
+      "maxSize": "51 kB"
+    },
+    {
+      "path": "./dist/js/bootstrap.bundle.min.js",
+      "maxSize": "24 kB"
+    },
+    {
+      "path": "./dist/js/bootstrap.esm.js",
+      "maxSize": "28 kB"
+    },
+    {
+      "path": "./dist/js/bootstrap.esm.min.js",
+      "maxSize": "19 kB"
+    },
+    {
+      "path": "./dist/js/bootstrap.js",
+      "maxSize": "29 kB"
+    },
+    {
+      "path": "./dist/js/bootstrap.min.js",
+      "maxSize": "17.5 kB"
+    }
+  ]
+}

package.json

@@ -113,7 +113,7 @@
     "autoprefixer": "^9.6.0",
     "babel-eslint": "^10.0.2",
     "babel-plugin-istanbul": "^5.1.4",
-    "bundlesize": "^0.17.2",
+    "bundlesize": "^0.18.0",
     "clean-css-cli": "^4.3.0",
     "coveralls": "^3.0.4",
     "cross-env": "^5.2.0",
@@ -162,56 +162,6 @@
     "js/{src,dist}/**/*.{js,map}",
     "scss/**/*.scss"
   ],
-  "bundlesize": [
-    {
-      "path": "./dist/css/bootstrap-grid.css",
-      "maxSize": "8 kB"
-    },
-    {
-      "path": "./dist/css/bootstrap-grid.min.css",
-      "maxSize": "7.2 kB"
-    },
-    {
-      "path": "./dist/css/bootstrap-reboot.css",
-      "maxSize": "2 kB"
-    },
-    {
-      "path": "./dist/css/bootstrap-reboot.min.css",
-      "maxSize": "2 kB"
-    },
-    {
-      "path": "./dist/css/bootstrap.css",
-      "maxSize": "25 kB"
-    },
-    {
-      "path": "./dist/css/bootstrap.min.css",
-      "maxSize": "23 kB"
-    },
-    {
-      "path": "./dist/js/bootstrap.bundle.js",
-      "maxSize": "51 kB"
-    },
-    {
-      "path": "./dist/js/bootstrap.bundle.min.js",
-      "maxSize": "24 kB"
-    },
-    {
-      "path": "./dist/js/bootstrap.esm.js",
-      "maxSize": "28 kB"
-    },
-    {
-      "path": "./dist/js/bootstrap.esm.min.js",
-      "maxSize": "19 kB"
-    },
-    {
-      "path": "./dist/js/bootstrap.js",
-      "maxSize": "29 kB"
-    },
-    {
-      "path": "./dist/js/bootstrap.min.js",
-      "maxSize": "17.5 kB"
-    }
-  ],
   "jspm": {
     "registry": "npm",
     "main": "js/bootstrap",

site/content/docs/4.3/components/forms.md

@@ -419,7 +419,7 @@ At times, you maybe need to use margin or padding utilities to create that perfe
     </div>
   </div>
   <div class="form-group row">
-    <div class="col-sm-10">
+    <div class="col-sm-10 offset-sm-2">
       <button type="submit" class="btn btn-primary">Sign in</button>
     </div>
   </div>

site/content/docs/4.3/components/modal.md

@@ -826,7 +826,7 @@ Destroys an element's modal.
 
 {{< highlight js >}}
 var myModalEl = document.getElementById('myModal')
-var modal = bootstrap.Modal._getInstance(myModalEl) // Return a Bootstrap modal instance
+var modal = bootstrap.Modal._getInstance(myModalEl) // Returns a Bootstrap modal instance
 {{< /highlight >}}
 
 ### Events

site/content/docs/4.3/components/popovers.md

@@ -351,7 +351,7 @@ Updates the position of an element's popover.
 
 {{< highlight js >}}
 var exampleTriggerEl = document.getElementById('example')
-var popover = bootstrap.Popover._getInstance(exampleTriggerEl) // Return a Bootstrap popover instance
+var popover = bootstrap.Popover._getInstance(exampleTriggerEl) // Returns a Bootstrap popover instance
 {{< /highlight >}}
 
 ### Events