rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Code Issues Actions Packages Releases Activity
974 Commits 108 Branches 89 Tags 552 MiB
b5503c4c28
Commit Graph

974 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Jacob Thornton
c424045c76 Merge pull request #1106 from olvlvl/2.0-wip 
2.0 wip
 2012-01-22 19:48:53 -08:00
Jacob Thornton
87c676335c Merge pull request #1053 from scottwater/patch-1 
Added missing 'data-dismiss="modal"' on the first example model source.
 2012-01-22 19:38:48 -08:00
Olivier Laviale
a583f055b3 Using variables rather than numeric values 2012-01-22 22:32:16 +01:00
Jacob Thornton
7dbd2810e3 Merge pull request #1105 from olvlvl/2.0-wip 
2.0 wip
 2012-01-22 13:01:28 -08:00
Olivier Laviale
0523c053a7 Fixed typo 2012-01-22 21:45:20 +01:00
Jacob Thornton
a364d89936 Merge pull request #1104 from cgunther/dropdown-docs 
Dropdown docs error in example
 2012-01-22 12:25:51 -08:00
Jacob Thornton
a6eb972bf3 Merge pull request #1101 from ansman/2.0-wip 
Fix for #1102 and #1100
 2012-01-22 12:20:39 -08:00
Jacob Thornton
88596797f0 rename tooltip test file 2012-01-22 12:19:22 -08:00
Chris Gunther
c3625ebb23 Move placement of ID in docs example for dropdowns 
The ID specified by an href or data-target attribute should match the
li.dropdown, not the ul.dropdown-menu
 2012-01-22 11:46:44 -05:00
Nicklas Ansman Giertz
4882e6da2f Rename the tooltip test file 
It had not been renamed when twipsys became tooltips.
 2012-01-22 12:33:30 +01:00
Nicklas Ansman Giertz
05fdd43e41 Add testcase to popover 
This test case verifies that custom classes are respected.
 2012-01-22 12:32:37 +01:00
Nicklas Ansman Giertz
6a9f169fd6 Make the popove respect custom classes 2012-01-22 12:06:59 +01:00
Jacob Thornton
373a54187e add ability to cycle carousel to a particular frame 2012-01-21 23:02:29 -08:00
Jon Stevens
0f2dd75c97 remove tabs 2012-01-21 22:35:03 -08:00
Jacob Thornton
6e490628d1 more efficient matcher + bold matched query in item 2012-01-21 22:06:36 -08:00