185 Commits

Author	SHA1	Message	Date
Mark Otto	b7c9a639d6	Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip	2011-09-11 20:17:49 -07:00
Mark Otto	bd3448cf78	make input prepend styles look a bit better	2011-09-11 20:17:34 -07:00
Jacob Thornton	e255b4f51d	Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip	2011-09-11 20:09:20 -07:00
Jacob Thornton	173be3f1e8	change hella js... broke all the tests. i <3 wip	2011-09-11 20:08:43 -07:00
Mark Otto	2674210ff0	move the .brand from the parent to the a tag in the topbar; fix the moving text in IE7	2011-09-11 20:00:45 -07:00
Mark Otto	6bc867ed5c	change template diagrams to be .media-grid	2011-09-11 19:53:48 -07:00
Mark Otto	53812bc2d8	remove qualifying tags in .span selectors for built in grid so that we can use .span-n classes in form styles	2011-09-11 18:44:25 -07:00
Mark Otto	f3f60b21a6	oops, double commit last time; apply fixes to make select elements line up in IE7 with their labels, but no height fix	2011-09-11 18:09:01 -07:00
Mark Otto	3ad034ea96	fix legends in ie7	2011-09-11 17:36:15 -07:00
Mark Otto	1ae603fda0	make the less compile docs text now have widows, fix broken table markup	2011-09-10 23:05:30 -07:00
Mark Otto	62edafa1a4	Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip	2011-09-10 22:55:59 -07:00
Mark Otto	0c656e29fc	updated styles for the media grids	2011-09-10 22:50:59 -07:00
Jacob Thornton	b781f6ca59	Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip	2011-09-10 22:49:05 -07:00
Mark Otto	d0f7637a7d	adding more media sizes	2011-09-10 22:47:38 -07:00
Jacob Thornton	68865002af	Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip	2011-09-10 22:44:22 -07:00
Jacob Thornton	2655117747	add some notes on installing from command line and from makefile	2011-09-10 22:43:52 -07:00
Mark Otto	3755ee158f	Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip	2011-09-10 22:31:55 -07:00
Mark Otto	40693f2618	adding media grid styles	2011-09-10 22:31:43 -07:00
Jacob Thornton	c40e0de3c1	Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip ... Conflicts: docs/index.html	2011-09-10 22:17:37 -07:00
Jacob Thornton	64176caa97	add bootstrap-scrollspy	2011-09-10 22:14:57 -07:00
Mark Otto	536fe2c743	add footer to js docs	2011-09-10 21:54:11 -07:00
Mark Otto	8130b113bb	add stubbed out table for how to compile less	2011-09-10 21:50:12 -07:00
Mark Otto	3407ed948d	resolved conflict	2011-09-10 21:06:09 -07:00
Mark Otto	00b7dff359	overhaul docs CSS since it was scalable, converted docs mastheads and footers to classes and HTML5 elements, add masthead to js docs page but make it slate so it looks cool and stands out	2011-09-10 21:05:23 -07:00
Jacob Thornton	a71d5d8e99	add the dhg flavor back	2011-09-10 19:01:16 -07:00
Jacob Thornton	57a8672b77	Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip	2011-09-10 16:51:03 -07:00
Jacob Thornton	23d2fed905	tooltip 1 word	2011-09-10 16:50:42 -07:00
Mark Otto	0914027609	spelling mistake	2011-09-10 15:32:06 -07:00
Mark Otto	f556da42fc	zebra stripe that shit	2011-09-10 15:30:42 -07:00
Mark Otto	a95a0ed71c	conflict	2011-09-10 15:29:53 -07:00
Mark Otto	99ede580cf	adding code and .label sections to type section	2011-09-10 15:29:38 -07:00
Jacob Thornton	a8d4475827	adds twipsy js to regular index for positioning	2011-09-10 14:52:45 -07:00
Jacob Thornton	5bc455d370	Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip	2011-09-10 13:17:43 -07:00
Mark Otto	c797cb61a6	conflict	2011-09-10 13:04:17 -07:00
Mark Otto	5b16150159	trying to solve firefox active outline, make .input less specific	2011-09-10 13:00:07 -07:00
Jacob Thornton	48aa209348	more tests, more js goodness	2011-09-10 12:49:21 -07:00
Jacob Thornton	79d5f90713	Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip ... Conflicts: bootstrap-1.3.0.css	2011-09-09 22:48:57 -07:00
Jacob Thornton	5f4e30ed1d	move js plugins to root dir, begin writing tests, and change modal plugin to be more boss like	2011-09-09 22:47:49 -07:00
Mark Otto	0b43bc9bb9	adding docs for customizing the grid	2011-09-09 21:50:41 -07:00
Mark Otto	a0c3d48342	fix the stacked form legend style	2011-09-09 21:43:19 -07:00
Mark Otto	c56e229ed7	start updating the grid docs for customizing it	2011-09-09 20:47:38 -07:00
Mark Otto	dad058326e	add version # to docs	2011-09-09 16:00:59 -07:00
Mark Otto	53135839f5	adding nested columns to the grid section	2011-09-09 10:04:07 -07:00
Mark Otto	1a8fb2dbf7	resolve conflict	2011-09-08 23:02:13 -07:00
Mark Otto	ba08055a7b	update the modals and alert-messages to use the same .close styles, save for some positioning in the modal after knocking down the modal padding	2011-09-08 23:01:28 -07:00
Jacob Thornton	5960711d0f	some more js love - update the docs with tabs/pills plugin	2011-09-08 20:21:03 -07:00
Mark Otto	c474f996a9	tweaks to table styles to make them use @basefont and @baseline	2011-09-08 10:47:05 -07:00
Mark Otto	1c03a07591	bump css to 1.3.0, update makefile to reflect that, update form css to prepend form to the .clearfix to prevent some bullshit, small tweaks elsewhere	2011-09-08 10:36:56 -07:00
Mark Otto	1af96b9a58	what up breadcrumbs, we added you	2011-09-08 09:43:37 -07:00
Mark Otto	f6d20a8939	remove active state from dropdown	2011-09-06 23:32:20 -07:00