rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-12 00:08:59 +01:00
Code Issues Actions Packages Releases Activity
1,058 Commits 108 Branches 89 Tags 552 MiB
324ebb5990
Commit Graph

1058 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Otto
7e6797880a Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/index.html
	docs/templates/pages/index.mustache
 2012-01-24 16:09:32 -08:00
Mark Otto
03d2128f50 Merge pull request #1149 from Calvein/2.0-wip 
[base-css] Fixed a nasty "mailto" typo and added jquery.tablesorter
 2012-01-24 16:08:09 -08:00
Mark Otto
8ff621aa26 fix broken index page heading, update variables and less pages 2012-01-24 16:07:30 -08:00
Jacob Thornton
655a96869c typo with i18n 2012-01-24 15:51:28 -08:00
Jacob Thornton
3a840075dd rebuild 2012-01-24 15:42:16 -08:00
Jacob Thornton
4c5497bfcc Merge pull request #1158 from pokonski/wrap-stuff 
Wrap stuff in components.mustache
 2012-01-24 15:03:30 -08:00
Piotrek Okoński
ef869776e5 Wrap stuff in components.mustache 2012-01-25 00:00:35 +01:00
Jacob Thornton
5f209ed810 Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/templates/pages/index.mustache
 2012-01-24 14:33:52 -08:00
Jacob Thornton
fbc1ab14cc Merge branch '2.0-wip' of https://github.com/MGaetan89/bootstrap into 2.0-wip 
Conflicts:
	docs/templates/pages/index.mustache
 2012-01-24 14:31:10 -08:00
Mark Otto
58f7fd308a Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip 
Conflicts:
	docs/templates/pages/index.mustache
 2012-01-24 14:28:14 -08:00
Mark Otto
fecd4ddd13 docs updates to make the getting started section more responsive, updated the benefits to be clearer and swap x for checkmark 2012-01-24 14:25:30 -08:00
Gaëtan Muller
fea1dc906e i18n for index page 2012-01-24 23:23:43 +01:00
Jacob Thornton
a800d6ceac i18n index 2012-01-24 14:22:02 -08:00
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
François Robichet
5fb31670af Added jquery.tablesorter js file 2012-01-24 22:12:37 +01:00
François Robichet
925fef4110 Typo on tablesorter 2012-01-24 22:11:09 +01:00
François Robichet
540d229eba Fixed a mailto typo 2012-01-24 21:57:30 +01:00
Mark Otto
3f54db9c6a remake 2012-01-24 12:53:30 -08: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
Marc Chung
54f04d3b13 Fixed typo in Makefile 2012-01-24 12:37:57 -07: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