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

4909 Commits

Author SHA1 Message Date
Mark Otto 79a10feb7a Fixes #8452: adds `.active` to table classes 2013-07-18 00:10:22 -07:00
Mark Otto 87adbf7aa4 make on collapse changes 2013-07-17 23:56:38 -07:00
Mark Otto e6906040de Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-17 23:56:27 -07:00
Mark Otto e5bfd8c00b Fixes #8441: remove `@font-size-mini` 2013-07-17 23:56:20 -07:00
Mark Otto bc79f8a399 Bump tooltips to use `@font-size-small` (11px to 12px) 2013-07-17 23:55:58 -07:00
Mark Otto e57758cbb4 Drop `.nav-header` for `.dropdown-header` 
* Since we no longer have `.nav-list`, I've nuked the `.nav-header`
* However, dropdowns can still have section headings, so I've kept that
around with the addition of `.dropdown-header`
* Restyled it a smidge as well
 2013-07-17 23:54:09 -07:00
fat 2a4a0f70ef Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-17 23:52:55 -07:00
fat b13eecaeec fixes #7880 2013-07-17 23:52:29 -07:00
Mark Otto 3604b86806 fixes #8477: use var for rounded image border-radius 2013-07-17 23:41:05 -07:00
Mark Otto 4d73aa60f9 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 
Conflicts:
	docs/assets/js/bootstrap.min.js
 2013-07-17 23:34:31 -07:00
Mark Otto d3a139622e fixes #8491: add vars for table padding 2013-07-17 23:34:04 -07:00
Mark Otto ba0c6cd57c make on prev js changes 2013-07-17 23:33:34 -07:00
fat 59f847e8ee fixes #7777 2013-07-17 23:30:05 -07:00
fat 8cf04911db fixes #7776 2013-07-17 23:25:26 -07:00
fat 451acb42db fixes #7755 2013-07-17 23:15:50 -07:00
fat 5cb8bfd7da Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-17 23:02:15 -07:00
fat 57768d7ea9 fix #7660 2013-07-17 23:01:33 -07:00
Mark Otto 9efba239b6 Merge pull request #8511 from twitter/bs3_remove_examples 
BS3: Move examples to @twbs/bootstrap-examples
 2013-07-17 22:17:30 -07:00
fat 6387d8d5cc versioning perhaps for jquery i don't even know man 2013-07-17 21:38:52 -07:00
fat 18d23b892c rebuild js + fixes #7583 2013-07-17 21:35:28 -07:00
fat 2cccc0889f make sure triggering element is visible before focusing #7521 2013-07-17 21:30:38 -07:00
fat a7a9a14379 fix @muan's unit test ;) 2013-07-17 21:17:39 -07:00
fat 102df4ff33 Merge branch '3.0.0-wip' of git://github.com/muan/bootstrap into muan-3.0.0-wip 
Conflicts:
	docs/assets/js/bootstrap.min.js
 2013-07-17 21:14:02 -07:00
fat bf38241f0d remove duh ugly 2013-07-17 21:10:33 -07:00
fat eb3333a612 fix #7000 2013-07-17 21:08:50 -07:00
Mark Otto 0df791d1ac fix link to grid example 2013-07-17 21:04:27 -07:00
Mark Otto 6be1f9d00f remove colophon include because there's only one layout using it now 2013-07-17 21:02:50 -07:00
Mark Otto 97cdb4215a link order 2013-07-17 20:44:55 -07:00
Mark Otto f0d0718322 Merge branch '3.0.0-wip' into bs3_remove_examples 
Conflicts:
	docs/_includes/nav-getting-started.html
	docs/examples/navbar-fixed-top.html
	docs/examples/navbar-static-top.html
	docs/examples/navbar.html
	docs/getting-started.html
 2013-07-17 20:44:27 -07:00
fat 0f64c21049 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-17 20:30:09 -07:00
fat 392bf0c9c9 fixes #6691 2013-07-17 20:29:41 -07:00
Mark Otto bfebf0e490 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-17 20:18:03 -07:00
Mark Otto 7cc34ea547 fix broken docs callouts 2013-07-17 20:17:56 -07:00
fat 5396c40877 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-17 19:33:49 -07:00
Mark Otto 542e03ae3a Merge branch '3.0.0-docs-calloutfam' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-docs-calloutfam 
Conflicts:
	docs/components.html
	docs/css.html
	docs/customize.html
 2013-07-17 19:33:30 -07:00
fat f97dd5af49 rebuild doe 2013-07-17 19:33:21 -07:00
fat 13cad5061d maybe fix this old ass issue #5973 2013-07-17 19:28:43 -07:00
Mark Otto 06d47b0082 Fixes #8360: Add mention of IE compatibility mode to docs 2013-07-17 19:26:37 -07:00
Mark Otto f4b9938d8c Move license FAQs to the docs, add link to side nav 2013-07-17 19:20:08 -07:00
Mark Otto aa49c919c6 Fixes #8356: Move browser compatibility from wiki into real docs 2013-07-17 19:08:08 -07:00
Mark Otto e7be60fd4d Update readme to point previous releases to GitHub project releases (fixes #8508) 2013-07-17 17:21:11 -07:00
Mark Otto 8a79590d05 Remove changelog in favor of GitHub releases 2013-07-17 17:20:47 -07:00
Mark Otto cb9cc972ed Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-16 13:36:02 -07:00
Mark Otto 5967ef64a3 remove margin from left side of navs since it's no longer being set 2013-07-16 11:49:04 -07:00
Mark Otto 7dbcce30c1 Merge pull request #8498 from cvrebert/patch-1 
Add missing backtick in comment
 2013-07-16 11:27:33 -07:00
Mark Otto 522004e67a remove webkit-overflow-scrolling from modal for now /cc #8495 2013-07-16 11:26:48 -07:00
Chris Rebert 76063ea739 Add missing backtick in comment 2013-07-16 10:49:59 -07:00
Mark Otto ced641b107 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-15 12:00:10 -07:00
Mark Otto 6aec8f36fc fix broken scrollspy example 2013-07-15 12:00:01 -07:00
Mark Otto fb75ffca55 Merge pull request #8478 from juthilo/3.0.0-customizer 
Update customizer
 2013-07-14 16:56:56 -07:00