Merge branch 'master' into pr/11536

Conflicts: dist/css/bootstrap.min.css
2026-06-05 16:42:29 +03:00 · 2013-11-30 23:35:56 -08:00
parent ba4c5dae9b 57070dcf45
commit 53047fa587
47 changed files with 799 additions and 842 deletions
@@ -100,4 +100,4 @@
      })
 })

-}(window.jQuery)
+}(jQuery)
@@ -231,7 +231,7 @@ window.onload = function () { // wait for load in a dumb way because B-0
        }
        result = {
          'bootstrap.css'     : cw + tree.toCSS(),
-          'bootstrap.min.css' : cw + tree.toCSS({ compress: true })
+          'bootstrap.min.css' : cw + tree.toCSS({ compress: true }).replace(/\n/g, '')
        }
      })
    } catch (err) {