From 87065772b1054a8198caddbf1e8e856c8202c7c7 Mon Sep 17 00:00:00 2001 From: Varunram Date: Mon, 12 Mar 2018 13:38:09 +0530 Subject: [PATCH 01/58] Fix #25813 by adding extra columns to table --- docs/4.0/content/tables.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/4.0/content/tables.md b/docs/4.0/content/tables.md index cfacb3c793..2ef7fd8934 100644 --- a/docs/4.0/content/tables.md +++ b/docs/4.0/content/tables.md @@ -763,6 +763,9 @@ Use `.table-responsive{-sm|-md|-lg|-xl}` as needed to create responsive tables u Heading Heading Heading + Heading + Heading + Heading @@ -773,6 +776,9 @@ Use `.table-responsive{-sm|-md|-lg|-xl}` as needed to create responsive tables u Cell Cell Cell + Cell + Cell + Cell 2 @@ -781,6 +787,9 @@ Use `.table-responsive{-sm|-md|-lg|-xl}` as needed to create responsive tables u Cell Cell Cell + Cell + Cell + Cell 3 @@ -789,6 +798,9 @@ Use `.table-responsive{-sm|-md|-lg|-xl}` as needed to create responsive tables u Cell Cell Cell + Cell + Cell + Cell From afcbd65afb101fa794b7f98657675fc0ed5ac054 Mon Sep 17 00:00:00 2001 From: parammittal16 Date: Sat, 12 May 2018 00:16:28 +0530 Subject: [PATCH 02/58] Fix box-shadow class with built in utility --- docs/4.1/examples/album/album.css | 2 -- docs/4.1/examples/album/index.html | 20 ++++++++++---------- docs/4.1/examples/blog/blog.css | 2 -- docs/4.1/examples/blog/index.html | 4 ++-- docs/4.1/examples/offcanvas/index.html | 8 ++++---- docs/4.1/examples/offcanvas/offcanvas.css | 2 -- docs/4.1/examples/pricing/index.html | 8 ++++---- docs/4.1/examples/pricing/pricing.css | 2 -- docs/4.1/examples/product/index.html | 20 ++++++++++---------- docs/4.1/examples/product/product.css | 2 -- 10 files changed, 30 insertions(+), 40 deletions(-) diff --git a/docs/4.1/examples/album/album.css b/docs/4.1/examples/album/album.css index 7eabbf9b2f..f9d1518d3c 100644 --- a/docs/4.1/examples/album/album.css +++ b/docs/4.1/examples/album/album.css @@ -35,5 +35,3 @@ footer { footer p { margin-bottom: .25rem; } - -.box-shadow { box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05); } diff --git a/docs/4.1/examples/album/index.html b/docs/4.1/examples/album/index.html index ac765aaa4d..dbfd38ebf2 100644 --- a/docs/4.1/examples/album/index.html +++ b/docs/4.1/examples/album/index.html @@ -37,7 +37,7 @@ -
+
@@ -68,7 +68,7 @@
-
+
Card image cap

This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.

@@ -83,7 +83,7 @@
-
+
Card image cap

This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.

@@ -98,7 +98,7 @@
-
+
Card image cap

This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.

@@ -114,7 +114,7 @@
-
+
Card image cap

This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.

@@ -129,7 +129,7 @@
-
+
Card image cap

This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.

@@ -144,7 +144,7 @@
-
+
Card image cap

This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.

@@ -160,7 +160,7 @@
-
+
Card image cap

This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.

@@ -175,7 +175,7 @@
-
+
Card image cap

This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.

@@ -190,7 +190,7 @@
-
+
Card image cap

This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.

diff --git a/docs/4.1/examples/blog/blog.css b/docs/4.1/examples/blog/blog.css index 399b7e8730..059125fa86 100644 --- a/docs/4.1/examples/blog/blog.css +++ b/docs/4.1/examples/blog/blog.css @@ -71,8 +71,6 @@ h1, h2, h3, h4, h5, h6 { .border-top { border-top: 1px solid #e5e5e5; } .border-bottom { border-bottom: 1px solid #e5e5e5; } -.box-shadow { box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05); } - /* * Blog name and description */ diff --git a/docs/4.1/examples/blog/index.html b/docs/4.1/examples/blog/index.html index 2fad7bb517..bd8c8c6885 100644 --- a/docs/4.1/examples/blog/index.html +++ b/docs/4.1/examples/blog/index.html @@ -64,7 +64,7 @@
-
+
World

@@ -78,7 +78,7 @@

-
+
Design

diff --git a/docs/4.1/examples/offcanvas/index.html b/docs/4.1/examples/offcanvas/index.html index d31b0261ca..1ef8833acc 100644 --- a/docs/4.1/examples/offcanvas/index.html +++ b/docs/4.1/examples/offcanvas/index.html @@ -54,7 +54,7 @@

-
+
-
+
Bootstrap
@@ -80,7 +80,7 @@
-
+
Recent updates
@@ -108,7 +108,7 @@
-
+
Suggestions
diff --git a/docs/4.1/examples/offcanvas/offcanvas.css b/docs/4.1/examples/offcanvas/offcanvas.css index 7edfa0bc9c..da00324003 100644 --- a/docs/4.1/examples/offcanvas/offcanvas.css +++ b/docs/4.1/examples/offcanvas/offcanvas.css @@ -72,8 +72,6 @@ body { .border-bottom { border-bottom: 1px solid #e5e5e5; } -.box-shadow { box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05); } - .lh-100 { line-height: 1; } .lh-125 { line-height: 1.25; } .lh-150 { line-height: 1.5; } diff --git a/docs/4.1/examples/pricing/index.html b/docs/4.1/examples/pricing/index.html index 36fae88d25..33556acdfb 100644 --- a/docs/4.1/examples/pricing/index.html +++ b/docs/4.1/examples/pricing/index.html @@ -18,7 +18,7 @@ -
+
Company name
-
+

Another headline

And an even wittier subheading.

-
+
@@ -83,14 +83,14 @@

Another headline

And an even wittier subheading.

-
+

Another headline

And an even wittier subheading.

-
+
@@ -100,14 +100,14 @@

Another headline

And an even wittier subheading.

-
+

Another headline

And an even wittier subheading.

-
+
diff --git a/docs/4.1/examples/product/product.css b/docs/4.1/examples/product/product.css index cc0d15c8ce..fc8b045196 100644 --- a/docs/4.1/examples/product/product.css +++ b/docs/4.1/examples/product/product.css @@ -63,8 +63,6 @@ .border-top { border-top: 1px solid #e5e5e5; } .border-bottom { border-bottom: 1px solid #e5e5e5; } -.box-shadow { box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05); } - .flex-equal > * { -ms-flex: 1; flex: 1; From 8cc6220161bde4975a8298677740948768fe5b3a Mon Sep 17 00:00:00 2001 From: parammittal16 Date: Sat, 12 May 2018 00:18:37 +0530 Subject: [PATCH 03/58] Fix unused box-shadow class --- docs/4.1/examples/checkout/form-validation.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/4.1/examples/checkout/form-validation.css b/docs/4.1/examples/checkout/form-validation.css index fd88d5a403..dcd283b97b 100644 --- a/docs/4.1/examples/checkout/form-validation.css +++ b/docs/4.1/examples/checkout/form-validation.css @@ -6,6 +6,4 @@ .border-bottom { border-bottom: 1px solid #e5e5e5; } .border-top-gray { border-top-color: #adb5bd; } -.box-shadow { box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05); } - .lh-condensed { line-height: 1.25; } From 6f8d322f740955abead66cc6a396248b91809641 Mon Sep 17 00:00:00 2001 From: Martijn Cuppens Date: Thu, 5 Jul 2018 22:42:01 +0200 Subject: [PATCH 04/58] Remove .border-bottom & .border-top classes from examples --- docs/4.1/examples/blog/blog.css | 3 --- docs/4.1/examples/checkout/form-validation.css | 4 ---- docs/4.1/examples/dashboard/dashboard.css | 7 ------- docs/4.1/examples/offcanvas/offcanvas.css | 2 -- docs/4.1/examples/pricing/pricing.css | 3 --- docs/4.1/examples/product/product.css | 3 --- 6 files changed, 22 deletions(-) diff --git a/docs/4.1/examples/blog/blog.css b/docs/4.1/examples/blog/blog.css index 399b7e8730..e5a486421c 100644 --- a/docs/4.1/examples/blog/blog.css +++ b/docs/4.1/examples/blog/blog.css @@ -68,9 +68,6 @@ h1, h2, h3, h4, h5, h6 { .h-md-250 { height: 250px; } } -.border-top { border-top: 1px solid #e5e5e5; } -.border-bottom { border-bottom: 1px solid #e5e5e5; } - .box-shadow { box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05); } /* diff --git a/docs/4.1/examples/checkout/form-validation.css b/docs/4.1/examples/checkout/form-validation.css index fd88d5a403..2c1e67aa97 100644 --- a/docs/4.1/examples/checkout/form-validation.css +++ b/docs/4.1/examples/checkout/form-validation.css @@ -2,10 +2,6 @@ max-width: 960px; } -.border-top { border-top: 1px solid #e5e5e5; } -.border-bottom { border-bottom: 1px solid #e5e5e5; } -.border-top-gray { border-top-color: #adb5bd; } - .box-shadow { box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05); } .lh-condensed { line-height: 1.25; } diff --git a/docs/4.1/examples/dashboard/dashboard.css b/docs/4.1/examples/dashboard/dashboard.css index 3918097399..eb3bb85409 100644 --- a/docs/4.1/examples/dashboard/dashboard.css +++ b/docs/4.1/examples/dashboard/dashboard.css @@ -98,10 +98,3 @@ body { border-color: transparent; box-shadow: 0 0 0 3px rgba(255, 255, 255, .25); } - -/* - * Utilities - */ - -.border-top { border-top: 1px solid #e5e5e5; } -.border-bottom { border-bottom: 1px solid #e5e5e5; } diff --git a/docs/4.1/examples/offcanvas/offcanvas.css b/docs/4.1/examples/offcanvas/offcanvas.css index 7edfa0bc9c..2b7ed74191 100644 --- a/docs/4.1/examples/offcanvas/offcanvas.css +++ b/docs/4.1/examples/offcanvas/offcanvas.css @@ -70,8 +70,6 @@ body { .bg-purple { background-color: #6f42c1; } -.border-bottom { border-bottom: 1px solid #e5e5e5; } - .box-shadow { box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05); } .lh-100 { line-height: 1; } diff --git a/docs/4.1/examples/pricing/pricing.css b/docs/4.1/examples/pricing/pricing.css index 1b52205c6e..e94a5c77dc 100644 --- a/docs/4.1/examples/pricing/pricing.css +++ b/docs/4.1/examples/pricing/pricing.css @@ -19,7 +19,4 @@ html { min-width: 220px; } -.border-top { border-top: 1px solid #e5e5e5; } -.border-bottom { border-bottom: 1px solid #e5e5e5; } - .box-shadow { box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05); } diff --git a/docs/4.1/examples/product/product.css b/docs/4.1/examples/product/product.css index cc0d15c8ce..84111ccf01 100644 --- a/docs/4.1/examples/product/product.css +++ b/docs/4.1/examples/product/product.css @@ -60,9 +60,6 @@ * Extra utilities */ -.border-top { border-top: 1px solid #e5e5e5; } -.border-bottom { border-bottom: 1px solid #e5e5e5; } - .box-shadow { box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05); } .flex-equal > * { From e77d64b3723fc78b81cdd26719090653cb02cff8 Mon Sep 17 00:00:00 2001 From: parammittal16 Date: Sun, 8 Jul 2018 06:08:14 +0530 Subject: [PATCH 05/58] Replace shadow with shadow-sm --- docs/4.1/examples/album/index.html | 20 ++++++++++---------- docs/4.1/examples/blog/index.html | 4 ++-- docs/4.1/examples/offcanvas/index.html | 8 ++++---- docs/4.1/examples/pricing/index.html | 8 ++++---- docs/4.1/examples/product/index.html | 20 ++++++++++---------- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/docs/4.1/examples/album/index.html b/docs/4.1/examples/album/index.html index dbfd38ebf2..f8f51e6a13 100644 --- a/docs/4.1/examples/album/index.html +++ b/docs/4.1/examples/album/index.html @@ -37,7 +37,7 @@
-
+
@@ -68,7 +68,7 @@
-
+
Card image cap

This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.

@@ -83,7 +83,7 @@
-
+
Card image cap

This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.

@@ -98,7 +98,7 @@
-
+
Card image cap

This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.

@@ -114,7 +114,7 @@
-
+
Card image cap

This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.

@@ -129,7 +129,7 @@
-
+
Card image cap

This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.

@@ -144,7 +144,7 @@
-
+
Card image cap

This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.

@@ -160,7 +160,7 @@
-
+
Card image cap

This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.

@@ -175,7 +175,7 @@
-
+
Card image cap

This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.

@@ -190,7 +190,7 @@
-
+
Card image cap

This is a wider card with supporting text below as a natural lead-in to additional content. This content is a little bit longer.

diff --git a/docs/4.1/examples/blog/index.html b/docs/4.1/examples/blog/index.html index bd8c8c6885..83caad6b2e 100644 --- a/docs/4.1/examples/blog/index.html +++ b/docs/4.1/examples/blog/index.html @@ -64,7 +64,7 @@
-
+
World

@@ -78,7 +78,7 @@

-
+
Design

diff --git a/docs/4.1/examples/offcanvas/index.html b/docs/4.1/examples/offcanvas/index.html index 1ef8833acc..1c9661233e 100644 --- a/docs/4.1/examples/offcanvas/index.html +++ b/docs/4.1/examples/offcanvas/index.html @@ -54,7 +54,7 @@

-
+
-
+
Bootstrap
@@ -80,7 +80,7 @@
-
+
Recent updates
@@ -108,7 +108,7 @@
-
+
Suggestions
diff --git a/docs/4.1/examples/pricing/index.html b/docs/4.1/examples/pricing/index.html index 33556acdfb..e1a385bde1 100644 --- a/docs/4.1/examples/pricing/index.html +++ b/docs/4.1/examples/pricing/index.html @@ -18,7 +18,7 @@ -
+
Company name
-
+

Another headline

And an even wittier subheading.

-
+
@@ -83,14 +83,14 @@

Another headline

And an even wittier subheading.

-
+

Another headline

And an even wittier subheading.

-
+
@@ -100,14 +100,14 @@

Another headline

And an even wittier subheading.

-
+

Another headline

And an even wittier subheading.

-
+
From 8b50a72f3c025e7a5d3472998206b681ff06c896 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Mon, 9 Jul 2018 16:41:47 +0300 Subject: [PATCH 06/58] Add missing role="button" in .navbar's .dropdown-toggle Fixes #26830 --- docs/4.1/components/navbar.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/4.1/components/navbar.md b/docs/4.1/components/navbar.md index d3b235c3e1..50b8f34867 100644 --- a/docs/4.1/components/navbar.md +++ b/docs/4.1/components/navbar.md @@ -185,7 +185,7 @@ You may also utilize dropdowns in your navbar nav. Dropdown menus require a wrap Pricing
  • -
    From abb48686267db3dadaa390e62538d23216c046d3 Mon Sep 17 00:00:00 2001 From: Andrew Date: Mon, 9 Jul 2018 19:59:22 -0500 Subject: [PATCH 07/58] correct spelling errors (#26837) --- scss/_functions.scss | 2 +- scss/_navbar.scss | 4 ++-- scss/mixins/_breakpoints.scss | 2 +- scss/mixins/_hover.scss | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scss/_functions.scss b/scss/_functions.scss index b44d7d9986..bf8be9aee9 100644 --- a/scss/_functions.scss +++ b/scss/_functions.scss @@ -1,6 +1,6 @@ // Bootstrap functions // -// Utility mixins and functions for evalutating source code across our variables, maps, and mixins. +// Utility mixins and functions for evaluating source code across our variables, maps, and mixins. // Ascending // Used to evaluate Sass maps like our grid breakpoints. diff --git a/scss/_navbar.scss b/scss/_navbar.scss index 05025273f8..52de5050a4 100644 --- a/scss/_navbar.scss +++ b/scss/_navbar.scss @@ -24,7 +24,7 @@ padding: $navbar-padding-y $navbar-padding-x; // Because flex properties aren't inherited, we need to redeclare these first - // few properities so that content nested within behave properly. + // few properties so that content nested within behave properly. > .container, > .container-fluid { display: flex; @@ -94,7 +94,7 @@ // Powered by the collapse Bootstrap JavaScript plugin. // When collapsed, prevent the toggleable navbar contents from appearing in -// the default flexbox row orienation. Requires the use of `flex-wrap: wrap` +// the default flexbox row orientation. Requires the use of `flex-wrap: wrap` // on the `.navbar` parent. .navbar-collapse { flex-basis: 100%; diff --git a/scss/mixins/_breakpoints.scss b/scss/mixins/_breakpoints.scss index d1ad684cc7..59f25a27e6 100644 --- a/scss/mixins/_breakpoints.scss +++ b/scss/mixins/_breakpoints.scss @@ -42,7 +42,7 @@ @return if($next, breakpoint-min($next, $breakpoints) - .02px, null); } -// Returns a blank string if smallest breakpoint, otherwise returns the name with a dash infront. +// Returns a blank string if smallest breakpoint, otherwise returns the name with a dash in front. // Useful for making responsive utilities. // // >> breakpoint-infix(xs, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px)) diff --git a/scss/mixins/_hover.scss b/scss/mixins/_hover.scss index c1224ffc53..192f847e17 100644 --- a/scss/mixins/_hover.scss +++ b/scss/mixins/_hover.scss @@ -1,6 +1,6 @@ // Hover mixin and `$enable-hover-media-query` are deprecated. // -// Origally added during our alphas and maintained during betas, this mixin was +// Originally added during our alphas and maintained during betas, this mixin was // designed to prevent `:hover` stickiness on iOS-an issue where hover styles // would persist after initial touch. // From 591725e8386c30b54e8aca258247c83811f628d8 Mon Sep 17 00:00:00 2001 From: Simon Podlipsky Date: Tue, 10 Jul 2018 14:54:45 +0300 Subject: [PATCH 08/58] Document tooltip flickering in combination with some overflow settings --- docs/4.1/components/tooltips.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/4.1/components/tooltips.md b/docs/4.1/components/tooltips.md index 90bcc15ce6..6e375feba9 100644 --- a/docs/4.1/components/tooltips.md +++ b/docs/4.1/components/tooltips.md @@ -86,6 +86,18 @@ Trigger the tooltip via JavaScript: $('#example').tooltip(options) {% endhighlight %} +{% capture callout %} +##### Usage with overflow `auto` and `scroll` +When the parent container has CSS property `overflow` set to values `auto|scroll` (for example when used within `.table-responsive`) the tooltip has weird flickering behaviour. + +The solution is to set `boundary` option to anything other than default value `'scrollParent'`. Eg. set it to `'window'` + +{% highlight js %} +$('#example').tooltip({ boundary: 'window' }) +{% endhighlight %} +{% endcapture %} +{% include callout.html content=callout type="warning" %} + ### Markup The required markup for a tooltip is only a `data` attribute and `title` on the HTML element you wish to have a tooltip. The generated markup of a tooltip is rather simple, though it does require a position (by default, set to `top` by the plugin). From e9ec13e974d2263bb337fee95388488cefb33a18 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 10 Jul 2018 23:26:30 +0300 Subject: [PATCH 09/58] Update tooltips.md --- docs/4.1/components/tooltips.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/4.1/components/tooltips.md b/docs/4.1/components/tooltips.md index 6e375feba9..441aac4203 100644 --- a/docs/4.1/components/tooltips.md +++ b/docs/4.1/components/tooltips.md @@ -88,9 +88,10 @@ $('#example').tooltip(options) {% capture callout %} ##### Usage with overflow `auto` and `scroll` -When the parent container has CSS property `overflow` set to values `auto|scroll` (for example when used within `.table-responsive`) the tooltip has weird flickering behaviour. -The solution is to set `boundary` option to anything other than default value `'scrollParent'`. Eg. set it to `'window'` +When the parent container has the CSS property `overflow` set to values `auto` or `scroll` (for example when used within `.table-responsive`) the tooltip has weird flickering behaviour. + +The solution is to set the `boundary` option to anything other than default value `'scrollParent'`. For example, set it to `'window'`: {% highlight js %} $('#example').tooltip({ boundary: 'window' }) From cb82394fc8645d4e41476d19693844fac5022b4c Mon Sep 17 00:00:00 2001 From: Catalin Zalog Date: Thu, 1 Mar 2018 10:30:47 +0200 Subject: [PATCH 10/58] fix(modal): removes .navbar-toggler margin --- js/src/modal.js | 16 +++------------- js/tests/unit/modal.js | 42 ------------------------------------------ 2 files changed, 3 insertions(+), 55 deletions(-) diff --git a/js/src/modal.js b/js/src/modal.js index 904f6f93ce..e7f9d2d960 100644 --- a/js/src/modal.js +++ b/js/src/modal.js @@ -64,8 +64,7 @@ const Modal = (($) => { DATA_TOGGLE : '[data-toggle="modal"]', DATA_DISMISS : '[data-dismiss="modal"]', FIXED_CONTENT : '.fixed-top, .fixed-bottom, .is-fixed, .sticky-top', - STICKY_CONTENT : '.sticky-top', - NAVBAR_TOGGLER : '.navbar-toggler' + STICKY_CONTENT : '.sticky-top' } /** @@ -452,15 +451,6 @@ const Modal = (($) => { .css('margin-right', `${parseFloat(calculatedMargin) - this._scrollbarWidth}px`) }) - // Adjust navbar-toggler margin - $(navbarToggler).each((index, element) => { - const actualMargin = element.style.marginRight - const calculatedMargin = $(element).css('margin-right') - $(element) - .data('margin-right', actualMargin) - .css('margin-right', `${parseFloat(calculatedMargin) + this._scrollbarWidth}px`) - }) - // Adjust body padding const actualPadding = document.body.style.paddingRight const calculatedPadding = $(document.body).css('padding-right') @@ -482,8 +472,8 @@ const Modal = (($) => { } }) - // Restore sticky content and navbar-toggler margin - const elements = [].slice.call(document.querySelectorAll(`${Selector.STICKY_CONTENT}, ${Selector.NAVBAR_TOGGLER}`)) + // Restore sticky content + const elements = [].slice.call(document.querySelectorAll(`${Selector.STICKY_CONTENT}`)) $(elements).each((index, element) => { const margin = $(element).data('margin-right') if (typeof margin !== 'undefined') { diff --git a/js/tests/unit/modal.js b/js/tests/unit/modal.js index 3932d66c7a..2729e4e4b9 100644 --- a/js/tests/unit/modal.js +++ b/js/tests/unit/modal.js @@ -521,48 +521,6 @@ $(function () { .bootstrapModal('show') }) - QUnit.test('should adjust the inline margin of the navbar-toggler when opening and restore when closing', function (assert) { - assert.expect(2) - var done = assert.async() - var $element = $('
    ').appendTo('#qunit-fixture') - var originalMargin = $element.css('margin-right') - - $('