rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00
Code Issues Actions Packages Releases Activity
3,848 Commits 108 Branches 89 Tags 549 MiB
28e1702052
Commit Graph

1683 Commits

Author SHA1 Message Date
Mark Otto
190d3c9c3e fixes #4526: box-shadow on .radio and .checkbox if .control-group has a form field state 2012-08-21 14:22:26 -07:00
Mark Otto
e2ecd2df6c Merge branch 'incbee-master' into 2.1.1-wip 2012-08-21 14:16:09 -07:00
Mark Otto
45978b6674 run make 2012-08-21 14:16:01 -07:00
Mark Otto
b1c93c2700 fixes #4523: more specific selectors on white icon inversion 2012-08-21 14:15:01 -07:00
Mark Otto
311c00a29b fixes #4532: navbar responsive carets for dropdown-menus now hidden, also fixes borders on navbar form 2012-08-21 14:07:20 -07:00
Mark Otto
1c134d9a7f update version numbers to 2.1.1 2012-08-21 13:11:25 -07:00
Mark Otto
8a2b9f4a5f remove entity in content property on dropup carets--not necessary at all 2012-08-21 13:02:02 -07:00
Mark Otto
6477ad1acf fixes #4472: manually change mustache file as well for typo 2012-08-21 12:57:41 -07:00
Jacob Thornton
320b75de63 add affix to zip 2012-08-20 23:13:43 -07:00
Jacob Thornton
9e0d87a4dd fix afffix 2012-08-20 16:43:49 -07:00
Jacob Thornton
2b5e09038a small nits 2012-08-20 16:21:57 -07:00
Mark Otto
01572f00bb ie7 button group and button toggle padding changes 2012-08-20 12:27:45 -07:00
Mark Otto
58dd1f20ae fix vertical button-groups in ie7 2012-08-20 12:20:22 -07:00
Mark Otto
6cf3752b9b fix ie7 dropdowns examples in docs 2012-08-20 12:16:15 -07:00
Mark Otto
78cb09b440 run make and add comment 2012-08-20 11:31:24 -07:00
Mark Otto
e59642838f remove relative and top positioning from docs sidenav at narrow layout 2012-08-20 11:28:30 -07:00
Mark Otto
2fda6a45aa bump up height of progress bars, give some extra depth with stacking bars, and then make the stacked bars actually work 2012-08-20 11:22:37 -07:00
Mark Otto
73cf9c4db8 fixes #4469 manually: reset width on file inputs 2012-08-20 10:28:41 -07:00
Mark Otto
e510306196 bump versions to 2.1.0 2012-08-19 23:07:18 -07:00
Mark Otto
a667fd93ab pre font-size increase; revert static top navbar, undo contents section for now 2012-08-19 23:01:24 -07:00
Mark Otto
4e979f084d fix static navbar container issues, clean up docs presentation by unfixing the top navbar in favor of static one, start adding table of contents for longer sections of docs 2012-08-19 21:12:52 -07:00
Mark Otto
b745b7768a fixes #4458: improve support for .btn + .btn in .btn-groups and .btn-toolbars 2012-08-19 17:07:41 -07:00
Mark Otto
887f11d47f fixes #4455: improve small styles and add to docs 2012-08-19 13:12:43 -07:00
Mark Otto
47cf3cc62f copy edits to base css page 2012-08-19 12:07:23 -07:00
Mark Otto
bb85bbc657 compy edits to docs 2012-08-19 12:04:41 -07:00
Mark Otto
7ed82c1223 font-size change on examples in getting started 2012-08-19 11:59:28 -07:00
Jacob Thornton
c9cef741f6 listen to touchstart for dropdowns on mobile 2012-08-18 20:18:15 -07:00
Jacob Thornton
45dddc59a1 add click option for tooltip, popover - make click default for popover 2012-08-18 19:54:30 -07:00
Jacob Thornton
1166b39630 removed some old stuff from application.js 2012-08-18 19:24:29 -07:00
Mark Otto
e79eb75e09 fixes #4044: make z-index of tooltips same as fixed navbar so they overlay it if generated from within 2012-08-18 17:05:37 -07:00
Mark Otto
e6e0e2ac9b fixes #4442: allow for .btn within a .btn-toolbar without .btn-group 2012-08-18 16:50:26 -07:00
Mark Otto
50638530e6 fixes #4445: .btn-link shouldn't have a pressed button-like state at all, so nuking everything on :active as well 2012-08-18 16:30:47 -07:00
Mark Otto
1ae194597c nuke subnav styles from responsive navbar 2012-08-17 16:32:34 -07:00
Mark Otto
256a25f25c fixes #4260 and #4322: set vertical-align to top on input-prepend components to solve modal rounding issues 2012-08-17 16:28:45 -07:00
Mark Otto
5b947b8a2f fix up padding on small buttons, add button examples 2012-08-17 16:11:52 -07:00
Mark Otto
2b22c0c56e fixes #4438: button groups in inline forms now render inline 2012-08-17 16:00:36 -07:00
Mark Otto
9e6322dbab fixes #4428: specifity on .search-query increased 2012-08-17 12:59:32 -07:00
Mark Otto
077577c7f3 fixes #4421: add static top navbar class 2012-08-17 11:46:23 -07:00
Mark Otto
b86e1fb62a additional navbar contrast: add inset shadow since we nuked the border 2012-08-17 11:31:21 -07:00
Mark Otto
79e05d0c0e change css version # 2012-08-17 11:24:48 -07:00
Mark Otto
51b43acf20 run make on previous commit's merge 2012-08-17 11:23:39 -07:00
Mark Otto
ded21ebc91 fixes #4416 in a different way: scope active state of navbar links to just the immediate navbar link, not dropdown elements 2012-08-17 11:22:45 -07:00
Mark Otto
54c645e33d tweak transition 2012-08-15 14:49:55 -07:00
Mark Otto
fd509cb370 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-08-15 14:45:41 -07:00
Mark Otto
ada5589184 add transition to thumbnails 2012-08-15 14:45:35 -07:00
Jacob Thornton
ff38c14948 stray ; 2012-08-14 21:23:29 -07:00
Jacob Thornton
ae9a2bd93a Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip 2012-08-14 21:06:39 -07:00
Jacob Thornton
dee57462e2 get affix actually working and update docs 2012-08-14 21:06:08 -07:00
Mark Otto
2ee035403d running make on prev merge 2012-08-14 16:28:17 -07:00
Mark Otto
9c72246d49 navbar and dropdown fixes, for alignments and for ie7/8 dropdown hidden bugs from #3946 2012-08-14 16:24:58 -07:00
Mark Otto
f3479a3953 compensate for ie7 button padding with no borders, fix indentation 2012-08-14 15:44:25 -07:00
Mark Otto
f933a41c7b remove bottom margin on radios and checkboxes 2012-08-14 15:34:10 -07:00
Mark Otto
780636d955 fixes #3674: checkbox vertical alignment in IE9 2012-08-14 15:29:47 -07:00
Mark Otto
b14d946afb add animation to docs download btn for firefox 2012-08-14 15:12:22 -07:00
Mark Otto
a80dafbb18 fix width of star github btn in docs 2012-08-14 15:00:22 -07:00
Mark Otto
5144c77b27 fixes #4358: make select elements 30px tall to match inputs 2012-08-14 14:57:49 -07:00
Mark Otto
50df524ba1 remove borders entirely from fixed navbars 2012-08-14 14:53:45 -07:00
Mark Otto
dbcd87331d fixes #4371: scope hovers on table rows to tbody 2012-08-14 14:51:33 -07:00
Mark Otto
0b0d7f104c fixes #4396: pull right dropdown menus no longer overlaid by submenus 2012-08-14 14:32:03 -07:00
Mark Otto
2a6deb92b1 fixes #4395: scope dropdown menu caret in navbar to first level dropdown only 2012-08-14 14:29:31 -07:00
Andreas Cederström
2df0a0fdeb now with 13 custom jquery plugins 2012-08-14 13:58:12 +02:00
Mark Otto
97a23ef2e6 fixes #4342: navbar vars not in use, render navbar dividers 2012-08-13 22:57:40 -07:00
Mark Otto
9f8ce77751 running make on previous changes 2012-08-13 10:05:19 -07:00
Mark Otto
f6c7ac51f2 add some simple styles for showing white icons on hover where appropriate 2012-08-08 11:26:22 -07:00
Mark Otto
3c89f7bb5f fix chevron on js docs and run make after table changes 2012-08-07 23:07:53 -07:00
Mark Otto
85f1f2257b make twitter bird white in illustration on homepage to abide by brand guidelines 2012-08-07 23:05:39 -07:00
Mark Otto
03eee23952 speed up animation and brightness on docs download 2012-08-07 23:02:01 -07:00
Mark Otto
4eee78e051 fixes #4304: more specific selectors on table border classes to override .table-striped 2012-08-07 22:50:49 -07:00
Mark Otto
a525a6fe33 Merge pull request #4300 from rilian/2.1.0-wip 
optimizing images on 2.1.0-wip branch; saving couple of KBs from package
 2012-08-07 22:45:53 -07:00
Mark Otto
8ed77c41f0 fixes #4295: add vars for pagination 2012-08-07 22:37:38 -07:00
rilian
80a645b52a optimizing images on 2.1.0-wip branch; saving couple of KBs from package 2012-08-06 13:23:12 +03:00
Mark Otto
3823d29c04 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-08-05 00:15:21 -07:00
Jacob Thornton
88deb08ff2 Merge branch '2.1.0-wip' of http://github.com/twitter/bootstrap into 2.1.0-wip 2012-08-02 16:58:51 -07:00
Jacob Thornton
2b2b3303e1 fix indexof on array for ie8 2012-08-02 16:58:25 -07:00
Mark Otto
33c6ab9b20 decrease docs nav padding 2012-08-01 23:21:06 -07:00
Mark Otto
d27dcf3b07 cut down on selectors on .formFieldState() mixin to origin input catchall 2012-08-01 23:16:49 -07:00
Mark Otto
1482030679 fixes #4207: redeclare box-shadow on .formFieldState() mixin so transitions work in WebKit 2012-08-01 23:15:51 -07:00
Mark Otto
4a84145c43 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-08-01 20:34:29 -07:00
Mark Otto
86a577d76b decrease box-shadow 2012-08-01 20:34:19 -07:00
Jacob Thornton
48546c2735 aria-labelledby="myModalLabel" aria-hidden="true" 2012-08-01 20:26:44 -07:00
♒∆✝
7ec1778103 Merge pull request #4257 from ginader/modal-accessibility 
close #3531 added focus handling and removed the badly announced "times"...
 2012-08-01 20:23:50 -07:00
Dirk Ginader
6977d35eed close #3531 added focus handling and removed the badly announced "times" close button from screenreaders 2012-08-01 20:11:16 -07:00
Mark Otto
1bb7c0e669 fixes #4254: make .span12 expand full width of a parent when responsive 2012-08-01 19:33:37 -07:00
Mark Otto
3c742fc08b add test for textarea at .span12, really fix docs footer 2012-08-01 19:25:50 -07:00
Mark Otto
72323051c3 increase padding on navbar responsive nav links, fix footer margins 2012-08-01 19:18:42 -07:00
Mark Otto
c2e899f2a0 remove the canvas slider doodad 2012-08-01 19:00:25 -07:00
Mark Otto
b979cd9e67 darken default button borders 2012-08-01 17:01:29 -07:00
Mark Otto
e8fd7e6c96 fix jank button on docs homepage 2012-08-01 16:15:21 -07:00
Mark Otto
735001cb26 increase horizontal padding on inputs given new font-size 2012-08-01 11:53:00 -07:00
Mark Otto
5637c6fb70 pulsing download button on homepage 2012-08-01 11:52:48 -07:00
Mark Otto
fab1a80dcb increase margin on checkboxes and radios to center properly 2012-08-01 11:35:31 -07:00
Mark Otto
060e216712 fixes #4253: hover on responsive navbar 2012-08-01 09:18:00 -07:00
Mark Otto
e191964ff8 reorder docs css 2012-07-31 00:01:04 -07:00
Mark Otto
9795e9bbe6 place chevrons first in sidenav in docs, fix ie7 bugs for said sidenav 2012-07-30 23:48:26 -07:00
Mark Otto
196fb1d86a fixes #3615: remove last-child hack for IE7 since IE7 doesn't support :last-child 2012-07-30 22:26:54 -07:00
Mark Otto
59eba9afbc remove position from labels/badges in mini btns 2012-07-30 15:54:03 -07:00
Mark Otto
364dbb7931 fixes #3665: ensure inputs in a fluid row maintain grid sizing 2012-07-30 15:38:36 -07:00
Mark Otto
a9bf1e6e35 fixes #3900: nudge badges in buttons up 1px 2012-07-30 13:25:27 -07:00
Mark Otto
b2ebd5c46c update button styles to use updated 14px base font size, align carets to others with no opacity changes 2012-07-30 12:52:44 -07:00
Mark Otto
7fa99fb1fe fix navbar form alignment, and update examples to show these cases 2012-07-30 12:15:08 -07:00
Mark Otto
6bf661aceb new fav and touch icons to match new masthead 2012-07-30 10:33:48 -07:00
Mark Otto
b63543181a fix examples collapse classes, rename navbar-redux to navbar and delete the old one 2012-07-30 10:08:27 -07:00
Mark Otto
cfac4bb59d fixes #4221: correct border-collapse property for IE7 hack 2012-07-29 23:51:40 -07:00
Mark Otto
84a9c74efd fix footer in responsive 2012-07-29 23:51:18 -07:00
Mark Otto
22a9a83656 fixes #3694: provide override classes for .hide and .pull-right for grid columns 2012-07-29 16:51:24 -07:00
Mark Otto
d63ebe3f3c more breadcrumb tweaks for contrast 2012-07-29 16:37:37 -07:00
Mark Otto
87ce3489d3 remove gradient, border, and box-shadow from .breadcrumb to differentiate from nav and buttons 2012-07-29 16:25:20 -07:00
Mark Otto
761429d88a Merge branch '2.1.0-wip-navbar' into 2.1.0-wip 2012-07-29 16:24:05 -07:00
Mark Otto
5184da39f4 clear out docs assets, update and png crush features image 2012-07-29 00:44:55 -07:00
Mark Otto
a30045daef reverse navbar styles to save code 2012-07-29 00:30:15 -07:00
Mark Otto
fe6a4b0b54 add .btn-block for a full-width button option 2012-07-27 15:42:58 -07:00
Mark Otto
16b4ac0d8f add docs for sub menu support on dropdowns, add caret via :after to submenu toggles 2012-07-27 10:35:15 -07:00
Mark Otto
9d5c431223 add basic support for sub menus in dropdown menus 2012-07-27 10:06:54 -07:00
Mark Otto
1e9b450619 add image styles, for now to scaffolding (soon to own file) 2012-07-27 00:06:43 -07:00
Mark Otto
6474190746 increase height of homepage jumbotron, update vars and styles of popovers 2012-07-26 23:42:36 -07:00
Mark Otto
f75277e62d indenting and such 2012-07-26 21:45:19 -07:00
Mark Otto
880bdbc4dd simplify styles for bs docs nav 2012-07-24 16:07:25 -07:00
Jacob Thornton
c10a357bb3 don't bite so hard 2012-07-24 12:57:00 -07:00
Mark Otto
fa6a131eb6 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-07-24 01:53:45 -07:00
Mark Otto
7590e65f6f fix search form, mostly in navbar 2012-07-24 01:44:12 -07:00
Jacob Thornton
e2fc202df2 Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip 2012-07-24 00:49:19 -07:00
Jacob Thornton
c98b75c979 added fade out on scroll - we can pull this if you prefer it 2012-07-24 00:48:45 -07:00
Mark Otto
394922a1bf Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-07-24 00:44:20 -07:00
Mark Otto
87aa61001e fixes #4118: responsive modal gets width auto and improved positioning for narrower widths 2012-07-24 00:44:11 -07:00
Mark Otto
c37aa99e28 modal heading line-height 2012-07-24 00:37:19 -07:00
Mark Otto
4912dd441d fix h3 in modal and make modal unhidden by removing important from earlier issue 2012-07-24 00:35:54 -07:00
Jacob Thornton
e38fa4b1f4 fix scroll thinggg 2012-07-24 00:30:58 -07:00
Jacob Thornton
5b2f2ed821 Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip 
Conflicts:
	docs/assets/css/docs.css
	docs/javascript.html
	docs/templates/pages/javascript.mustache
 2012-07-24 00:24:25 -07:00
Jacob Thornton
4ea7c47235 slightly fix side bar 2012-07-24 00:21:40 -07:00
Mark Otto
cd441e082f fixes #4156: don't override border radius if stacked nav has one child 2012-07-23 23:56:13 -07:00
Mark Otto
6245886b26 tweak docs shadows 2012-07-23 23:54:26 -07:00
Mark Otto
f085dbadd1 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 
Conflicts:
	docs/assets/css/docs.css
	docs/base-css.html
	docs/components.html
	docs/customize.html
	docs/getting-started.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/customize.mustache
	docs/templates/pages/getting-started.mustache
	docs/templates/pages/javascript.mustache
	docs/templates/pages/scaffolding.mustache
 2012-07-23 23:01:38 -07:00
Mark Otto
0dda2c4659 make docs scroll over jumbotrons, but only for 980px up 2012-07-23 22:36:08 -07:00
Mark Otto
5b8838aeac more alignment fixes for customize page 2012-07-23 12:51:48 -07:00
Jacob Thornton
dcf75697ec some progress on affix plugin 2012-07-22 18:28:39 -07:00
Jacob Thornton
fae6c36874 adds minLength #3960 2012-07-22 14:50:52 -07:00
Mark Otto
b9105b98f9 move from downloads.html to customize.html to better match purpose of page, fix up customize page layout to match other docs, link style refinement to jumbotrons 2012-07-20 22:06:47 -07:00
Mark Otto
ee750bbce1 tweak docs masthead links hover 2012-07-20 21:38:28 -07:00
Mark Otto
1d4660beea nuke commented out code from last fix 2012-07-19 21:25:42 -07:00
Mark Otto
3c1a0fbda4 fixes #4103: simpler fix for tfoot in .table-border 2012-07-19 21:25:24 -07:00
Mark Otto
89d7ec5290 fixes #4102: properly round top left corners of .table-border with caption/colgroup; also fix css tests page layout and footer 2012-07-19 21:06:42 -07:00
Mark Otto
6c23fff4d6 misc docs content changes 2012-07-18 01:06:52 -07:00
Mark Otto
aac3736eea fixes #3845: add .btn-link for transparent buttons styled as links 2012-07-17 23:32:52 -07:00
Mark Otto
cb1a59caa0 Merge branch '2.1.0-wip' of https://github.com/gcoop/bootstrap into gcoop-2.1.0-wip 
Conflicts:
	docs/base-css.html
	docs/templates/pages/base-css.mustache
 2012-07-17 23:14:58 -07:00
Mark Otto
326b665065 de-scope nav-header from .nav 2012-07-17 22:40:38 -07:00
Mark Otto
39f8996d6a fix dropdown vars and make hover state be link color again, add gradient to dropdown link hovers, fix caret positions and active states on nav tabs, tweak nav link padding 2012-07-17 22:26:53 -07:00
Mark Otto
a1ad6d124a Merge branch '2.1.0-wip' of https://github.com/benjaminoakes/bootstrap into benjaminoakes-2.1.0-wip 
Conflicts:
	docs/extend.html
	docs/templates/pages/extend.mustache
 2012-07-17 20:57:20 -07:00
Mark Otto
62f6368344 center masthead bg pattern 2012-07-17 20:22:55 -07:00
Mark Otto
25bc298aff pngcrush masthead pattern to save 10k 2012-07-17 19:55:02 -07:00
Mark Otto
4008d666a5 new pattern for masthead 2012-07-17 19:54:29 -07:00
Mark Otto
16fa610ea4 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-07-17 19:11:51 -07:00
Mark Otto
478396fd4e remove list-type declarations from ul and ol elements since those should just use browser defaults 2012-07-17 19:11:41 -07:00
Mark Otto
40ab928315 Merge pull request #4083 from martinbean/2.1.0-wip 
Moved JS to bottom as per best practices
 2012-07-15 16:26:42 -07:00
Mark Otto
e20d2dfe9d docs cleanup and blockquote cleanup for .pull-right option 2012-07-15 16:13:25 -07:00
Mark Otto
750badabf7 copy edits and tweaks to utility classes to ensure they always are specific enough 2012-07-13 14:43:51 -07:00
Martin Bean
74b167b86d Moved JS to bottom as per best practices 2012-07-13 22:25:47 +01:00
Mark Otto
5cb116beb8 cleanup subnav example 2012-07-13 10:58:20 -07:00
Mark Otto
9343e1e933 remove getting started link from home, add to navbar, overhaul getting started docs 2012-07-12 21:38:18 -07:00
Mark Otto
a12f0e551f overhaul docs on sub pages, clean up css and copy 2012-07-12 18:11:49 -07:00
Mark Otto
549d61fc28 updated footer 2012-07-12 17:02:55 -07:00
Mark Otto
7d324ee35b Merge branch 'respclasses' of https://github.com/digitaldisseny/bootstrap into digitaldisseny-respclasses 2012-07-12 16:24:37 -07:00
Mark Otto
280dfda6ed docs css cleanup for spacing and stuff 2012-07-12 16:16:06 -07:00
Mark Otto
c884d6eaa6 clean up docs for subnav 2012-07-12 13:50:27 -07:00
Mark Otto
338c7ef2b6 tweak code snippet on pager and clean up type and font-sizes on docs Home 2012-07-12 13:45:07 -07:00
Roberto - phproberto
f0ed383e51 Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into respclasses 2012-07-11 01:31:44 +02:00
Mark Otto
713105774f fixes #3706: add textColor and textShadow as options to .buttonBackground mixin 2012-07-10 00:45:44 -07:00
Mark Otto
5d8e78e0fa fixes #3605: add support for input-prepend/-append to .form-search 2012-07-10 00:32:30 -07:00
Roberto - phproberto
83846ba0d6 Fixes #4002 responsive utilities classes 2012-07-10 08:12:16 +02:00
Mark Otto
64e87a85f5 remove popoverarrows mixin, relegate code to tooltips and popvers since we only used them once each; this fixes the problem of broken tooltips in 2.1 2012-07-09 22:14:30 -07:00
Mark Otto
f4877c2369 fix up docs popover examples and copy 2012-07-09 21:13:33 -07:00
Mark Otto
148e5a3d89 fixes #3291: remove float on responsive .thumbnails for 767px and down to ensure thumbnail images don't pop out of container in FF 2012-07-09 21:07:49 -07:00
Mark Otto
f495a8d0cc fixes #3210: add .btn to .navbar-form to remove bottom margin, improve vertical align of contents of .navbar-form 2012-07-09 21:01:29 -07:00
Mark Otto
93be608bf0 fixes #3384: add support for multiple inputs per line when using grid sizing 2012-07-09 20:49:17 -07:00
Mark Otto
7800fee7e0 fixes #3973: same border on disabled inputs as default inputs: 2012-07-09 00:51:38 -07:00
Mark Otto
07f80e6fd8 fixes #4027: same margins on .pager and .pagination 2012-07-09 00:42:38 -07:00
Mark Otto
25d0b341a9 wasn't feeling the new buttons, downsizing again until we get a better balance 2012-07-09 00:31:54 -07:00
Mark Otto
9887d3cf4a updating docs examples to remove 13/18 resets, fix up buttons alignments and carets 2012-07-09 00:26:32 -07:00
Mark Otto
16cf6b30cd docs changes for icons 2012-07-09 00:17:36 -07:00
Mark Otto
8b696ad0b5 fix text in docs about default font-size and line-height 2012-07-09 00:14:35 -07:00
Mark Otto
db9925510b fix up carousel alignment and line-height 2012-07-08 21:47:16 -07:00
Mark Otto
20676ddd4d adding getting started page based on Bootstrap University from awhile back, testing out side nav on docs instead of subnav bar 2012-07-08 01:47:36 -07:00
Mark Otto
5f861ef517 fix up docs to use default container, fix responsive home changes 2012-07-07 23:16:07 -07:00
Mark Otto
3f2f96b0d7 reoder forms a bit 2012-07-07 12:52:05 -07:00
Mark Otto
e2b777d9a3 docs pre font-size and nowrap on prepend/append 2012-07-07 12:34:47 -07:00
Mark Otto
7cc916d137 Merge branch '21jumpst' into 2.1.0-wip 2012-07-07 00:48:15 -07:00
Mark Otto
e2336ef02a remove specific values for the fluid grid system and instead use LESS's percentage() function 2012-07-07 00:30:43 -07:00
Mark Otto
dc6eaafb00 vertically align inline form content 2012-07-06 10:59:46 -07:00
Mark Otto
19ea4668e5 prevent small tags from increasing height of headings 2012-07-06 10:35:08 -07:00
Mark Otto
095e052606 adding homepage social buttons 2012-07-06 10:10:56 -07:00
Mark Otto
68146db004 buttons and pre updates for font-size 2012-07-05 15:15:57 -07:00
Mark Otto
3c07eaa251 updates to type scale 2012-07-05 15:11:54 -07:00
Mark Otto
c6ee96c025 fix up subnav styles, add subnav search form styles, add some basic docs for subnav 2012-07-05 10:37:23 -07:00
Mark Otto
a645664e50 update thumbnails to fix display issues and refine aesthetics 2012-07-05 10:12:15 -07:00
Mark Otto
62c386259b rewrite docs homepage, new graphics 2012-07-04 23:31:30 -07:00
Gavin Cooper (work)
b4125748b0 added ability to give rows in tables status classes .success .error and .info. 2012-07-04 12:22:34 +01:00
Mark Otto
3ad52ca632 fast responsive tweaks 2012-07-01 22:49:01 -07:00
Mark Otto
70e81e6f55 new jumbotron 2012-07-01 08:42:09 -07:00
Mark Otto
98ebd54800 address issues with fixed subnav like borders, corners, etc 2012-06-28 21:20:40 -07:00
Mark Otto
6f4360c47b cleanup docs css more 2012-06-28 21:06:54 -07:00
Mark Otto
c31a4e5131 remove responsive subnav from docs and place in navbar-responsive.less 2012-06-28 20:59:16 -07:00
Mark Otto
c09e8473e2 use variablef or wells background-color, update docs for glyphicons license mention, update popovers to remove that thick border and make them look mo betta 2012-06-28 10:03:46 -07:00
Mark Otto
b77ed4a3a3 fix dropdowns in button groups after font-size hack 2012-06-25 20:57:04 -07:00
Mark Otto
244a9ab79d reverse the gradient on striped progress bars so it matches the active state when animated 2012-06-25 20:20:32 -07:00
Mark Otto
e7e183e55d Merge branch 'tekezo-patch-1' into 2.1.0-wip 2012-06-25 16:49:13 -07:00
Mark Otto
d65e815a48 use @textColor to change help-block/help-inline font color 2012-06-25 16:47:29 -07:00
Mark Otto
94a3d4eb14 reorder media queries 2012-06-25 16:25:50 -07:00
Mark Otto
8c2db7d7d6 prevent button group buttons from wrapping in tight spaces by removing floats and replacing with font-size: 0; inline-block hack 2012-06-25 15:47:07 -07:00
Mark Otto
78849cf52e remove jank fix for dt bold text 2012-06-25 15:09:39 -07:00
Mark Otto
cd466f1d0b add tests for table grid sizing, solve bugs in fluid table grid sizing 2012-06-25 14:37:35 -07:00
Mark Otto
27845e4492 #3223: make table row hover optional class 2012-06-25 14:11:37 -07:00
Mark Otto
508a93d9e3 make fixing of subnav work again 2012-06-24 21:07:20 -07:00
Mark Otto
6662f62236 remove subnav file, instead add an optional class for .navbar 2012-06-24 21:03:39 -07:00
Mark Otto
87af5d3bbe more subnav optimizations 2012-06-24 20:42:31 -07:00
Mark Otto
71669dda63 tons of docs cleanup in css, adding subnav to official components 2012-06-24 20:26:48 -07:00
Takayama Fumihiko
e80f37b600 ".linenums .tag" should be ".prettyprint .tag". 2012-06-24 15:26:39 +09:00
Mark Otto
160fe7ca59 create vars for responsive grid values, fixed and fluid, and document them in the customizer 2012-06-20 23:46:51 -07:00
Mark Otto
59153205b3 run make on js files 2012-06-20 23:46:29 -07:00
Mark Otto
3875a9f31b Merge branch 'marcusds-2.1.0-wip' into 2.1.0-wip 2012-06-20 20:26:59 -07:00
Mark Otto
b353565d4e add docs for fluid offsetting 2012-06-20 20:26:50 -07:00
Jacob Thornton
b2b000b750 change transition end name for opera 2012-06-20 10:40:56 -07:00
Mark Otto
d704d6f0ed #3861: add span to pagination selectors for full support of non-link pagination items 2012-06-19 23:37:47 -07:00
Mark Otto
ce140662a0 remove unused container reset 2012-06-19 20:01:03 -07:00
Mark Otto
9df832b4bb add separate vars for dropdown link hover and active states 2012-06-19 19:17:42 -07:00
Mark Otto
b54264cde0 add basic vertical button group support 2012-06-19 14:42:46 -07:00
Mark Otto
64ba423b6d #2764: add disabled styles to navs and dropdowns 2012-06-19 13:52:07 -07:00
Mark Otto
d14f06fc4e round select list corners 2012-06-19 13:25:35 -07:00
Mark Otto
b1cb556503 improve inline-block of append/prepend inputs with font-size: 0; 2012-06-14 11:56:46 -07:00
Mark Otto
2cbff258b9 fix examples page 2012-06-11 22:33:16 -07:00
Mark Otto
f453909f39 add a dropdowns section to Components (still needs work) and reformat much of the js docs 2012-06-11 21:48:41 -07:00
Mark Otto
5dd47f1196 keep tables at 13px in docs for now, clean up some modals js docs stuff 2012-06-11 20:33:00 -07:00
Mark Otto
7ed02b461b fix blockquote alignment 2012-06-11 20:20:51 -07:00
Mark Otto
a0cd886c56 rewrite the rest of the nav section 2012-06-10 21:24:13 -07:00
Mark Otto
017b7cb804 rewrite the navbar section 2012-06-10 20:39:00 -07:00
Mark Otto
0c817bf5e2 redo pagination and breadcrumbs 2012-06-10 16:46:46 -07:00
Mark Otto
3985379cca rearrange hero unit section 2012-06-10 15:14:21 -07:00
Mark Otto
f2e39233f5 rewrite alerts and progress bars sections 2012-06-10 15:12:02 -07:00
Mark Otto
c65006601e overhaul forms docs to simplify presentation of everything, reduce text, and increase visibility of examples 2012-06-09 19:15:46 -07:00
Mark Otto
aff3694f28 remove mention of prettify from docs, fix docs subnav width when fixed 2012-06-09 12:58:55 -07:00
Mark Otto
550e375af0 restore scrollspy to body 2012-06-08 16:35:04 -07:00
Mark Otto
269ce715f1 overhaul js docs top sections, update subhead 2012-06-07 22:24:47 -07:00
Mark Otto
bba0b34c36 restore top navs entirely 2012-06-07 22:10:36 -07:00
Mark Otto
c1c7528dd9 drop the side nav, restore topbar 2012-06-07 21:48:03 -07:00
Mark Otto
ff6dd0cf56 nav and content tweaks 2012-06-07 14:01:03 -07:00
Mark Otto
860a96939a fix grid tooltips, tweaks 2012-06-07 10:58:15 -07:00
Mark Otto
a1aa2b188a more content changes to docs 2012-06-07 10:20:52 -07:00
Mark Otto
2ecbd36cbf add back left rail nav, tweak colors 2012-06-06 00:48:31 -07:00
Mark Otto
5a614fb86d remove sidenav 2012-06-05 19:53:54 -07:00
Mark Otto
8ee0679522 updated javascripts for first pass at single column 2012-06-05 18:25:46 -07:00
Mark Otto
22918f8f92 more tweaks to layouts and some docs styles 2012-06-05 17:16:17 -07:00
Mark Otto
dd127611e1 two col scaffolding rev 2012-06-05 00:46:16 -07:00
Mark Otto
094e65eb9d adding 20px grid, setting that on docs 2012-06-04 23:58:51 -07:00
Mark Otto
de53f62a04 more changes to js and components, playing with new docs subnav 2012-06-04 23:57:48 -07:00
Mark Otto
446f9199c6 updated index page and footer 2012-06-04 23:31:26 -07:00
Mark Otto
f0ff20ec40 updating scaffolding page to single column 2012-06-04 23:10:30 -07:00
Mark Otto
c44bd1edf4 revamp docs to have new width, start realigning the base css page to match 2012-06-04 21:08:31 -07:00
Mark Otto
632c6d22a2 add bs-docs-examples styles from other branch 2012-06-04 20:57:58 -07:00
Mark Otto
eef87c96af #3684: reset width to auto for input type='image' 2012-06-04 20:27:42 -07:00
Mark Otto
8df906e641 Merge branch 'wachunga-2.0.4-wip' into 2.1.0-wip 2012-06-04 08:47:48 -07:00
Mark Otto
9cceb0bba7 Merge branch '2.0.4-wip' of https://github.com/wachunga/bootstrap into wachunga-2.0.4-wip 2012-06-04 08:47:41 -07:00
Mark Otto
5563b8448e fix #3693: rounded corners on search form 2012-06-04 08:45:51 -07:00
Mark Otto
37ba0eba02 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-06-04 08:33:48 -07:00
Mark Otto
eb3a4b8f75 fix placeholder for FF by attaching input and textarea when we call the mixin 2012-06-04 08:33:42 -07:00
Jacob Thornton
82ea5847a7 adds remote source to modal. Remote source can be specified in href or by providing a remote option #936 2012-06-03 21:26:54 -07:00
Jacob Thornton
041b8bdfd3 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 2012-06-03 11:24:51 -07:00
Jacob Thornton
31e8a358c3 check length so that pause, actually pauses 2012-06-03 11:24:19 -07:00
Mark Otto
ad9bfeef7a fix cut off icons 2012-06-02 22:34:20 -07:00
Mark Otto
9a4ee790e1 Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip 
Conflicts:
	docs/assets/js/bootstrap.min.js
 2012-06-02 22:14:12 -07:00
Mark Otto
9a3a297a47 update version # on homepage, crush assets 2012-06-02 22:12:45 -07:00
Jacob Thornton
2d3a0babd2 make active selector more specific #2043 and rebuild 2012-06-02 22:10:35 -07:00
Jacob Thornton
ebc1fe907d only trigger $.support.transition.end when it exists 2012-06-02 21:09:13 -07:00
Jacob Thornton
3a751a63d4 fix multi carousel bug #3194 2012-06-02 21:01:45 -07:00
Jacob Thornton
555a3b0478 fix carousel when hiding a reshowing - make sure it always triggers transition end #3248 2012-06-02 20:28:08 -07:00
Jacob Thornton
0b827965d3 fix regression in typeahead #3313 2012-06-02 19:31:30 -07:00
Jacob Thornton
354f99f0bd add length to parent dropdown check #3316 2012-06-02 19:02:30 -07:00
Jacob Thornton
4ca1cba3f8 upgrade jquery to 1.7.2 #3379 2012-06-02 18:25:07 -07:00
Jacob Thornton
b07b869b26 rebuild assets 2012-06-02 18:15:23 -07:00
Jacob Thornton
806a82ef83 add relatedTarget to carousel slide event 2012-06-02 18:06:00 -07:00
Jacob Thornton
f836473129 add html option back to tooltip and popover to explicitly prevent XSS #3421 2012-06-02 17:55:10 -07:00
Jacob Thornton
fc96bc8bba rebuild doi 2012-06-02 17:30:00 -07:00
Jacob Thornton
5b401a8c16 add collapsed class to collapse invoker when it's target is collapsed #3525 2012-06-02 17:28:38 -07:00
Jacob Thornton
5e5965ca6f Merge branch 'accessibility' into 2.1.0-wip 
Conflicts:
	docs/assets/js/bootstrap.min.js
	docs/javascript.html
	docs/templates/pages/javascript.mustache
 2012-06-02 16:11:35 -07:00
Jacob Thornton
ebc6935663 2.0.3 -> 2.0.4 2012-06-01 11:04:27 -07:00
Jacob Thornton
4eaeea81fd rebuild and fix test 2012-05-31 10:24:23 -07:00
Mark Otto
7875e4833c fix broken css tests, add fluid input-prepend/-append to tests, fix input-prepend/append for responsive for both fluid and fixed sizing 2012-05-28 17:32:24 -07:00
Mark Otto
f53a038088 remake after merging IE7/8 bugfix for animations 2012-05-28 17:17:55 -07:00
Mark Otto
9699e1d707 scope float right dropdown menus to immediate children 2012-05-28 01:13:24 -07:00
Corey Innis
8a06339501 fixes .placeholder to work as a "grouped selector" 
adding the `&` combinator to `.placeholder` makes it work for the global case (in forms.less) as well as within `.navbar-search .search-query`

the result can be seen in the generated bootstrap.css, which include the -ms vendor extension.
 2012-05-27 18:12:08 -07:00
Mark Otto
a7529e158b remove color from labels 2012-05-25 09:19:10 -07:00
Mark Otto
fe30bd6055 make bootstrap like google maps a bit more 2012-05-24 20:18:52 -07:00
Mark Otto
7fa9f605d6 recompile after adding ms-placeholder 2012-05-24 19:18:06 -07:00
Mark Otto
19489496c1 remove redeclared font styles from <p> and rebuild 2012-05-23 00:05:30 -07:00
Mark Otto
3b6b6eb242 fix field state mixin 2012-05-23 00:04:54 -07:00
Mark Otto
78790da03c fix resizing issues from incorrectly changing <767px grid classes to inline-block, fix height issue on textareas 2012-05-17 22:00:49 -07:00
Jacob Thornton
9889948f58 abandon activedescendant because it was awful 2012-05-17 00:39:14 -07:00
Jacob Thornton
a7b49a7d92 nearly everything working with activedescendant... then decide it's wrong. 2012-05-17 00:23:11 -07:00
Jacob Thornton
10c6db4b14 add proper role to dialog markup and cleanup modal logging 2012-05-16 19:43:22 -07:00
Jacob Thornton
4b53778150 Merge branch 'master' into 2.0.4-wip 2012-05-16 19:10:49 -07:00
Jacob Thornton
a404ac33bb modal accessibility tab control 2012-05-16 19:09:57 -07:00
Mark Otto
3a27b4e6f6 remake again after pull 2012-05-15 09:07:55 -07:00
Mark Otto
a9d4b667ff finish fixing uneditable-input and remake 2012-05-15 09:07:19 -07:00
Mark Otto
ecf84bdac5 correct regressions against 2.0.3 2012-05-15 00:17:02 -07:00
Mark Otto
a0809ceebe add forms test page for all html5 input types and refactor selectors 2012-05-14 23:40:06 -07:00
Mark Otto
826a8714e2 #3257: share .navbar-fixed-top styles with .navbar-fixed-bottom 2012-05-13 22:11:35 -07:00
Mark Otto
ea15660973 #3420: properly scope dropdown open state to immediate children only 2012-05-13 21:52:18 -07:00
Mark Otto
a2fb9ed42f #3449: make legend and form-actions the same border color 2012-05-13 17:43:04 -07:00
David Hirtle
452d8c1df0 Gradient mixins blow up in IE7/8 if you happen to use rgba() colors as params 2012-05-04 13:50:16 -07:00
Mark Otto
59ec4c7154 make responsive input fields not wrap for fluid input prepend/append by setting block back to inline-block (oversight of 2.0.3) 2012-04-30 15:40:49 -07:00
Mark Otto
6e9756ebb6 #3228: update docs to list dependencies from 2.0.3 for compiling via make 2012-04-30 15:30:56 -07:00
Jacob Thornton
ffb4d9025b rebuild with typeahead change 2012-04-25 22:15:39 -07:00
Jacob Thornton
a29e5a9dd6 fix #3234 2012-04-25 21:52:05 -07:00
Jacob Thornton
aaabe2a46c fix regression in resetting collapse to auto on collapse open. (+ add spec and rebuild) 2012-04-24 18:06:41 -07:00
Giuliano Velli
4fbb400754 Added Medias code and documentation 
Fix for Issue #1711

Added media.less and edited bootstrap.less and responsive.less to
manage media components.

Added a section to the documentation (Media, in components.html) outlining how Medias work. Edited bootstrap.css and bootstrap-responsive.css to add the code for the demos

Signed-off-by: Giuliano Velli <wpbrains@giusi.org>
 2012-04-24 17:19:17 +02:00
Mark Otto
5be84ad0b7 restore margins on thumbnails, add comments about it's changes and how responsive affects it 2012-04-24 06:45:21 -07:00
Mark Otto
f9744ff522 make component animations work cross browsers with opacity mixin, restore float on thumbnails > li 2012-04-24 06:39:14 -07:00
Jacob Thornton
839ef3a030 2.0.2 -> 2.0.3 2012-04-24 02:19:02 -07:00
Mark Otto
79d7092a39 Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 2012-04-24 02:12:09 -07:00
Mark Otto
d8aaf50798 implement ie7 fluid tests and semantic.gs IE7 hack for rounding in ie7; not perfect, but mostly solid 2012-04-24 02:11:59 -07:00
Jacob Thornton
fc871a4821 Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 2012-04-24 02:02:28 -07:00
Jacob Thornton
73453c7f79 changes for build in preperation for 2.0.3 release 2012-04-24 02:02:06 -07:00
Mark Otto
1c2db11d58 fix ie7 button group toggles and button borders 2012-04-24 01:46:20 -07:00
Mark Otto
805ca03457 fix #3179: cut off radios and checkboxes 2012-04-24 01:33:00 -07:00
Mark Otto
7f6f3ff462 fix #3202: add cursor to .accordion-toggle 2012-04-24 01:23:24 -07:00
Mark Otto
419e50e339 fix up buttons after recess property order 2012-04-23 10:06:35 -07:00
Mark Otto
091a97c01c white bg on docs again 2012-04-23 03:06:30 -07:00
Mark Otto
99a916d5eb remove background color from radios and checkboxes for IEs 2012-04-23 03:05:10 -07:00
Jacob Thornton
edb52a82d8 make bootstrap compile with Recess instead of Less 2012-04-18 16:16:42 -07:00
Jacob Thornton
bc07e2adae allow for pushstate in scrollspy 2012-04-18 13:35:14 -07:00
Jacob Thornton
b627898919 Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip 2012-04-18 13:15:58 -07:00
Jacob Thornton
8f98c4fbf6 offset -> position #3088 2012-04-18 13:15:13 -07:00
Mark Otto
47b6e6bd80 fix #3111, badge and label alignment with surrounding text 2012-04-18 09:47:30 -07:00
Jacob Thornton
f3cf4cbaae rebuild 2012-04-16 17:36:03 -07:00
Jacob Thornton
2881269e16 lots of property ordering 2012-04-16 16:34:08 -07:00
Jacob Thornton
457859feba Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip 2012-04-16 15:09:26 -07:00
Jacob Thornton
498b7d984a a few property reordering things 2012-04-16 15:09:05 -07:00
Jacob Thornton
6cf9906a60 build bootstrap.js and bootstrap.min.js into docs 2012-04-15 17:03:33 -07:00
Jacob Thornton
6506ede632 add bootstrap + bootstrap.min.js to gh-pages for @remy 2012-04-15 16:45:13 -07:00
Jacob Thornton
0b8042656f fixes #2941 + whitespace in collapse 2012-04-15 16:15:32 -07:00
Mark Otto
13e4d1d5ac fix #2990: text wrapping in .uneditable-input 2012-04-15 00:35:30 -07:00
Jacob Thornton
cad8f2b43a Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-04-15 00:20:50 -07:00
Jacob Thornton
2a6894d834 simplify make - move zipping to gh-pages only 2012-04-15 00:16:09 -07:00
Mark Otto
6c221d65e3 Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-04-15 00:06:35 -07:00
Mark Otto
a4c2332eb1 move js tooltip link 2012-04-15 00:06:11 -07:00
Jacob Thornton
c262ead6ed change comments to preserve for yui 2012-04-14 23:51:08 -07:00
Jacob Thornton
be0efcfcfc whitespace 2012-04-14 23:38:11 -07:00
Jacob Thornton
1ca1ef94ee fix opera bug \o/ !!!! #1776 2012-04-14 23:24:19 -07:00
Mark Otto
9e9be2dc0d fix #2989: clear .checkbox/.radio floats 2012-04-14 23:19:42 -07:00
Jacob Thornton
cf4924764c rebuild with tooltip formatting change 2012-04-14 23:11:19 -07:00
Mark Otto
2dbce887df Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-04-14 23:07:51 -07:00
Mark Otto
a6f27ebed4 ditch the .navbar in the selectors since it's the same specificity level, and thus superfluous 2012-04-14 23:06:00 -07:00
Jacob Thornton
c7dc4cc573 change position of var in dropdown + cleanup makefile vars 2012-04-14 22:43:36 -07:00
Mark Otto
8dc1a0eade Merge branch '2.0.3-wip-nav-collapse' of https://github.com/tierra/bootstrap into tierra-2.0.3-wip-nav-collapse 
Conflicts:
	docs/assets/bootstrap.zip
 2012-04-14 22:43:26 -07:00
Mark Otto
490eb1bd16 fix #3068: compile after changing comment 2012-04-14 20:56:50 -07:00
Mark Otto
fc7ae48c95 fix #1823: styles of tabs within other tabs resolved 2012-04-14 18:47:27 -07:00
Mark Otto
def7ae7798 bump version on docs homepage to 2.0.3 2012-04-14 18:30:43 -07:00
Mark Otto
4bcb89946b merge in #2684, offset on the .makeColumn mixin 2012-04-14 18:18:11 -07:00
Jacob Thornton
82267d48ff calling pause on a slide should actually pause it - even when hovering 2012-04-14 17:49:51 -07:00
Jacob Thornton
34132f0e89 rebuild 2012-04-14 17:19:00 -07:00
Mark Otto
ce30d19c15 Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-04-14 17:16:37 -07:00
Mark Otto
dbde2dc9e4 adding icon classes to finish off glyphicons 1.6 update 2012-04-14 17:15:16 -07:00
Jacob Thornton
3408064d00 hack for subnav 2012-04-14 17:15:03 -07:00
Mark Otto
d5063e5dc8 fix #3032: update glyphicons sprite to 1.6 release 2012-04-14 16:59:49 -07:00
Jacob Thornton
575f18aaf4 add jshint support + a few minor stylistic changes 2012-04-14 16:29:53 -07:00
Mark Otto
8575a45294 alt fix to #3029: change to single border-radii properties 2012-04-14 13:31:48 -07:00
Mark Otto
a7d8145a32 fix #3036: add bg color to inputs 2012-04-14 13:18:37 -07:00
Bryan Petty
5b85ed181a Fixed extra margin on Navbar buttons. 2012-04-10 15:22:17 -06:00
Mark Otto
48063afb3a Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-04-07 23:41:27 -07:00
Mark Otto
0b2d23d443 add larger .input-* to block reset for responsive <767 2012-04-07 23:41:09 -07:00
Mark Otto
5bc601d9a8 fix typo on js docs selector 2012-04-07 23:37:58 -07:00
Jacob Thornton
08fee005a8 https://github.com/twitter/bootstrap/issues/2954 2012-04-07 21:26:46 -07:00
Mark Otto
a20cd66ba4 clean up new input append examples 2012-04-07 16:49:06 -07:00
Mark Otto
3ecf109835 fix conflicts, add docs example for two buttons on an append 2012-04-07 16:44:03 -07:00
Mark Otto
0a71f171bc readd bootstrap.zip, add @inputBorderRadius var to close #2946 2012-04-07 16:17:15 -07:00
Mark Otto
f563b1db43 update kippt screenshot 2012-04-07 15:59:14 -07:00
Mark Otto
5591a9b966 use yui-compress by default instead of regular compress 2012-04-07 14:56:37 -07:00
Mark Otto
798363eda7 fix left margin on .thumbnails for responsive <767 2012-04-07 14:31:55 -07:00
Mark Otto
10ff5f16a6 fix #2968 manually: add consolas to monospace font stack 2012-04-07 14:25:58 -07:00
Bryan Petty
4b81c0dff3 Changed .nav-collapse to clear both instead of left, and added compiled files. 2012-04-05 14:13:16 -06:00
Jacob Thornton
4953629ccd Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-04-04 15:13:27 -07:00
Jacob Thornton
83febb3452 remake and add isHTML check to popover as well 2012-04-04 15:02:30 -07:00
Mark Otto
2ea437f353 fix #2908: unfloat inputs using .span* in fluid row 2012-04-02 22:49:19 -07:00
Mark Otto
4462f24753 fix #2911: correct /lib/ path to /less/ 2012-04-02 22:40:06 -07:00
Mark Otto
2988de6377 fix #2913: get more specific with button group selectors 2012-04-02 22:38:12 -07:00
Mark Otto
647f1c98ed fix #2296: allow fluid thumbnails 2012-04-01 01:05:00 -07:00
Mark Otto
fe05f9aeb2 fix #2572: streamline thumbnails css to allow for offsets 2012-04-01 00:59:34 -07:00
Mark Otto
33fa705c7f fix #2811: left and right aligned tabbable tabs fixes so that .tab-content grows to match parent's width 2012-04-01 00:15:04 -07:00
Mark Otto
d652af1097 fix #2860: truncate .dl-horizontal terms and reset to stacked for <767px layouts 2012-03-31 23:53:54 -07:00
Mark Otto
452ddc0f0d update less docs page to reflect changes in mixins (no more default values) and variable name fix 2012-03-31 21:36:45 -07:00
Mark Otto
f37d9aeaef fix #2856: make inputs using .span* classes responsive at <767px layout 2012-03-31 21:31:01 -07:00
Mark Otto
2355fd224d remove @shadow instances and replace with escaped values, update mixins to not use a default value at all 2012-03-31 21:06:16 -07:00
Mark Otto
56ecc6ba96 clarify use of dropdowns, href, and data-target for js docs; add tests to css tests page for it's display and execution in html 2012-03-31 12:31:56 -07:00
Mark Otto
37745cd899 fix fluid grid selectors to remove > in selectors 2012-03-31 00:53:38 -07:00
Jacob Thornton
2dc979a202 MSTransitionEnd + move paren (thanks rick waldron) 2012-03-29 14:14:17 -07:00
Jacob Thornton
0665c3ebf7 move over paren just because. 2012-03-29 13:55:56 -07:00
Jacob Thornton
422d04cb2b simplify transition plugin a little 2012-03-29 13:51:23 -07:00
Jacob Thornton
30b3f47e31 remove "technique" 2012-03-29 12:48:37 -07:00
Jacob Thornton
8ea8c312ea replace UA sniffing 2012-03-29 12:35:06 -07:00
Mark Otto
a9f9949b3e rearrange other parts of forms docs 2012-03-28 19:41:23 -07:00
Mark Otto
04baa07547 document .backface-visibility and update comments and initial value 2012-03-28 18:25:27 -07:00
Mark Otto
3308d1968f fix #2846: Firefox required two clicks on selects to get to options dropdown 2012-03-28 18:18:41 -07:00
Mark Otto
d6680a50b9 start rearranging form docs and clear up messaging about required classes and default styles 2012-03-28 18:00:05 -07:00
Mark Otto
369ca13c75 fix homepage link in css-tests and remove second help text from example form 2012-03-28 17:52:03 -07:00
Mark Otto
93d42ca80e fix #2832: clarify docs on use of .tabbable and add mention of .fade 2012-03-28 17:35:06 -07:00
Mark Otto
e41584afb5 fix #2829: redeclare .pull-right for navs since they get more specific floats 2012-03-28 17:02:13 -07:00
Mark Otto
0fe68de1a4 fix second booboo 2012-03-27 09:22:15 -07:00
Mark Otto
5b3268317c Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-03-27 09:21:35 -07:00
Mark Otto
d27fc24aa0 fix spelling booboo 2012-03-27 09:21:13 -07:00
Andreas Cederström
5d2062a3cc Finish of close conversion from a to button 2012-03-27 08:36:34 +02:00
Mark Otto
917f11e679 update LESS docs to note @baseFontSize and @baseLineHeight must be pixels 2012-03-26 09:30:42 -07:00
Mark Otto
d4914f47c3 fix #2799, mention of text in the navbar 2012-03-26 09:25:31 -07:00
Mark Otto
cffadd8c71 add position relative to .dropup 2012-03-25 22:28:43 -07:00
Mark Otto
4449c4e9e0 update docs messaging around alerts and buttons 2012-03-25 20:44:01 -07:00
Mark Otto
473e5714f7 change all anchor alert closes to buttons 2012-03-25 20:41:59 -07:00
Mark Otto
ea437351ed add heads up note for required href on alert dismiss actions 2012-03-25 19:47:13 -07:00
Mark Otto
4893928310 add back href for alerts in components docs to make close work on iphone 2012-03-25 18:03:30 -07:00
Mark Otto
825227474b add refresh method documentation to js docs to close #2028 and #2795 2012-03-25 17:37:38 -07:00
Mark Otto
3e2e111b17 add css tests for fluid rows and inputs 2012-03-25 17:11:50 -07:00
Mark Otto
95c2877ffc remove > in fluid grid selectors, fix double padding issue on fluid layout and example 2012-03-25 16:41:46 -07:00
Mark Otto
8d52e6d458 change arrows in one pagination example because opera janks it up, per #2697 2012-03-25 14:51:54 -07:00
Mark Otto
4c3e7690ba jankify the IE7 horizontal forms a bit more to account for no labels before .controls, per #2728 2012-03-25 14:46:47 -07:00
Mark Otto
cbd77d0aeb give IE7 inline-block behavior for input-prepend/append 2012-03-25 14:37:19 -07:00
Mark Otto
d0526e31fa remove padding on .search-query for IE7-8 since it doesn't pick up large border-radius 2012-03-25 14:31:04 -07:00
Mark Otto
c0f28d81b0 Remove black border on buttons in IE7: 
1. Removed borders on .btn and increased line-height 2px to compensate
2. Set buttons to use the endColor of the gradient as the background-color by default for extra contrast between button and background
3. Set a 5% darker background-color on hover of buttons just for IE7
 2012-03-25 14:28:24 -07:00
Jacob Thornton
a62810918f fix responsive navbar 2012-03-25 13:33:36 -07:00
Mark Otto
a5552a1d70 revert bart's mixin fix 2012-03-25 12:42:47 -07:00
Mark Otto
b81a082cd1 add navbarheight support to .brand and .nav links in navbar 2012-03-25 12:32:29 -07:00
Mark Otto
6c5c29ada2 introduce .navbar-link to resolve issue with buttons in .navbar-text 2012-03-25 01:21:47 -07:00
Mark Otto
a7b8e52f8e Overhaul the responsive utility classes: 
1. Rename file from responsive-utility-classes.less to responsive-utilities.less
2. Add additional help text around the documentation for the classes in Scaffolding
3. Remove unnecessary display values on initial classes
4. Drop block values for inherit for better support on inline and table elements
5. Make use of \!important on every class to avoid classes with more specific selectors (e.g., .span* classes for the grid)
 2012-03-25 01:12:51 -07:00
Mark Otto
d1864b3608 adding 144x144 ipad touch icon 2012-03-25 00:46:03 -07:00
Mark Otto
1837b8ef2c remove height: auto on images since it interferes with inline dimensions 2012-03-25 00:20:30 -07:00
Mark Otto
223c8358ce Merge branch 'andreasbovens-master' into 2.0.3-wip 2012-03-25 00:07:09 -07:00
Jacob Thornton
3e7920820a add missing closing brace 2012-03-24 20:01:51 -07:00
Jacob Thornton
f02d017ffa return matcher value directly + cleanup first lines of files 2012-03-24 18:59:04 -07:00
Jacob Thornton
6dc59a9c3e add explict note that tooltip delay isn't applied to manual trigger type in popover/tooltip 2012-03-24 18:45:12 -07:00
Jacob Thornton
bccc2cb719 add preventDefault support for all inital event types (show, close, hide, etc.) + fix small bug with scrollspy.last 2012-03-24 18:20:09 -07:00
Jacob Thornton
ef5ac02b69 allow prevent default for show and hide event in modal 2012-03-24 17:50:21 -07:00
Andreas Bovens
de0aaff433 Added -o- and -ms- prefixes to animations CSS 
Added -o- and -ms- prefixes to make the animated progress bars to work
in the latest/upcoming versions of IE and Opera.
 2012-03-24 18:53:27 +01:00
Mark Otto
f9f03d8976 Merge branch 'bartt-master' into 2.0.3-wip 
Conflicts:
	docs/assets/bootstrap.zip
	docs/assets/css/bootstrap.css
	less/button-groups.less
 2012-03-23 20:56:48 -07:00
Mark Otto
c7afe382a2 fix other instances of mixins, swap use of box-shadow everywhere, include border-radius and transition 2012-03-23 20:56:04 -07:00
Mark Otto
f87e4c60e9 Merge branch '2.1.0-wip' into 2.0.3-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-03-23 18:29:21 -07:00
Mark Otto
a57554222f Merge branch '2.0.3-wip' of https://github.com/andriijas/bootstrap into andriijas-2.0.3-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-03-23 09:53:04 -07:00
Mark Otto
0b41984920 Fix #2758: Uneditable inputs in input-prepend/append 
1. Added a missing comma to the input-append's form control stack () to fix border-radius
2. Add  to the .uneditable-input in forms to remove the float as we do with all other form controls
 2012-03-23 09:47:57 -07:00
Andreas Cederström
eb4f708b91 badge-error => badge-important 2012-03-23 13:35:46 +01:00
Mark Otto
5179df1928 css tests cleanup 2012-03-23 01:31:22 -07:00
Mark Otto
de7aee2465 fix broken tables with double borders and such, add css tests page to start with table edge cases 2012-03-23 01:28:04 -07:00
Mark Otto
622b8fa3f0 adding blog link to docs homepage 2012-03-23 01:13:20 -07:00
Mark Otto
e84161076b add mention of transitions plugin requirement on collapse 2012-03-23 00:58:41 -07:00
Mark Otto
281e058ef2 fix #2613: labels hang too low 2012-03-23 00:40:10 -07:00
Mark Otto
ee3fc11add fix #2617: add negative margin to fixed-bottom navbar 2012-03-23 00:38:13 -07:00
Mark Otto
2729d15742 fix #2625 manually: account for dropup caret on large button 2012-03-23 00:37:15 -07:00
Mark Otto
b8d8ab1aad run make on merge of progress bars change 2012-03-23 00:28:58 -07:00
Mark Otto
a28fa20018 remove redundant max-width img from docs css 2012-03-22 23:49:39 -07:00
Mark Otto
c4fb703269 fix left and right tab-content alignment with width: auto; 2012-03-22 23:38:50 -07:00
Mark Otto
ac64d9405b Dropdowns overhaul: 
1. Removed broken and unused dropup examples from the navs/pills docs
2. New defaults for dropdown menus: all corners are rounded and always 1px offset from top unless otherwise specified
3. Refined active and open states for button dropdowns by adding a darker background color for each button variation when opened; also changed the opened dropdown-toggle's inset shadow to match that of an :active button
4. Generalized .dropdown.open to just .open, thus removing a few lines from button-groups.less.
5. Annnnnnnnnd I think that's it.
 2012-03-22 23:09:31 -07:00
Mark Otto
50b2245be5 restore max-width 100% for images 2012-03-22 22:06:23 -07:00
Mark Otto
ab068f6fda bump version numbers in css files to 2.0.3, break out responsive CSS into separate files for further customization 2012-03-22 21:33:06 -07:00
Mark Otto
bdf8a6966b remove labels and badges from customizer and replace with single file 2012-03-22 21:17:55 -07:00
Mark Otto
dbadac183d add new @formActionsBackground to customize page 2012-03-22 21:09:27 -07:00
Mark Otto
1852d077bf add shell of tests page, lighten form actions background and give it a variable 2012-03-22 21:08:41 -07:00
Mark Otto
b011daf67f finish adding remaining component variables to less docs page 2012-03-22 19:36:55 -07:00
Mark Otto
254bb40f00 remove mentions of unused button variable per #2537 2012-03-22 17:49:13 -07:00
Mark Otto
edca6f28f0 fix #2718, misaligned uneditable inputs in prepends/appends 2012-03-22 17:41:20 -07:00
Mark Otto
b7b84c7a0d remove bug in docs for example icon in an input-prepend by removing margin on any input/select/etc in an input-prepend/append 2012-03-22 17:36:32 -07:00
Mark Otto
ceab161324 fix unescaped reset filter per #2575 2012-03-22 17:31:09 -07:00
Mark Otto
1a6a1828bf remove mention of siteWidth, no longer used 2012-03-22 17:23:20 -07:00
Mark Otto
42f636032c fix #2716, incorrect required markup for navbar search form 2012-03-22 17:22:19 -07:00
Mark Otto
e0c85fb69c use new font-stack mixins in base and alt font family mixins 2012-03-22 17:18:07 -07:00
Mark Otto
89ea238c32 move navbarBrandColor closer to link color 2012-03-22 17:13:20 -07:00
Mark Otto
b59cb505f8 Merge branch 'brand-link' of https://github.com/ctalkington/bootstrap into ctalkington-brand-link 
Conflicts:
	docs/assets/bootstrap.zip
 2012-03-22 17:12:22 -07:00
Mark Otto
fa1b3bdda4 Merge branch 'Synchro-master' into 2.0.3-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-03-22 17:10:16 -07:00
Mark Otto
d7af2714c6 remove separate badges and labels, add single file instead, remove hover from non-link badges/labels 2012-03-22 16:02:00 -07:00
Marcus Bointon
239c178b68 Clarify docs on how tabs are activated from JS, see #1000 2012-03-22 21:24:57 +01:00
Marcus Bointon
cfce34e300 Add more examples for activating tabs 
Make naming of tab id consistent
 2012-03-22 20:36:49 +01:00
Jacob Thornton
b3bf223617 filter out non matches in map 2012-03-21 23:59:27 -07:00
Jacob Thornton
20e085723b cache $(href) lookup 2012-03-21 23:51:32 -07:00
Jacob Thornton
706ee46b73 sort scrollspy to prevent flicker for unordered nav 2012-03-21 23:45:58 -07:00
Jacob Thornton
94b24aaa47 clear timeout to reset delays for tooltip/popover 2012-03-21 21:57:06 -07:00
Jacob Thornton
22963d7346 Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-03-21 21:37:17 -07:00
Jacob Thornton
d5fb653914 top stripping leading and trailing whitespace + always use .html method 2012-03-21 21:35:02 -07:00
Marcus Bointon
2f06366399 Make changes in page templates, rebuild 2012-03-21 12:09:00 +01:00
Jacob Thornton
cb8dcfcebf if transitioning collapse, don't start new transition 2012-03-20 22:43:27 -07:00
Jacob Thornton
663e41d74f prevent dropdowns from closing when clicking inside form element inside dropdown 2012-03-19 23:13:55 -07:00
Jacob Thornton
63bd7cb478 fix slide logic for ie+ in carousel 2012-03-19 21:39:39 -07:00
Jacob Thornton
bce33bbb09 if parent in collapse, only grab children 2012-03-19 21:10:55 -07:00
Jacob Thornton
630ff4ff7d fix collapse bug in ie7+ for initial collapse in 2012-03-19 20:51:20 -07:00
Jacob Thornton
07d23b927e add activate to scrollspy docs 2012-03-19 20:29:22 -07:00
Jacob Thornton
67f199678c if interval is false, do not autocycle the carousel 2012-03-19 15:48:57 -07:00
Jacob Thornton
bf59220b87 ;) 2012-03-19 15:19:01 -07:00
Jacob Thornton
5a2c7eb50a select last item in scrollspy if you've reached the bottom of the document or element 2012-03-19 15:18:00 -07:00
ctalkington
bf09c979ca make brand links follow navbarLinkColor but also be customizable in advanced cases. 2012-03-15 14:21:27 -05:00
Jacob Thornton
8e0afbeaa4 update hide text to h5bp technique #2586 2012-03-14 12:00:27 -07:00
Jacob Thornton
59503e71ff 2.0.2 derp 2012-03-12 14:09:38 -07:00
Jacob Thornton
8182b1ef69 make docs again for 2.0.2 2012-03-12 14:03:24 -07:00
Jacob Thornton
1f7a64aa3d 2.0.2 2012-03-12 14:00:19 -07:00
Jacob Thornton
6d4867e799 remove commented out width 2012-03-12 13:45:36 -07:00
Jacob Thornton
56fe54df43 remove collapse class on open so that dropdowns are viewable 2012-03-12 13:37:44 -07:00
Jacob Thornton
cd89c34d99 can't have overflo: visible for "in" which is present during entirity of transition. 2012-03-12 13:31:38 -07:00
Mark Otto
7f3a2b3813 button group sizes for ie7 fixes 2012-03-12 12:44:47 -07:00
Mark Otto
e12c66aabe adding border variable for dropdowns, making dropdown carets use dropdown vars 2012-03-12 09:57:10 -07:00
Mark Otto
40fddffeec improve button docs 2012-03-12 09:38:12 -07:00
Mark Otto
685039d608 add a super jank fix for horizontal-forms and .input-prepend/append in IE7 2012-03-12 00:16:01 -07:00
Mark Otto
c35b04cccd enable buttons in input-append and input-prepend 2012-03-11 23:43:19 -07:00
Mark Otto
debc4b752f more homepage links cleanup, ditching the middots 2012-03-11 23:34:22 -07:00
Mark Otto
f4b51b373b more homepage links cleanup 2012-03-11 23:33:52 -07:00
Mark Otto
d36f3d0a59 clean up links on docs homepage and add link to direct download with docs 2012-03-11 23:33:08 -07:00
Mark Otto
7c2ed0c095 resolve #1972, allowing add-ons at beginning and end of input-prepend/append 2012-03-11 23:21:38 -07:00
Mark Otto
5eed370856 fix more spacing issues with input append/prepend 2012-03-11 23:14:36 -07:00
Mark Otto
58cb7c631d simplify code for input-prepend/append in inline and search forms 2012-03-11 23:12:45 -07:00
Mark Otto
91eef351e4 remove need for floats and IE hacks for input-prepend and input-append--boom 2012-03-11 22:58:14 -07:00
Mark Otto
0630cd62b3 rewrite the fluid grid mixin to be simpler, per #2370 2012-03-11 22:45:10 -07:00
Mark Otto
0090fa1a6e fix overflow on .collapse.in to enable dropdowns within an open collapse 2012-03-11 22:43:35 -07:00
Mark Otto
ac7f571e53 enable button groups in modal-footer by removing 5px added margin between .btn 2012-03-11 22:28:37 -07:00
Mark Otto
e5a284d442 merge #2476 to allow for custom popover arrow colors 2012-03-11 22:26:07 -07:00
Mark Otto
5a28bd1e78 fix vertical align issue with labels in IE9 2012-03-11 21:44:00 -07:00
Mark Otto
ee5d2ec91a add block level input mixin for border-box box-sizing 2012-03-11 21:21:51 -07:00
Mark Otto
c8f4325c19 remove text indent on carets (not needed) and add inline replacement mixin 2012-03-11 21:12:59 -07:00
Mark Otto
67714d8347 remove the unused text-indent on dropdown carets 2012-03-11 20:38:17 -07:00
Mark Otto
0f23883283 fix broken dropdowns in ie7 per #2333 2012-03-11 20:16:39 -07:00
Mark Otto
2e52946fd3 fix lingering tables bug 2012-03-11 20:03:55 -07:00
Mark Otto
4109c62cf7 fix table border bug with double borders on theads and use of colgroup 2012-03-11 18:18:18 -07:00
Mark Otto
7154e378b2 use variable for navbar text line-height 2012-03-11 17:53:17 -07:00
Mark Otto
8fd126ba1b updated apple touch icons and moved input responsive fix from <480 to <767 2012-03-11 17:28:28 -07:00
Mark Otto
ce292a8bb8 fix overflowing thumbnails in responsive <767px layouts 2012-03-11 15:15:55 -07:00
Mark Otto
a97b9c1122 in responsive layouts <767px, ensure inputs are not larger than 100% with box-sizing and a max-width 2012-03-11 14:41:52 -07:00
Mark Otto
bf6cdff88a vertical align middle on images, run make to rebuild 2012-03-11 13:48:47 -07:00
Mark Otto
ad1e9697ae update grid system mixins in less docs for new grid 2012-03-11 13:48:04 -07:00
Mark Otto
e8ef7d5e7b tweak button sizes on homepage 2012-03-11 00:06:48 -08:00
Mark Otto
349bdc12a7 ensure right align dropdown example doesn't go all the way off page 2012-03-10 18:15:28 -08:00
Mark Otto
635ee36e11 fix gradient mixins by escaping them, add notes on progress bars 2012-03-10 18:03:59 -08:00
Mark Otto
6e72760de5 fix js typo per #2471 2012-03-10 17:38:09 -08:00
Mark Otto
5de8b277c6 add vars for navbar search 2012-03-10 16:21:34 -08:00
Mark Otto
a3e9fc547c clean up search form in navbar, add new variable for placeholder text color 2012-03-10 16:15:54 -08:00
Mark Otto
f4ac080f9e fix #2510, docs typo 2012-03-10 16:06:56 -08:00
Mark Otto
1dbb942d5b massive update to customize page to include all the new variables (and ensure they're being used in the .less files) 2012-03-10 16:01:06 -08:00
Mark Otto
95a3cd8732 simplify notes around using button dropdowns 2012-03-10 15:41:41 -08:00
Mark Otto
cecfe72060 remove unused images, update examples to include soundready 2012-03-10 15:37:28 -08:00
Mark Otto
145a36323c add new example site thumbnail 2012-03-10 15:15:13 -08:00
Mark Otto
9c1d8e032b change title attr to re-include twitter 2012-03-10 15:14:54 -08:00
Mark Otto
700457c62a remove unused example diagrams 2012-03-10 15:09:35 -08:00
Mark Otto
67aa00d0bb make pre font-size a percentage of @baseFontSize 2012-03-10 14:36:58 -08:00
Mark Otto
aef230d40a fix typo per #2494 2012-03-10 14:20:46 -08:00
Mark Otto
f7d4fb61ce Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 
Conflicts:
	docs/assets/bootstrap.zip
 2012-03-10 14:12:29 -08:00
Mark Otto
dd5cffc308 add button sizes to docs for button dropdowns, clean up styles for them 2012-03-10 13:40:58 -08:00
Mark Otto
c7eb1ab49a make nav padding and negative margins the same 2012-03-10 13:24:46 -08:00
Jacob Thornton
a07851d6af stop doing oldschool escape substitution 2012-03-10 13:01:17 -08:00
Jacob Thornton
04851652db rebuild with latest grid changes - need 1.3 to build! 2012-03-10 12:45:09 -08:00
Jacob Thornton
1fd5e55881 Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip 
Conflicts:
	docs/assets/bootstrap.zip
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
 2012-03-10 12:42:39 -08:00
Jacob Thornton
1a8d7576e0 Merge branch 'new_grid' into 2.0.2-wip 
Conflicts:
	docs/assets/bootstrap.zip
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	less/mixins.less
 2012-03-10 12:41:41 -08:00
Mark Otto
9ebc6b4c97 simplify buttons docs section by changing a buttons to button elements 2012-03-10 11:37:34 -08:00
Mark Otto
5d961eaeb3 rebold headings 2012-03-10 11:29:57 -08:00
Mark Otto
f4e879a936 fix the font-family var by using inherit instead of empty string, fix font-weight in docs for jumbotron 2012-03-10 11:27:07 -08:00