rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-12 00:08:59 +01:00
Code Issues Actions Packages Releases Activity
3,759 Commits 108 Branches 89 Tags 552 MiB
1a88367b72
Commit Graph

3759 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fat
4d195222d4 remake js 2012-12-22 13:48:28 -08:00
fat
a9e661a2b5 read data options in constructor for collapse 2012-12-22 13:48:16 -08:00
fat
fad0fb683b allow multiple trigger types in tooltip and popover + default tooltip to hover & focus 2012-12-22 13:24:37 -08:00
fat
e2434fefbd chnage for #6248 2012-12-21 20:27:53 -08:00
fat-kun
356e47efe1 Merge pull request #6247 from jimwebb/scrollspy-documentation-clarify 
change scrollspy documentation to clarify javascript usage
 2012-12-21 20:23:44 -08:00
fat
f59bf47081 Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2012-12-21 20:20:04 -08:00
fat
ddd59f22c7 update mustace to reflect changes to data-slide-to 2012-12-21 20:19:33 -08:00
fat
24a36df9f6 add support for [data-slide-to] attr on carousel 2012-12-21 19:45:19 -08:00
Mark Otto
7f7039321d Fixes #6189: Add holder.js to carousel example 2012-12-21 19:10:05 -08:00
Mark Otto
a55605ca57 add readme image 2012-12-21 19:04:59 -08:00
Mark Otto
442012f0f5 Smaller image update to readme 2012-12-21 19:02:33 -08:00
Mark Otto
5a2966a2c2 Downsize image 2012-12-21 18:59:51 -08:00
Mark Otto
d23006a6bd Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2012-12-21 18:59:14 -08:00
Mark Otto
ccafc8a010 Explore adding icon to readme 2012-12-21 18:58:59 -08:00
Mark Otto
558bc52432 Add docs readme icon 2012-12-21 18:54:36 -08:00
fat
818c56f078 rewrite makefile to make a bit more "efficient" + rebuild 2012-12-21 17:42:24 -08:00
fat
82a758344d add direction prop to carousel slide event 2012-12-21 17:31:54 -08:00
fat
e194c3e4f4 rebuild 2012-12-21 17:25:31 -08:00
fat
5da30ee5fb Merge branch 'marcelkorpel-master' into 2.3.0-wip 2012-12-21 17:24:45 -08:00
fat
d5345f806c Merge branch 'master' of git://github.com/marcelkorpel/bootstrap into marcelkorpel-master 2012-12-21 17:19:36 -08:00
Mark Otto
dc32555f5b Fixes #6370: Add comment to docs on typeahead and autocomplete 2012-12-21 15:46:10 -08:00
Mark Otto
c11f41ba04 flatten buttons and forms 2012-12-21 00:50:28 -08:00
Mark Otto
704dfb2f1d Merge pull request #6360 from Quy/2.3.0-wip 
Miscellaneous changes to docs
 2012-12-21 00:28:07 -08:00
Mark Otto
7c04d573d0 update docs regarding normalize and clearfix 2012-12-20 21:44:45 -08:00
Quy Ton
a27bf30f0d Miscellaneous changes to docs 2012-12-20 21:38:53 -08:00
Mark Otto
5d4e718446 Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2012-12-20 20:56:00 -08:00
Mark Otto
5508d3d5b3 Remove reset.less now that Normalize 2 is fully integrated 2012-12-20 20:52:43 -08:00
Mark Otto
7b7581d44a Finish migrating to Normalize 2: 
* Port print styles from reset.less to scaffolding.less
* Port responsive image styles from reset.less to scaffolding.less
 2012-12-20 20:52:20 -08:00
Mark Otto
c1e82732cf Update new example name and links 2012-12-20 20:27:07 -08:00
Mark Otto
d6d828154a Merge pull request #6354 from cvrebert/3.0.0-wip 
add comment regarding caveat of #6199 impl per discussion in/of 14844db862
 2012-12-20 15:33:52 -08:00
Mark Otto
a24e47b5b8 Update the examples index: 
* Retina ready screenshots
* Added screenshot and link to justified nav example (previously unlinked marketing-alternate.html)
 2012-12-20 15:08:05 -08:00
Mark Otto
43d130762b Fixes #6352: marketing-alternate broken nav in FF17 2012-12-20 14:40:39 -08:00
Mark Otto
69f6149489 Normalize indentation from 4 to 2 spaces 2012-12-20 14:11:40 -08:00
Mark Otto
1c33b857a6 Convert normalize comments to // style 2012-12-20 14:08:09 -08:00
Mark Otto
be74ad7e0d Merge branch '3.0.0-wip' into bs3-normalize 
Conflicts:
	less/bootstrap.less
 2012-12-20 14:02:54 -08:00
Mark Otto
8eb1549842 remove .hide specificity override from grid classes 2012-12-20 13:57:14 -08:00
Mark Otto
6bd5dc7d9f Add important flag to .show/.hide utility classes; remove .hide requirement from modals 2012-12-20 13:53:38 -08:00
Mark Otto
a5e04c0799 Merge branch '2.3.0-wip' into 3.0.0-wip 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/templates/pages/base-css.mustache
	less/dropdowns.less
	less/forms.less
 2012-12-20 13:47:36 -08:00
Mark Otto
5e4f663e69 Undo important on hide/show utilties; punt to 3.0 2012-12-20 13:46:07 -08:00
Mark Otto
00ff34b9e6 fix up code snippet 2012-12-20 13:41:45 -08:00
Mark Otto
b6575cc72e fix up code snippet 2012-12-20 13:41:08 -08:00
Chris Rebert
30f72e69e3 add comment regarding caveat of #6199 impl per discussion in/of 14844db862 2012-12-20 11:00:47 -08:00
Yohn
a6705246d0 Update js/tests/unit/bootstrap-tooltip.js 2012-12-20 04:36:57 -05:00
Yohn
e21b6459ad fixes tooltip('toggle') 2012-12-20 04:34:28 -05:00
Mark Otto
30d8eb3ed5 Merge branch 'blakeembrey-dropdown-selectors' into 2.3.0-wip 2012-12-20 01:34:19 -08:00
Mark Otto
0a1434b23b Merge branch 'dropdown-selectors' of https://github.com/blakeembrey/bootstrap into blakeembrey-dropdown-selectors 2012-12-20 01:34:10 -08:00
Mark Otto
3f493f0d0d Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip 2012-12-20 01:30:43 -08:00
Mark Otto
f706acb11c Fixes #6339: Use important flag on .hide and .show utility classes 2012-12-20 01:30:32 -08:00
Mark Otto
cdb25e11ef lighter buttons closer to todays versions 2012-12-20 01:21:09 -08:00
fat
5abe33f5d8 reset carousel in the case that it is reinstantiated twice 2012-12-20 01:13:03 -08:00