0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Commit Graph

989 Commits

Author SHA1 Message Date
Jacob Thornton
f4543ecb19 add i18n to upgrading 2012-01-24 14:14:01 -08:00
Jacob Thornton
8db0cc6fda Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-24 14:08:27 -08:00
Jacob Thornton
f03e170054 scaffolding i18n 2012-01-24 14:08:03 -08:00
Jacob Thornton
d80985443a Merge pull request #1138 from lookfirst/fixjs
2.0-wip: Fixjs headers
2012-01-24 13:58:51 -08:00
Jacob Thornton
72117c3f97 add i18n for less.mustache 2012-01-24 13:57:44 -08:00
Jacob Thornton
3aea86370d rebuild base-css 2012-01-24 13:48:05 -08:00
Jacob Thornton
9e7f4ebd77 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-24 13:47:41 -08:00
Jacob Thornton
7d52e1dcd4 remake 2012-01-24 13:47:24 -08:00
Jacob Thornton
b0a351d8f7 Merge pull request #1153 from MGaetan89/2.0-wip
#1122 - i18n in Base CSS documentation
2012-01-24 13:43:13 -08:00
Gaëtan Muller
425e5bfb71 Final translation tags in Base CSS 2012-01-24 22:17:32 +01:00
Gaëtan Muller
a9c6dca094 More translation tags in Base CSS 2012-01-24 21:45:42 +01:00
Gaëtan Muller
bc9c89f157 Start adding tag for Base CSS translation 2012-01-24 21:29:55 +01:00
Mark Otto
f32866c2fc Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-24 12:28:37 -08:00
Mark Otto
e829001e5c attempt to fix select list alignment in Firefox by removing padding. not quite fixed 100%, but getting there. 2012-01-24 12:28:20 -08:00
Jacob Thornton
b5503c4c28 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-24 12:11:26 -08:00
Jacob Thornton
222067b360 javascript pages markedup with {{_i}} 2012-01-24 12:11:05 -08:00
Jon Stevens
84a8aa1bea 2.0-wip: fix js heads 2012-01-24 11:08:03 -08:00
Mark Otto
91780529d5 Merge pull request #1134 from trevyn/2.0-wip
overzealous 2011/2012 search/replace
2012-01-24 10:48:44 -08:00
Mark Otto
72861dfbf2 Merge branch 'apostrophe-grammar' of https://github.com/phopkins/bootstrap into phopkins-apostrophe-grammar 2012-01-24 10:45:51 -08:00
Mark Otto
b0bd1d8203 add bottom-up styles to the dropdown menus 2012-01-24 10:45:29 -08:00
Mark Otto
7d2e13f1b4 remake css 2012-01-24 10:43:13 -08:00
Pete Hopkins
04efc8d0a8 Fixes apostrophe in less.html 2012-01-24 12:52:06 -05:00
Pete Hopkins
37b38fe2a0 Spelling and typos in components.html and javascript.html 2012-01-24 12:49:30 -05:00
Pete Hopkins
91b32f4783 Fixes apostrophe usage in base-css.html 2012-01-24 12:12:35 -05:00
Eden
ec68b84123 i don't think the batch s/2011/2012/ was supposed to hit this. :) 2012-01-24 08:27:19 -08:00
Jacob Thornton
16440eea92 move translation tag for bootstrap 2012-01-23 19:59:05 -08:00
Jacob Thornton
82de03b67c start wrapping text in {{_i}} for translation 2012-01-23 19:55:00 -08:00
Jacob Thornton
b4b1ef6839 rebuild with new templates 2012-01-23 15:17:32 -08:00
Jacob Thornton
9a68f115e7 rebuild 2012-01-23 15:07:07 -08:00
Jacob Thornton
74521e8354 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
	bootstrap.css
	docs/base-css.html
	docs/components.html
	docs/index.html
	docs/javascript.html
	docs/less.html
	docs/scaffolding.html
2012-01-23 15:06:56 -08:00
Jacob Thornton
f764aee4b9 add templates for doc generation 2012-01-23 14:14:16 -08:00
Mark Otto
a074087034 Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 2012-01-23 13:51:12 -08:00
Mark Otto
cd5ffbe396 fix up the modals in responsive a bit 2012-01-23 13:50:55 -08:00
Mark Otto
1954cf0019 comment in forms' 2012-01-23 13:46:26 -08:00
Mark Otto
b636ccb281 Merge pull request #1118 from olvlvl/2.0-wip
Remove .alert-message IE hack
2012-01-23 12:49:09 -08:00
Olivier Laviale
1fa2801c2f .alert-message no longer exists 2012-01-23 21:22:08 +01:00
Mark Otto
ff113acba8 cut margin in half on default forms 2012-01-23 12:21:00 -08:00
Mark Otto
ea8f5883fd clean up subnav aesthetics 2012-01-23 12:04:48 -08:00
Mark Otto
a7bf0295fb remove dropdowns, add in sub nav instead 2012-01-23 11:55:04 -08:00
Mark Otto
00d9258194 revert to negative margin on grid row 2012-01-23 11:35:39 -08:00
Mark Otto
22fa371259 Merge branch 'normalize' of https://github.com/necolas/bootstrap into necolas-normalize
Conflicts:
	bootstrap.css
	bootstrap.min.css
	lib/type.less
2012-01-23 11:25:16 -08:00
Jacob Thornton
1209a3756c :focus:required:invalid: http://www.alistapart.com/articles/forward-thinking-form-validation 2012-01-22 20:50:35 -08:00
Jacob Thornton
2355ea034b rebuild 2012-01-22 20:47:24 -08:00
Jacob Thornton
f7b5e0f6b5 Merge pull request #1046 from kevva/dropdown-menus
Scalable dropdown menus
2012-01-22 20:41:52 -08:00
Jacob Thornton
36d2679f83 give default valuse for border-radius-custom 2012-01-22 20:31:58 -08:00
Jacob Thornton
36d56fb1ba don't use negative margin - use first child to set to 0 2012-01-22 20:12:26 -08:00
Jacob Thornton
b8c0388f8a fix sans-serif order in forms.less and rebuild 2012-01-22 20:07:17 -08:00
Jacob Thornton
dc5bedda14 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 2012-01-22 20:03:17 -08:00
Jacob Thornton
155b72e873 share -> share-alt 2012-01-22 20:02:56 -08:00
Jacob Thornton
1593671cb2 Merge pull request #1098 from lookfirst/fixstuff
2.0-wip: clean up variable usage with colors
2012-01-22 19:50:16 -08:00