Merge branch 'master' into pr/10951

Conflicts:
	dist/css/bootstrap.min.css
	less/modals.less

1 files changed, 5 insertions, 5 deletions

diff --git a/js/tests/unit/affix.js b/js/tests/unit/affix.js
index b74bc51e4..6085a141e 100644
--- a/js/tests/unit/affix.js
+++ b/js/tests/unit/affix.js
@@ -1,22 +1,22 @@
 $(function () {
 
-    module("affix")
+    module('affix')
 
-      test("should provide no conflict", function () {
+      test('should provide no conflict', function () {
         var affix = $.fn.affix.noConflict()
         ok(!$.fn.affix, 'affix was set back to undefined (org value)')
         $.fn.affix = affix
       })
 
-      test("should be defined on jquery object", function () {
+      test('should be defined on jquery object', function () {
         ok($(document.body).affix, 'affix method is defined')
       })
 
-      test("should return element", function () {
+      test('should return element', function () {
         ok($(document.body).affix()[0] == document.body, 'document.body returned')
       })
 
-      test("should exit early if element is not visible", function () {
+      test('should exit early if element is not visible', function () {
         var $affix = $('<div style="display: none"></div>').affix()
         $affix.data('bs.affix').checkPosition()
         ok(!$affix.hasClass('affix'), 'affix class was not added')