Merge branch 'master' into master-ysds-static-modal-animation

twbs · May 2, 2020 · c37ecc7 · c37ecc7
2 parents 9dc02ca + ee27650
commit c37ecc7
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/site/assets/js/search.js b/site/assets/js/search.js
@@ -35,14 +35,14 @@
     transformData: function (hits) {
       return hits.map(function (hit) {
         var currentUrl = getOrigin()
-        var liveUrl = 'https://getbootstrap.com'
+        var liveUrl = 'https://getbootstrap.com/'
 
-        // When in production, return the result as is,
-        // otherwise remove our url from it.
-        // eslint-disable-next-line no-negated-condition
-        hit.url = currentUrl.indexOf(liveUrl) !== -1 ? // lgtm [js/incomplete-url-substring-sanitization]
+        hit.url = currentUrl.lastIndexOf(liveUrl, 0) === 0 ?
+          // On production, return the result as is
           hit.url :
-          hit.url.replace(liveUrl, '')
+          // On development or Netlify, replace `hit.url` with a trailing slash,
+          // so that the result link is relative to the server root
+          hit.url.replace(liveUrl, '/')
 
         // Prevent jumping to first header
         if (hit.anchor === 'content') {

diff --git a/site/content/docs/4.3/content/reboot.md b/site/content/docs/4.3/content/reboot.md
@@ -29,7 +29,7 @@ The `<html>` and `<body>` elements are updated to provide better page-wide defau
 
 ## Native font stack
 
-The default web fonts (Helvetica Neue, Helvetica, and Arial) have been dropped in Bootstrap 4 and replaced with a "native font stack" for optimum text rendering on every device and OS. Read more about [native font stacks in this *Smashing Magazine* article](https://www.smashingmagazine.com/2015/11/using-system-ui-fonts-practical-guide/).
+Bootstrap utilizes a "native font stack" or "system font stack" for optimum text rendering on every device and OS. These system fonts have been designed specifically with today's devices in mind, with improved rendering on screens, variable font support, and more. Read more about [native font stacks in this *Smashing Magazine* article](https://www.smashingmagazine.com/2015/11/using-system-ui-fonts-practical-guide/).
 
 {{< highlight scss >}}
 $font-family-sans-serif:

diff --git a/site/content/docs/4.3/customize/components.md b/site/content/docs/4.3/customize/components.md
@@ -38,7 +38,7 @@ For more information and examples on how to modify our Sass maps and variables,
 
 ## Creating your own
 
-We encourage you to adopt these guidelines when building with Bootstrap to create your own components. We've extended the approach ourselves to the custom components in our documentation and examples. Consider the our custom callouts in our documentation that allow us
+We encourage you to adopt these guidelines when building with Bootstrap to create your own components. We've extended this approach ourselves to the custom components in our documentation and examples. Components like our callouts are built just like our provided components with base and modifier classes.
 
 <div class="bd-example">
   <div class="bd-callout my-0">

diff --git a/site/content/docs/4.3/customize/sass.md b/site/content/docs/4.3/customize/sass.md
@@ -65,7 +65,7 @@ With that setup in place, you can begin to modify any of the Sass variables and
 
 ## Variable defaults
 
-Every Sass variable in Bootstrap 4 includes the `!default` flag allowing you to override the variable's default value in your own Sass without modifying Bootstrap's source code. Copy and paste variables as needed, modify their values, and remove the `!default` flag. If a variable has already been assigned, then it won't be re-assigned by the default values in Bootstrap.
+Every Sass variable in Bootstrap includes the `!default` flag allowing you to override the variable's default value in your own Sass without modifying Bootstrap's source code. Copy and paste variables as needed, modify their values, and remove the `!default` flag. If a variable has already been assigned, then it won't be re-assigned by the default values in Bootstrap.
 
 You will find the complete list of Bootstrap's variables in `scss/_variables.scss`. Some variables are set to `null`, these variables don't output the property unless they are overridden in your configuration.
 
@@ -86,7 +86,7 @@ Repeat as necessary for any variable in Bootstrap, including the global options
 
 ## Maps and loops
 
-Bootstrap 4 includes a handful of Sass maps, key value pairs that make it easier to generate families of related CSS. We use Sass maps for our colors, grid breakpoints, and more. Just like Sass variables, all Sass maps include the `!default` flag and can be overridden and extended.
+Bootstrap includes a handful of Sass maps, key value pairs that make it easier to generate families of related CSS. We use Sass maps for our colors, grid breakpoints, and more. Just like Sass variables, all Sass maps include the `!default` flag and can be overridden and extended.
 
 Some of our Sass maps are merged into empty ones by default. This is done to allow easy expansion of a given Sass map, but comes at the cost of making _removing_ items from a map slightly more difficult.
 

diff --git a/site/content/docs/4.3/migration.md b/site/content/docs/4.3/migration.md
@@ -59,8 +59,8 @@ Changes to our source and compiled JavaScript files.
 We've updated the color system that powers Bootstrap to improve color contrast and provide a much more extensive set of colors.
 
 - Updated blue and pink base colors (`-500`) to ensure AA contrast.
-- Added new tints and shades for every color, providing nine separate colors for each base color.
-- To support our color system, we've added new custom `tint()` and `shade()` functions to mix our colors appropriately.
+- Added new tints and shades for every color, providing nine separate colors for each base color, as new Sass variables.
+- To support our color system, we've added new custom `tint-color()` and `shade-color()` functions to mix our colors appropriately.
 
 ## Grid and layout