10741 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mark Otto	bcf7dd38b5	Merge pull request #15604 from twbs/ship_v3.3.2 ... Ship v3.3.2	2015-01-19 09:03:09 -08:00
Mark Otto	fa47de717e	grunt	2015-01-19 08:33:33 -08:00
Mark Otto	c683e7dea7	bump versions	2015-01-19 08:32:13 -08:00
Mark Otto	ce29def7a6	grunt	2015-01-19 08:27:15 -08:00
Mark Otto	4ed95f5fa2	fixes #15497: increase decimals on line-height-large from 1.33 to 1.3333333 to fix button sizing in Win 8.1 Chrome	2015-01-18 15:03:14 -08:00
Mark Otto	06c00d5591	Merge branch 'master' of github.com:twbs/bootstrap	2015-01-18 13:39:50 -08:00
Mark Otto	db8eeaa17a	Fixes #15142: Add position: relative; to .dropup for proper placement of menus	2015-01-18 13:39:40 -08:00
Chris Rebert	161eac4fd7	rm dummy href from dismiss-on-next-click popover example; fixes #15277	2015-01-18 12:51:47 -08:00
Mark Otto	1bf1ba7103	Merge branch 'master' into pr/15278 ... Conflicts: dist/css/bootstrap.css.map dist/css/bootstrap.min.css docs/assets/js/customize.min.js docs/assets/js/raw-files.min.js docs/dist/css/bootstrap.css.map docs/dist/css/bootstrap.min.css	2015-01-18 12:24:29 -08:00
Mark Otto	22b79dae3c	grunt	2015-01-18 12:22:43 -08:00
Mark Otto	bf69fbdf1f	Merge pull request #15594 from twbs/fix_15493 ... Fixes #15493: inherit color on small/.small in .panel-title	2015-01-17 21:51:03 -08:00
Mark Otto	de491e914a	fixes #15493: inherit color on small/.small in .panel-title	2015-01-17 21:35:55 -08:00
Bootstrap's Grunt bot	c020669b07	automatic grunt dist	2015-01-18 05:11:01 +00:00
Mark Otto	e39b5b5b25	Merge pull request #15551 from lee101/master ... Fix table-striped to work with bootstraps tooltips on rows	2015-01-17 21:07:13 -08:00
Chris Rebert	8a1efe91df	#15576 errata: #15298 also reproduces on Linux ... See https://github.com/twbs/bootstrap/issues/15298#issuecomment-69216754	2015-01-16 15:16:52 -08:00
Bootstrap's Grunt bot	46710efba4	automatic grunt dist	2015-01-16 21:41:05 +00:00
Mark Otto	b1daf3803e	Merge pull request #15589 from KevinJannis/patch-3 ... Added blank line between selectors in badges	2015-01-16 13:31:52 -08:00
Kevin Jannis	be8eafd76b	Added blank line between selectors in badges	2015-01-16 21:44:27 +01:00
Bootstrap's Grunt bot	2a1adb5f94	automatic grunt dist	2015-01-16 19:11:06 +00:00
Chris Rebert	85a6595a71	.form-control: add note about <select> & border-radius ... Refs #15340	2015-01-16 11:02:51 -08:00
Bootstrap's Grunt bot	b7c332f183	automatic grunt dist	2015-01-16 16:41:05 +00:00
XhmikosR	f6a96e7824	Merge pull request #15583 from twbs/deps ... Update devDependencies.	2015-01-16 18:38:52 +02:00
Chris Rebert	2eaa7e0e1c	Merge pull request #15581 from twbs/inline-form-with-visible-labels ... Add example of using .form-inline with visible <label>s	2015-01-16 08:20:41 -08:00
XhmikosR	0481ce973f	Fix bogus JSCS warning.	2015-01-16 17:50:05 +02:00
XhmikosR	0e79fe1a9f	Update JSCS config for the new version.	2015-01-16 17:49:58 +02:00
XhmikosR	f5a5621af2	Update devDependencies.	2015-01-16 17:49:58 +02:00
Mark Otto	f9ef6d2471	Merge pull request #15585 from dancourse/patch-1 ... 12 items of *fewer* as it's a countable item	2015-01-16 03:03:28 -08:00
Bootstrap's Grunt bot	e0da137158	automatic grunt dist	2015-01-16 10:51:20 +00:00
Mark Otto	02921b4d75	Merge pull request #15584 from KevinJannis/patch-2 ... Added blank lines between selectors for alerts	2015-01-16 02:41:11 -08:00
Dan Course	21f7254e10	12 items of *fewer* as it's a countable item ... http://www.oxforddictionaries.com/words/less-or-fewer	2015-01-16 10:36:46 +00:00
Kevin Jannis	1c131fb95d	Added blank lines between selectors for alerts	2015-01-16 10:06:35 +01:00
Chris Rebert	ca2c1e1576	custom widths not always required for inline form fields ... [skip sauce]	2015-01-15 17:52:02 -08:00
Chris Rebert	2fa70f37da	Add example of using .form-inline with visible <label>s ... Refs #15410 [skip sauce]	2015-01-15 17:47:22 -08:00
Chris Rebert	cd31bef5ce	Merge pull request #15580 from twbs/tooltip-async-docs ... Document that tooltip+popover show+hide methods are async	2015-01-15 17:22:14 -08:00
Chris Rebert	63f3136450	Document that tooltip+popover show+hide methods are async; fixes #15500 ... [skip sauce]	2015-01-15 17:18:00 -08:00
Mark Otto	dbffb0b47f	Fixes #15536, #15559: Add .form-group sizing support to .form-control-static	2015-01-15 16:03:13 -08:00
Mark Otto	ec2ccf4219	Merge branch 'master' of github.com:twbs/bootstrap	2015-01-15 15:51:12 -08:00
Mark Otto	d4f1331e51	grunt	2015-01-15 15:51:02 -08:00
Chris Rebert	499f71d27f	Merge pull request #15498 from twbs/fix-15332 ... Add examples of using feedback icons with .input-group	2015-01-15 15:49:46 -08:00
Bootstrap's Grunt bot	149dac0a58	automatic grunt dist	2015-01-15 23:41:25 +00:00
Mark Otto	6bf8636a91	Merge pull request #15567 from twbs/fix-15565 ... Use @link-hover-decoration for .btn-link too; fixes #15565	2015-01-15 15:36:19 -08:00
Mark Otto	619843472a	Merge pull request #15482 from liias/patch-1 ... Add .disabled class styling for .btn-styles in theme	2015-01-15 15:34:34 -08:00
Bootstrap's Grunt bot	f31f6b9b25	automatic grunt dist	2015-01-15 23:31:25 +00:00
Mark Otto	d8acd5f2a6	Merge pull request #15577 from KevinJannis/patch-1 ... Added blank line between selectors in jumbotron	2015-01-15 15:28:38 -08:00
Chris Rebert	86d368eb6d	Merge pull request #15578 from twbs/licensing-contributing ... Clarify in CONTRIBUTING docs that CC-BY 3.0 License applies to Bootstrap's docs	2015-01-15 15:01:40 -08:00
Chris Rebert	6ccf46a56b	Merge pull request #15576 from twbs/chrome-bug-449180 ... Add Wall of Browser Bugs entry for #15298	2015-01-15 14:07:37 -08:00
Chris Rebert	16089d92de	Clarify in CONTRIBUTING docs that CC-BY 3.0 License applies to Bootstrap's docs ... [ci skip]	2015-01-15 11:25:05 -08:00
Kevin Jannis	bb479b8f47	Added blank line between selectors in jumbotron	2015-01-15 20:17:02 +01:00
Chris Rebert	7164d84953	Add Wall of Browser Bugs entry for #15298 ... [skip sauce]	2015-01-15 11:10:02 -08:00
Chris Rebert	f1cb639c34	Docs: add missing "http://"	2015-01-15 10:46:58 -08:00