]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
projects / thirdparty / bootstrap.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 426feee)
add version to min js
authorJacob Thornton <jacobthornton@gmail.com>
Thu, 8 Mar 2012 19:39:00 +0000 (11:39 -0800)
committerJacob Thornton <jacobthornton@gmail.com>
Thu, 8 Mar 2012 19:39:00 +0000 (11:39 -0800)
Makefile patch | blob | blame | history
docs/assets/bootstrap.zip patch | blob | blame | history
docs/index.html patch | blob | blame | history

diff --git a/Makefile b/Makefile
index 923c0ced34aba90ec0de85e108f7da3ba339aaea..0331964230d5cfe337dafd00ade45083cf4f0971 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,10 @@ bootstrap:
        lessc ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.css
        lessc --compress ${BOOTSTRAP_RESPONSIVE_LESS} > bootstrap/css/bootstrap-responsive.min.css
        cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js > bootstrap/js/bootstrap.js
-       uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.js
+       uglifyjs -nc bootstrap/js/bootstrap.js > bootstrap/js/bootstrap.min.tmp.js
+       echo "/**\n* Bootstrap.js by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > bootstrap/js/copyright.js
+       cat bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js > bootstrap/js/bootstrap.min.js
+       rm bootstrap/js/copyright.js bootstrap/js/bootstrap.min.tmp.js
 
 #
 # MAKE FOR GH-PAGES 4 FAT & MDO ONLY (O_O  )
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index c07368a2aa4b15cf182fa7b6e1b7f02e057041d6..48e8324e3987c958da9a27e543359881581e3bc9 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/index.html b/docs/index.html
index 4ecd5c12f395ef06269fc67775b92f2f7c39ee96..5041b8043b9c0c4aaf0af56fa61ec4f10cd97680 100644 (file)
--- a/docs/index.html
+++ b/docs/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8">
-    <title>Bootstrap, from Twitter</title>
+    <title>Bootstrap</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
Mirror of https://github.com/twbs/bootstrap.git