Merge pull request #3 from twbs/v4-dev

update from official repo
gijsbotje · Aug 25, 2017 · 4356d08 · 4356d08
2 parents a103958 + ba6a6f1
commit 4356d08
Show file tree

Hide file tree

Showing 70 changed files with 1,040 additions and 555 deletions.
diff --git a/_config.yml b/_config.yml
@@ -70,5 +70,5 @@ cdn:
   js_hash:          "sha384-h0AbiXch4ZDo7tp9hKZ4TsHbi047NrKGLO3SEJAg45jXxnGIfYzk4Si90RDIqNm1"
   jquery:           "https://code.jquery.com/jquery-3.2.1.slim.min.js"
   jquery_hash:      "sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN"
-  popper:           "https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js"
-  popper_hash:      "sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4"
+  popper:           "https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.3/umd/popper.min.js"
+  popper_hash:      "sha384-vFJXuSJphROIrBnz7yo7oB41mKfc8JzQZiCq4NCceLEaO4IHwicKwpJf9c9IpFgh"
diff --git a/_includes/header.html b/_includes/header.html
@@ -23,6 +23,8 @@
 {% endif %}
 <link href="{{ site.baseurl }}/assets/css/docs.min.css" rel="stylesheet">
 
+{% include favicons.html %}
+
 {% include social.html %}
 
 <script>

diff --git a/_layouts/redirect.html b/_layouts/redirect.html
@@ -1,7 +1,8 @@
 <!DOCTYPE html>
-<html lang="en-US">
+<html lang="en">
   <head>
     <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <title>Bootstrap - Content moved</title>
     <link rel="canonical" href="{{ page.redirect.to }}">
     <meta http-equiv="refresh" content="0; url={{ page.redirect.to }}">
@@ -31,6 +32,6 @@
   <body>
     <h1>Redirecting…</h1>
     <a href="{{ page.redirect.to }}">Click here if you are not redirected</a>
-    <script>location="{{ page.redirect.to }}"</script>
+    <script>window.location="{{ page.redirect.to }}";</script>
   </body>
 </html>
diff --git a/assets/css/docs.min.css.map b/assets/css/docs.min.css.map
diff --git a/assets/js/ie-emulation-modes-warning.js b/assets/js/ie-emulation-modes-warning.js
@@ -27,7 +27,7 @@
     // IE JavaScript conditional compilation docs: https://msdn.microsoft.com/library/121hztk3%28v=vs.94%29.aspx
     // @cc_on docs: https://msdn.microsoft.com/library/8ka90k2e%28v=vs.94%29.aspx
     var jscriptVersion = new Function('/*@cc_on return @_jscript_version; @*/')() // eslint-disable-line no-new-func
-    if (jscriptVersion === undefined) {
+    if (typeof jscriptVersion === 'undefined') {
       return 11 // IE11+ not in emulation mode
     }
     if (jscriptVersion < 9) {

diff --git a/assets/js/vendor/popper.min.js b/assets/js/vendor/popper.min.js
diff --git a/bower.json b/bower.json
@@ -31,7 +31,7 @@
     "Gruntfile.js"
   ],
   "dependencies": {
-    "jquery": ">=1.9.1",
-    "popper.js": "^1.11.0"
+    "jquery": ">=3.0.0",
+    "popper.js": "^1.12.3"
   }
 }
diff --git a/build/stamp.js b/build/stamp.js
@@ -21,8 +21,8 @@ if (typeof jQuery === 'undefined') {
 
 (function ($) {
   var version = $.fn.jquery.split(' ')[0].split('.')
-  if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] >= 4)) {
-    throw new Error('Bootstrap\\'s JavaScript requires at least jQuery v1.9.1 but less than v4.0.0')
+  if ((version[0] < 3) || (version[0] >= 4)) {
+    throw new Error('Bootstrap\\'s JavaScript requires at least jQuery v3.0.0 but less than v4.0.0')
   }
 })(jQuery);
 

diff --git a/dist/css/bootstrap-grid.css b/dist/css/bootstrap-grid.css
diff --git a/dist/css/bootstrap-grid.css.map b/dist/css/bootstrap-grid.css.map
diff --git a/dist/css/bootstrap-grid.min.css b/dist/css/bootstrap-grid.min.css
diff --git a/dist/css/bootstrap-grid.min.css.map b/dist/css/bootstrap-grid.min.css.map
diff --git a/dist/css/bootstrap-reboot.css.map b/dist/css/bootstrap-reboot.css.map