diff --git a/Gemfile b/Gemfile index 617d3eee5b0f..80ff9f2f1ca6 100644 --- a/Gemfile +++ b/Gemfile @@ -4,5 +4,5 @@ group :development, :test do gem 'jekyll', '~> 3.6.2' gem 'jekyll-redirect-from', '~> 0.13.0' gem 'jekyll-sitemap', '~> 1.1.1' - gem 'jekyll-toc', '~> 0.5.0.rc' + gem 'jekyll-toc', '~> 0.5.1' end diff --git a/Gemfile.lock b/Gemfile.lock index 305f519f2aeb..0f58c80a9ef1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -24,7 +24,7 @@ GEM sass (~> 3.4) jekyll-sitemap (1.1.1) jekyll (~> 3.3) - jekyll-toc (0.5.0.rc) + jekyll-toc (0.5.1) nokogiri (~> 1.6) jekyll-watch (1.5.1) listen (~> 3.0) @@ -63,7 +63,7 @@ DEPENDENCIES jekyll (~> 3.6.2) jekyll-redirect-from (~> 0.13.0) jekyll-sitemap (~> 1.1.1) - jekyll-toc (~> 0.5.0.rc) + jekyll-toc (~> 0.5.1) BUNDLED WITH 1.16.1 diff --git a/_data/browser-bugs.yml b/_data/browser-bugs.yml index 9756758ddd41..339e2a18af89 100644 --- a/_data/browser-bugs.yml +++ b/_data/browser-bugs.yml @@ -248,6 +248,16 @@ origin: > Bootstrap#15298 +- + browser: > + Chrome + summary: > + Significant performance hit for dynamic SVGs with text depending on the number of fonts in `font-family`. + upstream_bug: > + Chromium#781344 + origin: > + Bootstrap#24673 + - browser: > Safari diff --git a/_data/browser-features.yml b/_data/browser-features.yml index acdc532b2644..6c8701f68997 100644 --- a/_data/browser-features.yml +++ b/_data/browser-features.yml @@ -18,16 +18,6 @@ origin: > Bootstrap#19984 -- - browser: > - Edge - summary: > - Implement [sticky positioning](http://html5please.com/#position:sticky) from CSS Positioned Layout Level 3 - upstream_bug: > - UserVoice#6263621 - origin: > - Bootstrap#17021 - - browser: > Edge diff --git a/_includes/scripts.html b/_includes/scripts.html index 261ca9a17648..ee598dcc4d5c 100644 --- a/_includes/scripts.html +++ b/_includes/scripts.html @@ -9,6 +9,10 @@ {%- endif -%} +{%- if page.layout == "docs" -%} + +{%- endif -%} + {%- if site.github -%} {%- else -%} @@ -19,36 +23,3 @@ {%- endif -%} - -{%- if page.layout == "docs" -%} - - -{%- endif -%} - - diff --git a/assets/js/src/application.js b/assets/js/src/application.js index 9c236b7c4bd5..d5ee22ebc3f6 100644 --- a/assets/js/src/application.js +++ b/assets/js/src/application.js @@ -10,7 +10,7 @@ * details, see https://creativecommons.org/licenses/by/3.0/. */ -/* global Clipboard, anchors */ +/* global Clipboard: false, anchors: false, Holder: false */ (function ($) { 'use strict' @@ -54,7 +54,7 @@ }) // Insert copy to clipboard button before .highlight - $('.highlight').each(function () { + $('figure.highlight, div.highlight').each(function () { var btnHtml = '
' $(this).before(btnHtml) $('.btn-clipboard') @@ -101,5 +101,35 @@ } anchors.add('.bd-content > h2, .bd-content > h3, .bd-content > h4, .bd-content > h5') $('.bd-content > h2, .bd-content > h3, .bd-content > h4, .bd-content > h5').wrapInner('') + + // Search + if (window.docsearch) { + window.docsearch({ + apiKey: '48cb48b22351bc71ea5f12f4d1ede198', + indexName: 'bootstrap-v4', + inputSelector: '#search-input', + handleSelected: function (input, event, suggestion) { + var url = suggestion.url + url = suggestion.isLvl1 ? url.split('#')[0] : url + // If it's a title we remove the anchor so it does not jump. + window.location.href = url + }, + transformData: function (hits) { + return hits.map(function (hit) { + hit.url = hit.url.replace('https://v4-alpha.getbootstrap.com', '/docs/4.0') + return hit + }) + }, + debug: false // Set debug to true if you want to inspect the dropdown + }) + } + + // Holder + Holder.addTheme('gray', { + bg: '#777', + fg: 'rgba(255,255,255,.75)', + font: 'Helvetica', + fontweight: 'normal' + }) }) }(jQuery)) diff --git a/build/rollup.config.js b/build/rollup.config.js index dc5fa6cced40..0b59aef652cd 100644 --- a/build/rollup.config.js +++ b/build/rollup.config.js @@ -36,16 +36,16 @@ if (BUNDLE) { module.exports = { input: path.resolve(__dirname, '../js/src/index.js'), output: { - file: path.resolve(__dirname, `../dist/js/${fileDest}`), - format: 'umd' - }, - name: 'bootstrap', - external, - globals, - plugins, - banner: `/*! + banner: `/*! * Bootstrap v${pkg.version} (${pkg.homepage}) * Copyright 2011-${year} ${pkg.author} * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - */` + */`, + file: path.resolve(__dirname, `../dist/js/${fileDest}`), + format: 'umd', + globals, + name: 'bootstrap' + }, + external, + plugins } diff --git a/docs/4.0/components/forms.md b/docs/4.0/components/forms.md index e5a568b67b05..90a77225b045 100644 --- a/docs/4.0/components/forms.md +++ b/docs/4.0/components/forms.md @@ -928,7 +928,7 @@ Our example forms show native textual ``s above, but form validation styl