clones/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-09-25 04:27:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,934 Commits 116 Branches 89 Tags 628 MiB
a34470ac5d
Commit Graph

4934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Otto
a34470ac5d Merge branch 'bs3_old_docs_callout' into bs3_rc1 2013-07-18 13:07:49 -07:00
Mark Otto
9425382376 Merge branch 'bs3_add_ads' into bs3_rc1 2013-07-18 13:07:17 -07:00
Mark Otto
cc63096118 clarify IE support and rearrange getting started docs a bit 2013-07-18 13:05:53 -07:00
Mark Otto
b372661a17 fixes #8206: Use navbar height var to compute vertical padding on navbar-brand 2013-07-18 02:23:38 -07:00
Mark Otto
64efa86036 for some reason iOS is shitting the bed on the .navbar-toggle unless it gets fixed dimensions 2013-07-18 02:19:13 -07:00
Mark Otto
3ed05f60fd Quick pass at new touch and favicons 2013-07-18 02:05:41 -07:00
Mark Otto
898ee8f13b twerk comment 2013-07-18 01:46:31 -07:00
Mark Otto
6e04925328 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-07-18 01:25:28 -07:00
Mark Otto
e72b524d41 Fixes #8374: ensure navbar is always at least 50px 2013-07-18 01:25:08 -07:00
fat
6ec8a1e44f 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-18 01:08:19 -07:00
fat
4b40ee692d cleaner way of preventing double click events + clean up tests for jshint 2013-07-18 01:07:11 -07:00
Mark Otto
181b276774 Fixes #8397: better navbar padding with grid gutter stuff 2013-07-18 01:04:54 -07:00
fat
37e899d766 get button js working with actual form elements p cooll 2013-07-18 00:59:31 -07:00
Mark Otto
d87431a29e spacing and local var rename 2013-07-18 00:56:36 -07:00
Mark Otto
0c45458fcc Merge branch 'patch-1' of https://github.com/bassjobsen/bootstrap into bassjobsen-patch-1 2013-07-18 00:55:36 -07:00
Mark Otto
f757cf4cf3 run make on mixin changes from #8380 2013-07-18 00:50:57 -07:00
Mark Otto
02bddac091 Merge pull request #8380 from joeybaker/patch-1 
Remove unneeded prefixes from some mixins
 2013-07-18 00:50:15 -07:00
Mark Otto
8dc7807dcd change characters 2013-07-18 00:48:02 -07:00
Mark Otto
1363ffa473 Merge branch '3.0.0-wip' of https://github.com/mauricew/bootstrap into mauricew-3.0.0-wip 2013-07-18 00:43:48 -07:00
Mark Otto
e7bc9e1c3d Vurrriables and shit 2013-07-18 00:23:35 -07:00
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
Mark Otto
d7d1c2a767 add ads to v3 docs 2013-07-17 23:22:28 -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
3ad0cf9e94 add callouts for bootstrap 2.3.2 docs and 3.0 rc1 post 2013-07-17 22:58:49 -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