6994 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mark Otto	8ac1495c63	redo the glyphicons icons list to make icons not blurry on edges /cc @jankovarik	2013-10-16 10:43:56 -07:00
Mark Otto	481791411c	Merge branch 'master' of github.com:twbs/bootstrap	2013-10-15 14:11:29 -07:00
Mark Otto	acd4a0a140	update jumbotron docs; fixes #11109	2013-10-15 14:11:21 -07:00
Mark Otto	723f85fc0d	Merge pull request #11105 from twbs/license-note ... Add notes about dual-licensing contributions before switching to MIT in v3.1	2013-10-15 13:12:46 -07:00
Rhodry Korb	dd5c8a53ee	Add Note About Changing to MIT	2013-10-15 13:06:27 -07:00
Mark Otto	2380b6be99	Merge pull request #11102 from ZDroid/less-fix ... Ditch `&`, as `+ ...` is enought	2013-10-15 11:19:24 -07:00
Zlatan Vasović	0423635614	Ditch &, as + ... is enought	2013-10-15 17:35:11 +02:00
Mark Otto	dc495fe9d9	nuke commented out docs css	2013-10-14 22:08:23 -07:00
Chris Rebert	b05a287eb6	run grunt	2013-10-14 20:47:56 -07:00
Chris Rebert	a28d9539c7	fix #10952	2013-10-14 20:45:43 -07:00
Mark Otto	67829c6571	Merge pull request #11094 from twbs/address-10049 ... Recommend only <div> (not <span>) for putting tooltips on disabled elements	2013-10-14 20:21:17 -07:00
Chris Rebert	27e2c56792	In docs, recommend only <div> (not <span>) for putting tooltips on disabled elements ... Per issue comments, `display: inline` elements like <span> don't work for this. Resolves #10049	2013-10-14 20:18:12 -07:00
Mark Otto	a44bd01628	Merge pull request #10533 from topsitemakers/master ... adding required attribute for example signin form	2013-10-14 19:56:33 -07:00
Chris Rebert	f11aa31023	Merge pull request #10519 from zba/master ... changed attr('data-target') to data('target');	2013-10-14 19:14:58 -07:00
Chris Rebert	b5d7a51bff	Merge pull request #10779 from ssorallen/customizer-bootstrap-less-order ... Use bootstrap.less file order in Customizer	2013-10-14 18:56:10 -07:00
Chris Rebert	4e1808930a	add IDs to frequently-referenced parts of the docs	2013-10-14 16:24:58 -07:00
Mark Otto	036712ed90	Merge pull request #11091 from yokomizor/extended_thumbnail_hover_state ... Extended hover state of linked versions of .thumbnail	2013-10-14 16:14:28 -07:00
Rogério Yokomizo	e20b02ad0b	extended hover state of linked versions of .thumbnail	2013-10-14 20:10:49 -03:00
Mark Otto	fa64846acf	Merge branch 'master' of github.com:twbs/bootstrap ... Conflicts: dist/css/bootstrap.min.css	2013-10-14 13:45:57 -07:00
Mark Otto	7100711577	unnest the list-group-item link variation for #11085 and #11088	2013-10-14 13:45:32 -07:00
Mark Otto	3fb1381a30	Merge pull request #11084 from ZDroid/variable_way ... Unhardcode .table-responsive bottom margin	2013-10-14 11:33:27 -07:00
Mark Otto	256f3a99c3	Merge pull request #11086 from twbs/table-responsive-breakpoint ... fix .table-responsive media query; refs #11067	2013-10-14 11:32:46 -07:00
Mark Otto	50dd5d5088	fix about page html validation and run grunt	2013-10-14 11:30:06 -07:00
Mark Otto	6307d2c94d	Merge branch 'master' of github.com:twbs/bootstrap ... Conflicts: getting-started.html	2013-10-14 11:06:25 -07:00
Mark Otto	1f5c754d57	remove dupe content	2013-10-14 11:05:49 -07:00
Chris Rebert	5c64ef393c	fix .table-responsive media query; refs #11067	2013-10-14 10:58:12 -07:00
Zlatan Vasović	4ce1b08c32	Unhardcode .table-responsive bottom margin	2013-10-14 18:22:31 +02:00
Mark Otto	70278a4e4f	Merge pull request #11078 from twbs/issue-11019-note ... add note to docs about Respond.js & file:// ; fixes part of #11019	2013-10-14 09:09:02 -07:00
Mark Otto	efc741b151	Merge pull request #11082 from ZDroid/nuke_zeros ... Nuke trailing zeros	2013-10-14 09:08:28 -07:00
Zlatan Vasović	b3c04c95d3	Nuke trailing zeros	2013-10-14 15:06:58 +02:00
Chris Rebert	3431f32349	Merge pull request #11079 from wangsai/mother-language ... change english link text to chinese	2013-10-14 01:21:26 -07:00
wangsai	ee8ba8b540	Add description. And complete russian and spanish languages	2013-10-14 16:04:48 +08:00
Chris Rebert	3c69f59fe5	make Getting Started page's HTML more valid	2013-10-14 00:40:51 -07:00
Chris Rebert	df46b1b46e	make About page's HTML more valid	2013-10-14 00:38:19 -07:00
Chris Rebert	ceb7694ee3	add note to docs about Respond.js & file:// ; fixes part of #11019	2013-10-14 00:10:30 -07:00
wangsai	67c48f7703	change english link text to chinese	2013-10-14 14:52:53 +08:00
Chris Rebert	9416cd3738	update to latest jszip ... commit 04fc93045334dc1b679aba5c2dce206da777a85c 2013-10-12T12:39:56-07:00	2013-10-13 23:37:16 -07:00
Chris Rebert	3abe86b7ed	Merge pull request #11076 from twbs/respond-js-cdn ... use CDN for respond.js	2013-10-13 23:26:28 -07:00
Mark Otto	111b9bd194	Merge pull request #11077 from twbs/avoid-docs-assets-in-example ... avoid referencing /docs-assets/ in Getting Started docs example; use CDN URL for respond.js	2013-10-13 23:25:23 -07:00
Mark Otto	e521be0f22	Merge pull request #11075 from twbs/respond-js-cross-domain-note ... fix #11003	2013-10-13 23:24:35 -07:00
Chris Rebert	8450aa7dbf	avoid referencing /docs-assets/ in Getting Started docs example; use CDN URL for respond.js	2013-10-13 23:23:04 -07:00
Mark Otto	202f395b2f	Merge branch 'docs_welcome'	2013-10-13 23:19:17 -07:00
Mark Otto	25607c2683	add translations, copy edit a few things, and fix alignment of ads	2013-10-13 23:19:11 -07:00
Chris Rebert	c5da0597bc	use CDN for respond.js	2013-10-13 23:18:30 -07:00
Chris Rebert	f0f1b8319d	fix #11003	2013-10-13 22:55:50 -07:00
Mark Otto	810a852f4a	Merge pull request #11046 from ZDroid/patch-3 ... Nicer docs license name	2013-10-13 20:26:36 -07:00
Mark Otto	9da73d79c2	run grunt	2013-10-13 20:12:07 -07:00
Mark Otto	e7379f75bd	no trailing decimal place	2013-10-13 20:04:28 -07:00
Mark Otto	fbc67a395f	Merge branch 'master' of github.com:twbs/bootstrap	2013-10-13 20:04:00 -07:00
Mark Otto	36b4639b0d	Merge pull request #10949 from StevenBlack/jumbotron.fontsize ... Jumbotron: remove the hard-coded font-size from jumbotron.less and moved...	2013-10-13 20:03:02 -07:00