32 commits

Author	SHA1	Message	Date
Mark Otto	f17fc367f7	le merging conflicts	2011-08-29 21:26:53 -07:00
Mark Otto	650251228b	redefine the grid to use attribute selectors with css regex, make previously fixed grid values use variables we use elsewhere	2011-08-27 15:30:18 -07:00
Jacob Thornton	a63fb4d234	Merge branch '1.1.1-wip'	2011-08-26 15:21:20 -07:00
Mark Otto	8c2df3ac3a	resolve conflicts in merging in other branch	2011-08-25 23:12:29 -07:00
Igor Bozato	9a00619d6e	.sidebar and .content in fluid layouts don't need to be divs	2011-08-26 03:17:38 -03:00
Mark Otto	7d821f18ac	resolve issue #87 in this branch	2011-08-25 22:44:23 -07:00
Jacob Thornton	0e9d7c1c4d	update alert and button styling aproach	2011-08-25 13:31:46 -07:00
Mark Otto	50f484eed6	big update to change the alerts, normal and block level, to have simpler css and new colors independent of the base color scheme	2011-08-25 02:00:07 -07:00
Mark Otto	2d99e3f8a6	base import of normalize into the reset css, tweaks to selector specificity across the board	2011-08-25 00:13:40 -07:00
Jacob Thornton	0739583a46	optimize btn for outputted code + line-height: normal for firefox with adjusted padding	2011-08-24 15:55:08 -07:00
Jacob Thornton	7d7156bff9	optimized grid system from @necolas	2011-08-23 20:16:39 -07:00
Jacob Thornton	0bfce13983	add delete button + give .btn cursor:pointer	2011-08-22 23:53:02 -07:00
Jacob Thornton	899c6f8d12	remake	2011-08-22 21:47:34 -07:00
Mark Otto	16064bed2d	Bugfix and copy changes	2011-08-22 12:34:55 -07:00
Mark Otto	a98d2cccb8	merge in master, resolve conflicts	2011-08-21 20:47:24 -07:00
Mark Otto	254e70550e	remove 60px top margin on body and tweak a few other things	2011-08-21 17:06:37 -07:00
Mark Otto	4512cc5652	updated compiled and minified, fix bug where links didn't inherit font weight	2011-08-20 23:45:01 -07:00
Mark Otto	72899a4ee8	updated docs to fix inconsistent display of code elements, update scaffolding to fix padding issue on fluid containers, add placeholder hero unit in patterns for future use, continue to refactor some rgba to hex values	2011-08-20 18:58:12 -07:00
Jacob Thornton	6d0b083b7d	update whitspace and comment styles	2011-08-16 22:58:01 -07:00
Mark Otto	460a84a926	Updated offset columns, fix app.js bug, misc tweaks to copy	2011-06-30 15:56:25 -07:00
Mark Otto	588b2da937	updated docs, fixed language, added copy-code js for selecting text on focus	2011-06-30 10:40:28 -07:00
Mark Otto	9e33ab20ab	clean up commented out css, slightly updated docs again	2011-06-30 00:15:37 -07:00
Jacob Thornton	1561b20f7c	Merge branch 'master' of http://git.local.twitter.com/bootstrap	2011-06-29 15:41:33 -07:00
Jacob Thornton	e72283ccaf	fix comments up for non minified built file	2011-06-29 15:40:52 -07:00
Mark Otto	025f74ef93	form bug fix with new baseline, updated docs to fix topbar bug, tweaks to scaffolding for buttons	2011-06-29 13:48:08 -07:00
Mark Otto	25d9a2f2b8	update grid bg to 18px baseline, updated docs for disabled buttons	2011-06-28 15:54:25 -07:00
Mark Otto	4e95e558db	reseting baseline to 18px, fixing wells, moving pre styles for chili to docs	2011-06-28 15:11:41 -07:00
Jacob Thornton	e91a74e8e8	fix license indent and make comments consistent	2011-06-28 14:24:02 -07:00
Mark Otto	9660f6f18d	new buttons, new modal updates around spacing and placeholder content	2011-06-28 11:56:49 -07:00
Mark Otto	243fc873d9	mucho updato around buttons to fix some stuff that was introduced with the bootstrap update	2011-06-27 17:15:26 -07:00
Mark Otto	dd769f9a6e	update to use latest version of bootstrap, docs cleanup, etc	2011-06-27 16:47:12 -07:00
Jacob Thornton	d447898bf2	rearranging everything	2011-05-03 18:09:25 -07:00