Commit Graph

1347 Commits

Author SHA1 Message Date
Mark Otto
576ae2f561 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-26 19:10:32 -08:00
Mark Otto
7a3d04d5be scope icons to .icon 2012-01-26 19:10:09 -08:00
Mark Otto
a4a8ea2328 flip order of content on home page 2012-01-26 19:09:59 -08:00
Mark Otto
824eaff1d8 Merge pull request #1280 from mistermarco/2.0-wip
Fix typo in docs/scaffolding.html and mustache template in 2.0 wip
2012-01-26 19:04:22 -08:00
Marco Wise
6886022fe6 fix typo in docs/scaffolding.html 2012-01-26 18:10:36 -08:00
Mark Otto
5a48b22b83 Merge pull request #1269 from phopkins/ie_typeahead
[2.0-wip] Fix typehead plugin for IE7/8
2012-01-26 17:04:35 -08:00
Mark Otto
c8d2c4e442 fix height of download button 2012-01-26 16:45:01 -08:00
Jacob Thornton
12484a7471 more builder crap 2012-01-26 16:41:28 -08:00
Mark Otto
e7bc2063be Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
2012-01-26 16:31:10 -08:00
Mark Otto
7d292f5acc Merge pull request #1274 from linrock/patch-2
[2.0 wip] Bring back the hero unit css. Fixes #1185.
2012-01-26 16:27:50 -08:00
Mark Otto
af96da6e89 adding white sprites 2012-01-26 16:27:37 -08:00
Jacob Thornton
c31ac846d7 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-26 16:12:51 -08:00
Jacob Thornton
d531f72645 some js for javascript for builder (stil incomplete) 2012-01-26 16:12:34 -08:00
Mark Otto
b260544de0 fix links to apple touch icons 2012-01-26 15:54:04 -08:00
Linmiao Xu
ef4e3bc0f7 Move hero-unit css out of pattern.less and include it. Fixes #1185. 2012-01-26 15:51:11 -08:00
Mark Otto
d8e1001836 fix legend margin collapse 2012-01-26 15:39:37 -08:00
Mark Otto
2d67c34084 Merge branch 'form_alignment' of https://github.com/phopkins/bootstrap into phopkins-form_alignment
Conflicts:
	bootstrap.css
	bootstrap.min.css
2012-01-26 15:25:19 -08:00
David N
b9589fcb80 Enable default browser key behaviour when typeahead isn't showing. 2012-01-26 17:23:09 -06:00
Mark Otto
f398926e46 move down background iamge 2012-01-26 15:22:52 -08:00
Mark Otto
95356ee062 make css after merge 2012-01-26 15:04:36 -08:00
Mark Otto
32e57efd1f Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-26 15:04:13 -08:00
Mark Otto
40b4793dea Merge pull request #1271 from linrock/patch-1
Fix icon margins in large buttons.
2012-01-26 15:03:53 -08:00
Mark Otto
5844aa550d consistent new lines at ends of files 2012-01-26 15:00:59 -08:00
Mark Otto
945870d778 small text change on downloads page 2012-01-26 14:54:24 -08:00
Mark Otto
f82db4b95b separate code from type css files 2012-01-26 14:53:35 -08:00
Mark Otto
7a6737512a break scaffolding down into smaller less files 2012-01-26 14:50:55 -08:00
Mark Otto
8a6be6601d make accordion links block level 2012-01-26 14:40:19 -08:00
Mark Otto
43c8f41895 add values to inputs for grid variables on download page 2012-01-26 14:40:09 -08:00
Linmiao Xu
2aa99d17d5 Fix icon margin in large buttons. 2012-01-26 14:36:30 -08:00
Pete Hopkins
1f04481092 Switches from Array#filter to jQuery.grep for IE<=8 support 2012-01-26 17:07:06 -05:00
Mark Otto
78652a707f allow icons in small buttons 2012-01-26 13:51:12 -08:00
Pete Hopkins
721b8a1078 rebuild *.css 2012-01-26 16:15:09 -05:00
Pete Hopkins
b9413460af Makes inputs and buttons align middle so they line up in all browsers 2012-01-26 16:14:54 -05:00
Pete Hopkins
f76444c858 Clears border-radius on checkboxes because they look bad on IE 2012-01-26 16:04:24 -05:00
Pete Hopkins
c13de3db60 Fixes off-by-1px between checkbox and form label (all browsers) 2012-01-26 16:04:24 -05:00
Mark Otto
b7f22e27ec more docs homepage adjustments 2012-01-26 11:47:40 -08:00
Mark Otto
9c1ec6fb98 updated homepage docs to distill strapline 2012-01-26 11:40:29 -08:00
Mark Otto
358e3a53f7 Merge branch 'phopkins-ie_buttons' into 2.0-wip 2012-01-26 11:10:16 -08:00
Mark Otto
edef89f30e move around some comments in buttons.less, update labels to use correct variables, add snippet to docs about IE9 2012-01-26 11:10:07 -08:00
Mark Otto
dd9a0a3f16 Merge branch 'ie_buttons' of https://github.com/phopkins/bootstrap into phopkins-ie_buttons 2012-01-26 10:55:26 -08:00
Pete Hopkins
62b2fdc4de Rebuild *.css 2012-01-26 13:51:29 -05:00
Pete Hopkins
cd907067b8 Fixes background color for disabled buttons to match pre-IE fix (which prevents hover effects) 2012-01-26 13:51:03 -05:00
Mark Otto
b8c1950cbf change label fo first subnav link on js docs 2012-01-26 10:43:08 -08:00
Mark Otto
34488a4500 fix tabs example on js docs page 2012-01-26 10:39:07 -08:00
Pete Hopkins
86e0e89ee8 More *.css building 2012-01-26 13:26:28 -05:00
Pete Hopkins
7117db499f Makes default button the tiniest bit of gray for IE<=9 2012-01-26 13:26:14 -05:00
Mark Otto
5d465fab4c Merge branch 'ie_buttons' of https://github.com/phopkins/bootstrap into phopkins-ie_buttons 2012-01-26 10:12:50 -08:00
Mark Otto
ef4d0dd7db space out masthead a git more 2012-01-26 10:12:25 -08:00
Pete Hopkins
2c2f8ebe3a Rebuild of *.css 2012-01-26 13:09:13 -05:00
Pete Hopkins
29f0e4c28b Removes filters as a way to provide gradients for IE<=9
- Lets us use rounded corners in IE9
 - Makes hover / active states work correctly in IE<=9

Only change for non-IE is that moving from hover -> not hovering
no longer animates (was a subtle blend) due to mismatch between the
bottom of the gradient and the background color.

Refactor: moves the primary button background to match the others.
2012-01-26 13:07:52 -05:00