build bootstrap v2.2.1 from SASS files

update to v.2.2.1
jlong · Oct 31, 2012 · 1e883fa · 1e883fa
1 parent 75136dc
commit 1e883fa
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 19 deletions.
diff --git a/Makefile b/Makefile
@@ -28,7 +28,7 @@ build:
 	@echo "Compiling documentation...                  ${CHECK} Done"
 	@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 js/bootstrap-affix.js > docs/assets/js/bootstrap.js
 	@uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js
-	@echo "/**\n* Bootstrap.js v2.2.0 by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js
+	@echo "/**\n* Bootstrap.js v2.2.1 by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js
 	@cat docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js > docs/assets/js/bootstrap.min.js
 	@rm docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js
 	@echo "Compiling and minifying javascript...       ${CHECK} Done"

diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ You can use the SASS Twitter Bootstrap by dropping the compiled CSS into any new
 
 Because SASS always outputs standard css, just link to the final output like normal:
 
-`<link rel="stylesheet" type="text/css" href="bootstrap-2.2.0.css">`
+`<link rel="stylesheet" type="text/css" href="bootstrap-2.2.1.css">`
 
 For more info, refer to the docs!
 
@@ -34,7 +34,7 @@ You can learn more about SASS at:
 
 [sass-lang.com](http://sass-lang.com)
 
-SASS runs as a local GEM on your system. You can run `sass --watch lib/bootstrap.scss:bootstrap-2.2.0.css`
+SASS runs as a local GEM on your system. You can run `sass --watch lib/bootstrap.scss:bootstrap-2.2.1.css`
 
 
 

diff --git a/Rakefile b/Rakefile
@@ -9,7 +9,7 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-VERSION = "2.2.0"
+VERSION = "2.2.1"
 BOOTSTRAP_CSS = "bootstrap-#{VERSION}.css"
 BOOTSTRAP_MIN_CSS = "bootstrap-#{VERSION}.min.css"
 BOOTSTRAP_RESPONSIVE_CSS = "bootstrap-responsive-#{VERSION}.css"

diff --git a/bootstrap-2.2.0.css → bootstrap-2.2.1.css b/bootstrap-2.2.0.css → bootstrap-2.2.1.css
@@ -1,5 +1,5 @@
 /*
- * Bootstrap v2.2.0
+ * Bootstrap v2.2.1
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0

diff --git a/bootstrap-2.2.0.min.css → bootstrap-2.2.1.min.css b/bootstrap-2.2.0.min.css → bootstrap-2.2.1.min.css
diff --git a/bootstrap-responsive-2.2.0.css → bootstrap-responsive-2.2.1.css b/bootstrap-responsive-2.2.0.css → bootstrap-responsive-2.2.1.css
@@ -1,5 +1,5 @@
 /*
- * Bootstrap Responsive v2.2.0
+ * Bootstrap Responsive v2.2.1
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
@@ -1138,7 +1138,7 @@
     top: auto;
     left: auto;
     float: none;
-    display: block;
+    display: none;
     max-width: none;
     margin: 0 15px;
     padding: 0;

diff --git a/bootstrap-responsive-2.2.0.min.css → bootstrap-responsive-2.2.1.min.css b/bootstrap-responsive-2.2.0.min.css → bootstrap-responsive-2.2.1.min.css
diff --git a/component.json b/component.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "main": ["./docs/assets/js/bootstrap.js", "./docs/assets/css/bootstrap.css"],
   "dependencies": {
     "jquery": "~1.8.0"

diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
@@ -1 +1 @@
-../../../bootstrap-responsive-2.2.0.css
+../../../bootstrap-responsive-2.2.1.css
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
@@ -1 +1 @@
-../../../bootstrap-2.2.0.css
+../../../bootstrap-2.2.1.css
diff --git a/docs/index.html b/docs/index.html
@@ -87,7 +87,7 @@ <h1>Bootstrap</h1>
         <a href="./extend.html" >Extend</a>
       </li>
       <li>
-        Version 2.2.0
+        Version 2.2.1
       </li>
     </ul>
   </div>

diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
@@ -3,7 +3,7 @@
     <h1>{{_i}}Bootstrap{{/i}}</h1>
     <p>{{_i}}Sleek, intuitive, and powerful front-end framework for faster and easier web development.{{/i}}</p>
     <p>
-      <a href="assets/bootstrap.zip" class="btn btn-primary btn-large" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.2.0']);"{{/production}}>{{_i}}Download Bootstrap{{/i}}</a>
+      <a href="assets/bootstrap.zip" class="btn btn-primary btn-large" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.2.1']);"{{/production}}>{{_i}}Download Bootstrap{{/i}}</a>
     </p>
     <ul class="masthead-links">
       <li>
@@ -16,7 +16,7 @@
         <a href="./extend.html" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Extend']);"{{/production}}>{{_i}}Extend{{/i}}</a>
       </li>
       <li>
-        {{_i}}Version 2.2.0{{/i}}
+        {{_i}}Version 2.2.1{{/i}}
       </li>
     </ul>
   </div>

diff --git a/lib/bootstrap.scss b/lib/bootstrap.scss
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v2.2.0
+ * Bootstrap v2.2.1
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0

diff --git a/lib/responsive.scss b/lib/responsive.scss
@@ -1,5 +1,5 @@
 /*!
- * Bootstrap Responsive v2.2.0
+ * Bootstrap Responsive v2.2.1
  *
  * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "bootstrap"
   , "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development."
-  , "version": "2.2.0"
+  , "version": "2.2.1"
   , "keywords": ["bootstrap", "css"]
   , "homepage": "http://twitter.github.com/bootstrap/"
   , "author": "Twitter Inc."