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

9069 Commits

Author SHA1 Message Date
Chris Rebert 42c8daea75 Not Less' fault per se 2014-05-01 11:45:48 -07:00
Chris Rebert 99f22d97ba Merge pull request #13434 from twbs/fix-13247 
document grid column wrapping behavior; fixes #13247
 2014-04-30 20:16:30 -07:00
Chris Rebert f793853609 document grid column wrapping behavior; fixes #13247 2014-04-30 20:15:46 -07:00
Mark Otto 4c3ef52fc1 Merge branch 'pr/13320' 
Conflicts:
	dist/css/bootstrap-rtl.min.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap-rtl.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-04-30 19:48:22 -07:00
Mark Otto 108b7c390e grunt dist 2014-04-30 19:47:56 -07:00
Mark Otto a80eb1eb50 explain 2014-04-30 19:47:50 -07:00
Mark Otto 17f77a5070 Merge pull request #13328 from thebigredgeek/master 
Added bower reference to main less file
 2014-04-30 19:36:55 -07:00
Mark Otto b217357252 grunt dist 2014-04-30 19:35:47 -07:00
Mark Otto 9f80cab096 Merge pull request #13449 from sejr/master 
Increase .lead font-weight for better readability on mobile
 2014-04-30 19:33:11 -07:00
Mark Otto f20f66604b Merge pull request #11966 from colllin/noconflict 
Fix #11464 - JS noConflict() mode not working in 3.0.x
 2014-04-30 17:43:43 -07:00
Mark Otto abc797696d Merge pull request #13437 from saas786/master 
fixes #13367
 2014-04-30 17:26:37 -07:00
XhmikosR 2c1fe5374e Merge pull request #13424 from twbs/docs-libs 
Update docs libs
 2014-04-30 08:00:21 +03:00
Chris Rebert bde5f1fe9f Merge pull request #13422 from twbs/ie-emulation-modes-warning 
Warn about IE emulation modes in docs+examples
 2014-04-27 22:29:14 -07:00
Chris Rebert a84a3693b1 add ie-emulation-modes-warning.js to docs & examples 2014-04-27 22:08:44 -07:00
Chris Rebert 686a45a84b Merge pull request #13435 from twbs/doc-less-import-glyphicons 
Document that @import-ing Bootstrap can break the icon font path
 2014-04-27 20:45:35 -07:00
Sam Roth 3564369fdf Update type.less 
For better readability on mobile devices
 2014-04-27 15:40:25 -04:00
Chris Rebert d66a15154e Merge pull request #13439 from nschonni/spacing-fixes 
Minor Spacing fixes
 2014-04-26 18:41:25 -07:00
Nick Schonning 5ea66ba3b0 Minor Spacing fixes 
Flagged upstream in bootstrap-sass by scss-lint
 2014-04-26 15:24:25 -04:00
XhmikosR 30b07b942e Run `grunt`. 2014-04-26 08:35:48 +03:00
XhmikosR ab1087f6e5 Update holder.js to v2.3.2. 2014-04-26 08:35:48 +03:00
XhmikosR f2eff55064 Update JSZip to v2.2.1. 2014-04-26 08:35:47 +03:00
syed 43b6d6c2f8 fixes https://github.com/twbs/bootstrap/issues/13367 
Second color stop value should be percentage instead of decimal value.
 2014-04-26 09:44:14 +05:00
Chris Rebert 05d4932cad Merge pull request #13396 from twbs/carousel-events 
Carousel event properties
 2014-04-25 19:35:38 -07:00
Chris Rebert e114727ae9 Carousel.slide: rename e => slideEvent 2014-04-25 17:50:38 -07:00
Chris Rebert 4bd29bfcff change 'slid' comments per @fat's feedback 2014-04-25 17:48:02 -07:00
Chris Rebert 31f01c1abb Document that @import-ing Bootstrap can break the icon font path 
Addresses part of #13429.
 2014-04-25 12:02:16 -07:00
Chris Rebert d42b1a2d2d fix #13427 2014-04-25 10:43:59 -07:00
Chris Rebert cbb645323d Merge pull request #13414 from twbs/readme-tweak 
README: Authors => Creators
 2014-04-25 09:23:10 -07:00
Chris Rebert e0d1e406d3 Merge pull request #13423 from twbs/fix-13362 
document that show-ing a tooltip/popover on a hidden element doesn't work
 2014-04-24 19:16:09 -07:00
Chris Rebert eab6d3ead8 add IE warning scripts to linter config 2014-04-24 19:14:06 -07:00
Chris Rebert 937ef4824e remove semicolons :'-( 2014-04-24 19:14:06 -07:00
Chris Rebert d4728b8c6d add script to warn folks trying to test old IE using IE's unreliable emulation modes 2014-04-24 19:14:06 -07:00
Chris Rebert 6617d8bcd1 Document .direction & .relatedTarget properties of Carousel events. 
Fixes #13395
 2014-04-24 19:02:47 -07:00
Chris Rebert 4d0a8e31a4 Add direction & relatedTarget properties to slid.bs.carousel event 
Fixes #13393
 2014-04-24 19:02:47 -07:00
Mark Otto 022dc30891 Merge pull request #13176 from twbs/fat-13157 
fixes #13157 - Collapse plugin - issues with transition end event bubbli...
 2014-04-24 18:59:21 -07:00
Mark Otto fe11ac77a2 Merge pull request #13390 from twbs/ie10-viewport-bug 
add IE10 viewport bug workaround to examples
 2014-04-24 18:50:30 -07:00
Mark Otto 0e48cb2f93 Merge pull request #13374 from Jakobovski/fix-issue-#13355 
FIX: #13355. Added .navbar-nav to migration change list.
 2014-04-24 18:41:23 -07:00
Chris Rebert 9c25f5c06e document that show-ing a tooltip/popover on a hidden element doesn't work; fixes #13362 2014-04-24 18:06:59 -07:00
Chris Rebert aca859a13f Merge pull request #13397 from twbs/fix-13394 
document that non-:visible scrollspy targets are ignored
 2014-04-23 14:44:22 -07:00
Chris Rebert 21feb7c58e README: Authors => Creators 2014-04-23 14:08:25 -07:00
Chris Rebert b882a63ff7 the master branch is the relevant one for current build status 2014-04-23 14:01:40 -07:00
Julian Thilo fcdaed4917 Merge pull request #13408 from Quy/master 
Add missing word.
 2014-04-23 16:14:42 +02:00
Quy Ton f6f74b5445 Add missing word. 2014-04-23 07:10:38 -07:00
Collin Donahue-Oponski a9f2b6ce0f #11464 - Fix JS noConflict mode - Refactor all plugins to use an internal reference to the jQuery plugin, because in noConflict mode you can never expect to be defined on the jQuery object 2014-04-21 23:03:33 -06:00
fat b9ae07d84a fixes #13157 - Collapse plugin - issues with transition end event bubbling 2014-04-21 17:35:29 -07:00
Chris Rebert 6161c98238 document that non-:visible scrollspy targets are ignored; fixes #13394 2014-04-21 16:42:22 -07:00
Chris Rebert f66a747615 add unit tests for Carousel slid events 2014-04-21 13:14:53 -07:00
Chris Rebert 9c4afc5772 spelling fixes in Carousel unit tests 2014-04-21 13:08:42 -07:00
XhmikosR 52b6a32145 Use the new respond.js URL. 2014-04-21 19:12:43 +03:00
XhmikosR a549e8c332 Update html5shiv to v3.7.1. 2014-04-21 19:11:23 +03:00