863 Commits

Author	SHA1	Message	Date
Mark Otto	6e9bbe6232	Nested columns docs tweaks	2012-12-09 22:08:11 -08:00
Mark Otto	6649918c7f	Merge conflicts	2012-12-08 22:45:39 -08:00
Mark Otto	b5ceca14db	Fix docs typos	2012-12-08 18:46:34 -08:00
Mark Otto	bc0b94a3fd	Merge branch 'master' into 3.0.0-wip ... Conflicts: docs/assets/css/bootstrap.css docs/assets/js/bootstrap.js docs/css.html docs/templates/pages/base-css.mustache docs/templates/pages/components.mustache docs/templates/pages/javascript.mustache less/breadcrumbs.less less/tables.less less/tests/css-tests.html	2012-12-08 17:40:42 -08:00
Quy Ton	3bd9a26c01	Apply code tag to data attribute on javascript page	2012-12-08 12:06:46 -08:00
fat	a7eb9c294a	add noConflict functionality to all bootstrap plugins	2012-12-07 17:06:01 -05:00
Mark Otto	be45a821bb	Fixes #6148: Icons in mini buttons properly aligned	2012-12-07 09:51:01 -08:00
Quy Ton	81679981c5	Escape ×	2012-12-05 15:28:14 -08:00
Mark Otto	be5f31480b	Nuke all i18n tags from .mustache templates	2012-12-05 11:09:02 -08:00
Mark Otto	33e14fe5bf	Merge branch '2.2.2-wip' into 3.0.0-wip ... Conflicts: README.md docs/assets/css/bootstrap.css docs/assets/js/bootstrap.js docs/assets/js/bootstrap.min.js docs/examples/fluid.html docs/scaffolding.html less/breadcrumbs.less less/popovers.less less/responsive.less	2012-12-05 11:05:10 -08:00
Mark Otto	b3019d7aab	add gallery page, fill with a few screenshots to start	2012-12-04 20:30:21 -08:00
Mark Otto	12916b06aa	Fix up display of dropdown submenu examples on responsive views	2012-12-04 18:25:16 -08:00
Mark Otto	e31c7fb8a5	correct link on index page to grid system	2012-12-04 09:49:18 -08:00
Mark Otto	dd11d0a3fa	move around social buttons	2012-12-01 13:47:07 -08:00
Mark Otto	98b0d475ae	version bump to 3.0	2012-11-30 22:30:50 -08:00
Mark Otto	0947105656	section title change	2012-11-30 17:43:20 -08:00
Mark Otto	51b4de8eec	docs content changed	2012-11-30 16:43:31 -08:00
Mark Otto	6961b284b6	remove responsive image from css docs page	2012-11-30 16:42:48 -08:00
Mark Otto	10c14e8955	first pass at nuking scaffolding	2012-11-30 16:29:30 -08:00
Mark Otto	0fabca01db	Remove more fluid grid stuff ... * No more fluid layout * No fluid grid overrides for tables.less * No more fluid example page	2012-11-30 16:18:40 -08:00
Mark Otto	adc2c779a0	grid vars updated	2012-11-30 15:43:07 -08:00
Mark Otto	e34b3730b7	form state vars	2012-11-30 15:38:31 -08:00
Mark Otto	0a93bc143d	hero unit and pagination vars	2012-11-30 15:36:16 -08:00
Mark Otto	62a2220035	navbar vars	2012-11-30 15:33:56 -08:00
Mark Otto	a09cea44ae	more vars changed	2012-11-30 15:27:13 -08:00
Mark Otto	01421ecd62	remove sprites vars, change zindex vars	2012-11-30 15:23:13 -08:00
Mark Otto	12a00f62a9	remove color variables, swap others were appropro	2012-11-30 15:18:49 -08:00
Mark Otto	0ef347706c	more vars changing	2012-11-30 15:09:57 -08:00
Mark Otto	9239bfbc7b	more vars changed, remove @white var	2012-11-30 15:05:23 -08:00
Mark Otto	b0e2b5813d	more consistent variable naming patterns	2012-11-30 14:45:25 -08:00
Mark Otto	7a3d15eb21	Part 1 of unCamelCasing variables	2012-11-30 14:37:24 -08:00
Mark Otto	fe8061b84e	more tests for form styles; includes lightening help text	2012-11-30 13:35:20 -08:00
Mark Otto	7313702cf3	Inputs now 100% width by default ... * Includes text inputs, selects, and textareas * Updated docs to include .span* sizes wherever possible * Commented out responsive 1200px inputs grid * Still some derp to be done to improve more, but this is a decent first stab	2012-11-30 00:53:07 -08:00
Mark Otto	fca35c0dba	Merge branch '2.2.2-wip' into exploratory ... Conflicts: docs/assets/css/bootstrap.css docs/components.html docs/templates/pages/components.mustache less/alerts.less less/button-groups.less less/buttons.less less/tests/css-tests.html	2012-11-30 00:13:30 -08:00
Mark Otto	acc037de15	add holder and replace placehold.it	2012-11-29 20:59:14 -08:00
Mark Otto	fda5bb135e	Fixes #5963: Add large button example to icons, fix vertical alignment in large buttons	2012-11-28 00:46:09 -08:00
Mark Otto	7e56e2265d	Merge branch '2.2.2-wip' into exploratory ... Conflicts: less/button-groups.less	2012-11-22 22:04:21 -08:00
Mark Otto	e0d0190803	fix image sizes on homepage	2012-11-22 12:26:54 -08:00
Mark Otto	5d1b4206b1	Fixes #5986: single toggle button html examples	2012-11-22 12:06:36 -08:00
Mark Otto	5702e1be6e	widths on github buttons	2012-11-16 01:13:52 -08:00
Mark Otto	fa1c130552	Change important badges/labels to danger	2012-11-15 09:17:11 -08:00
Mark Otto	a43bf14ea5	Merge branch '2.2.2-wip' into exploratory	2012-11-15 09:15:37 -08:00
Mark Otto	1700e48e7f	Fixes #5879: Manual update of Normalize credit	2012-11-14 15:20:38 -08:00
Mark Otto	1a4ce9ba18	Merge branch '2.2.2-wip' into exploratory	2012-11-09 10:09:04 -08:00
Mark Otto	ddf5ceccce	typo fix	2012-11-08 23:49:04 -08:00
Mark Otto	cf7d7a7b5d	remove ; from customizer	2012-11-08 23:46:40 -08:00
Mark Otto	57eed7867b	merge in latest	2012-11-05 19:00:34 -08:00
Mark Otto	9d1eefa4fb	Merge branch '2.2.2-wip' of github.com:twitter/bootstrap into 2.2.2-wip	2012-11-05 18:44:22 -08:00
Mark Otto	b82bc97023	update docs and all classes	2012-11-05 18:38:59 -08:00
Mark Otto	c0bbe1692c	Merge branch '2.2.2-wip' into exploratory ... Conflicts: docs/assets/css/bootstrap.css less/navbar.less less/variables.less	2012-11-05 18:27:25 -08:00