17 Commits

Author	SHA1	Message	Date
Mark Otto	265fda7903	Merge branch 'master' into restore_grid_mixins ... Conflicts: dist/css/bootstrap.min.css	2013-10-13 18:32:34 -07:00
Mark Otto	ef2e0c99f4	remove screen from all docs media queries	2013-10-13 15:24:39 -07:00
Mark Otto	c814ad1833	Combine separate efforts for grid mixins into one, cleanup and reorganize	2013-10-11 22:00:37 -07:00
Mark Otto	84413f6e29	Merge pull request #11013 from twbs/fix-10989 ... Use CDNs for more example JavaScripts	2013-10-09 20:05:21 -07:00
Chris Rebert	ef1fc34e61	use data-ride="carousel" in the docs & examples; fixes #11005	2013-10-09 19:29:27 -07:00
Chris Rebert	4da37222cf	re-remove execute permissions; apparent upstream bug	2013-10-09 18:58:50 -07:00
Chris Rebert	1a0df1fbd0	upgrade holder.js to v2.1	2013-10-09 18:52:57 -07:00
herom	aad70834fc	Fixes #9925: convert font data to base64, fixing 0xefbfbd (Unicode Replacement Character) chars in customizer fonts. ... Merges #9982	2013-10-09 18:03:04 -07:00
Stuart P. Bentley	58a47b6bfd	Customizer: include config.json in bootstrap.zip ... merges #10633; fixes part of #9951	2013-10-09 17:35:26 -07:00
Chris Rebert	5e652332d1	use CDN for jQuery instead of vendoring it; fixes part of #10989	2013-10-09 16:36:15 -07:00
Chris Rebert	d72768a16a	use CDN for html5shiv instead of vendoring it; fixes part of #10989	2013-10-09 16:36:02 -07:00
Chris Rebert	d820c6d225	there's no reason for holder.js to be executable	2013-10-09 15:34:39 -07:00
Mark Otto	969cb04acb	Fixes #10126: Update responsive test cases to properly highlight hidden class examples	2013-10-07 15:00:46 -05:00
Mark Otto	704635818f	run grunt	2013-10-07 14:31:41 -05:00
Mark Otto	a8f21b5ae9	merge in new ads	2013-10-05 11:44:41 -05:00
Mark Otto	b352061d1d	run grunt	2013-10-01 11:37:47 -05:00
Chris Rebert	8aa5181126	move /assets/ to /docs-assets/ ; fixes #10715	2013-09-23 13:02:26 -07:00