From b9bd82b49656e320b623cc3e2c0363c1ffb9e9ad Mon Sep 17 00:00:00 2001 From: fat Date: Fri, 17 May 2013 10:13:22 -0700 Subject: [PATCH 1/7] patch dropdowns for #7118 --- docs/assets/css/bootstrap.css | 9 +++++++++ docs/assets/js/bootstrap-dropdown.js | 6 +++++- docs/assets/js/bootstrap.js | 6 +++++- docs/assets/js/bootstrap.min.js | 2 +- js/bootstrap-dropdown.js | 6 +++++- less/dropdowns.less | 11 +++++++++++ 6 files changed, 36 insertions(+), 4 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 2f56af33f3b1..cf3b6bd5fd45 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3009,6 +3009,15 @@ table th[class*="span"], display: block; } +.dropdown-backdrop { + position: fixed; + top: 0; + right: 0; + bottom: 0; + left: 0; + z-index: 990; +} + .pull-right > .dropdown-menu { right: 0; left: auto; diff --git a/docs/assets/js/bootstrap-dropdown.js b/docs/assets/js/bootstrap-dropdown.js index a1d51519fedb..57b07895677b 100644 --- a/docs/assets/js/bootstrap-dropdown.js +++ b/docs/assets/js/bootstrap-dropdown.js @@ -52,6 +52,10 @@ clearMenus() if (!isActive) { + if ('ontouchstart' in document.documentElement) { + // if mobile we we use a backdrop because click events don't delegate + $(' @@ -216,6 +226,21 @@

Built with Bootstrap.

+ + diff --git a/docs/javascript.html b/docs/javascript.html index f4957d91cf9e..d7fb8fc549c1 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -25,6 +25,16 @@ + @@ -1775,6 +1785,21 @@

Options

+ + diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 87a9bb003157..215620527c68 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -25,6 +25,16 @@ + @@ -597,6 +607,21 @@

Hidden on...

+ + diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache index 679236bf6e82..e130974cee29 100644 --- a/docs/templates/pages/index.mustache +++ b/docs/templates/pages/index.mustache @@ -3,7 +3,7 @@

{{_i}}Bootstrap{{/i}}

{{_i}}Sleek, intuitive, and powerful front-end framework for faster and easier web development.{{/i}}

- {{_i}}Download Bootstrap{{/i}} + {{_i}}Download Bootstrap{{/i}}

diff --git a/package.json b/package.json index e52483651e9d..32114ab7cb49 100644 --- 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.3.1" + , "version": "2.3.2" , "keywords": ["bootstrap", "css"] , "homepage": "http://twitter.github.com/bootstrap/" , "author": "Twitter Inc." From 60b202de3220fa95d4df5d4fa1b93361165ec3a6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 6 Jun 2013 09:14:52 -0700 Subject: [PATCH 4/7] Fix link to Bower in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 156c15502a25..a592e3c94aa8 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Three quick start options are available: * [Download the latest release](https://github.com/twitter/bootstrap/zipball/master). * Clone the repo: `git clone git://github.com/twitter/bootstrap.git`. -* Install with Twitter's [Bower](http://twitter.github.com/bower): `bower install bootstrap`. +* Install with Twitter's [Bower](http://bower.io): `bower install bootstrap`. From de683e9003b5ec6860a1fcb768416356dd685ef5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 13 Jun 2013 22:57:05 -0700 Subject: [PATCH 5/7] Update README.md --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index a592e3c94aa8..de5bdcee7f20 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,3 @@ - - - - # [Bootstrap v2.3.2](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap) Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat). From beca8a6b745922119fbacf918b83d1ff24e52e31 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 20 Jun 2013 12:04:20 -0600 Subject: [PATCH 6/7] Apply #8166 to master so folks can build v2.3.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 32114ab7cb49..39f50e8886c4 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ , "devDependencies": { "uglify-js": "1.3.4" , "jshint": "0.9.1" - , "recess": "1.1.6" + , "recess": "1.1.7" , "connect": "2.1.3" , "hogan.js": "2.0.0" } From 514ea6ea7662d0e9418bb7348bf4e49ba603e2f4 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 20 Jun 2013 12:14:46 -0600 Subject: [PATCH 7/7] Bump Recess to v1.1.8 to fix further less.js version problems Apparently Recess v1.1.7 had another problem: https://github.com/twitter/recess/pull/100 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 39f50e8886c4..4fc52ca0f41e 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ , "devDependencies": { "uglify-js": "1.3.4" , "jshint": "0.9.1" - , "recess": "1.1.7" + , "recess": "1.1.8" , "connect": "2.1.3" , "hogan.js": "2.0.0" }