root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
8,104 Commits 111 Branches 92 Tags 666 MiB
Commit Graph

8104 Commits

Author SHA1 Message Date
Mark Otto 7b42103df6 kill bottom margin on last docs section 2014-01-18 11:33:50 -08:00
Julian Thilo a56cf753ce Make spelling of Less uniform throughout the docs 2014-01-18 18:40:47 +01:00
Julian Thilo 092b1a47ef Fix typo in index.html 2014-01-18 18:15:37 +01:00
Mark Otto dcdf716eef copy 2014-01-17 19:04:14 -08:00
Chris Rebert 172de467eb present browser compatibility info in a table 2014-01-17 17:12:52 -08:00
Chris Rebert d8c87ddc28 fix #12277 
Thanks to @Quy for pointing these out.
 2014-01-17 14:28:01 -08:00
Tobias Lindig 084f0fb113 add namespace `.bs` also to the event `dismiss.modal` 2014-01-17 12:16:53 -08:00
Chris Rebert d6e8006ea6 Merge pull request #12276 from twbs/grunt-contrib-qunit 
bump grunt-contrib-qunit to v0.4.0
 2014-01-17 12:06:12 -08:00
Chris Rebert 58c4a8c0f1 bump grunt-contrib-qunit to v0.4.0 2014-01-17 11:56:53 -08:00
Chris Rebert ffdc18cbbf fix #12274 2014-01-17 11:52:35 -08:00
Chris Rebert c5bed1a850 Merge pull request #12275 from ZDroid/ncss 
Replace Normalize with Normalize.css
 2014-01-17 11:43:18 -08:00
Zlatan Vasović 93ab926dc7 Replace Normalize with Normalize.css 2014-01-17 20:22:32 +01:00
Julian Thilo af5cebf76b Merge pull request #12271 from tlindig/modal_remove_needless_space 
remove needless space character
 2014-01-17 06:29:12 -08:00
Tobias Lindig 7fab3c30f2 remove needless space character 2014-01-17 13:34:03 +01:00
Chris Rebert 6af0013ac5 Revert "Add tooltip `viewport` option, respect bounds of the viewport" 
This reverts commit edb221a20c.
Reverting due to broken JS unit tests.

Conflicts:
	docs/javascript.html
 2014-01-16 20:32:59 -08:00
Chris Rebert faa783e989 Merge pull request #12267 from twbs/ie-10 
enable IE10 for Sauce tests
 2014-01-16 20:07:43 -08:00
Mark Otto 03f4534307 Merge branch 'bo-tooltip-viewport' of https://github.com/benogle/bootstrap into benogle-bo-tooltip-viewport 
Conflicts:
	docs/javascript.html
 2014-01-16 20:01:28 -08:00
Mark Otto 8eef0a47ee Merge branch 'master' of github.com:twbs/bootstrap 2014-01-16 20:00:36 -08:00
Mark Otto 380019ccb2 Split box-sizing reset for faster rendering 2014-01-16 20:00:28 -08:00
Chris Rebert ee396aeb8e enable IE10 for Sauce tests 2014-01-16 19:53:02 -08:00
Chris Rebert bd8ef99028 temporarily disable OS X Chrome Sauce test since it's being flaky 
e.g.:
Tested http://127.0.0.1:3000/js/tests/index.html
Environment: OS X 10.9::chrome
>> Timeout, waited for more than 300000 milliseconds
 2014-01-16 19:52:24 -08:00
Chris Rebert 600f62dc78 Merge pull request #12265 from twbs/ie-11 
enable IE11 in Sauce tests
 2014-01-16 17:00:46 -08:00
Chris Rebert ecf8148c3f Merge pull request #12264 from twbs/mavericks-safari-7 
upgrade to Safari 7 in Sauce tests
 2014-01-16 16:10:50 -08:00
Chris Rebert 4a50ac0bdd enable IE11 in Sauce tests 2014-01-16 15:35:08 -08:00
Chris Rebert 60fb8b76f9 Merge pull request #12262 from twbs/osx-firefox 
re-enable OS X Firefox in Sauce tests
 2014-01-16 15:25:50 -08:00
Mark Otto d07e8fece4 grunt 2014-01-16 15:03:34 -08:00
Chris Rebert ded7008e40 upgrade to Safari 7 in Sauce tests 2014-01-16 14:51:41 -08:00
Chris Rebert 1ca0f8dbc0 re-enable OS X Firefox in Sauce tests 2014-01-16 14:47:11 -08:00
fat 4bd6a52562 add missing paren 2014-01-16 14:28:21 -08:00
fat 82ff4e2e40 tooltip subpixel test fixes 2014-01-16 14:25:28 -08:00
fat 3b2418e688 remove flaky pos bottom test which is effect by unit scroll pos 2014-01-16 13:44:08 -08:00
fat 2f76821a4d new qunit 2014-01-16 13:33:09 -08:00
Chris Rebert bc074d5488 Merge pull request #12260 from patricker/patch-1 
Update javascript.html to fix Tabs example
 2014-01-16 10:55:22 -08:00
patricker 47f786e6ea Update javascript.html 
Fixed issue in Tabs example where the div had been marked as 'active' but the li had not been.  The correct tab of data would be displayed on load, but no tabs would be highlighted.  The tabs with fade example does not have this issue.  jsFiddle: http://jsfiddle.net/uXV56/
 2014-01-16 11:41:34 -07:00
Chris Rebert 190ae7bb31 Merge pull request #12258 from ibash/master 
Fixing js error in IE9 where no transition is supported
 2014-01-16 10:18:52 -08:00
Islam Sharabash ad64b0acc8 Fixing js error in IE9 where no transition is supported 2014-01-16 10:11:59 -08:00
Chris Rebert 81610c6048 Merge pull request #12252 from browserstack/browserstack-runner 
Browserstack runner tunnel timeout
 2014-01-15 23:14:13 -08:00
Rahul Nawani 2bdf99fcc1 add debug for browserstack-runner 2014-01-16 11:56:08 +05:30
Rahul Nawani a8e14bf1f8 update browserstack-runner package 2014-01-16 11:55:44 +05:30
Mark Otto 96a9e1bae0 Merge pull request #12245 from twbs/footer-links 
add Issues & Releases links back to footer
 2014-01-15 20:14:37 -08:00
Chris Rebert 47ff60426d add Issues & Releases links back to footer 2014-01-15 17:29:54 -08:00
Chris Rebert 0ef8d1bad4 reassert #12231 & #12232 (merge went badly?) 2014-01-15 17:24:57 -08:00
Mark Otto 78e81a1de9 Merge branch 'master' of github.com:twbs/bootstrap 
Conflicts:
	docs/assets/css/pack.min.css
 2014-01-15 16:25:29 -08:00
Mark Otto 7e7264e224 fix ad placement 2014-01-15 16:25:04 -08:00
Julian Thilo 95f24dca9a Fix customizer's toggle buttons' margin 2014-01-16 01:19:00 +01:00
Julian Thilo 5ac8dca8ad Adapt about.html lead to latest changes 2014-01-16 01:08:00 +01:00
Julian Thilo fa052c9659 Fix footer links 2014-01-16 00:58:13 +01:00
Chris Rebert 47bbc30b2c increase Sauce concurrency 
Per https://github.com/twbs/bootstrap/issues/11087#issuecomment-32309827
Thanks @admc & @saucelabs !
 2014-01-15 15:55:47 -08:00
Mark Otto fcb78bcef7 Merge pull request #12243 from twbs/cleanup-about 
move Community & Translations docs sections from About to Getting Started
 2014-01-15 15:54:35 -08:00
Chris Rebert 53bcb829bb move Community & Translations docs sections from About to Getting Started 2014-01-15 15:34:10 -08:00