0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Commit Graph

3663 Commits

Author SHA1 Message Date
Mark Otto
094767fbfe code changes 2013-01-15 14:34:04 -08:00
Mark Otto
267690eb1b docs changes, more type improvements, add grid system basics back 2013-01-15 14:30:00 -08:00
Mark Otto
09696143e0 type and stuff 2013-01-15 10:14:12 -08:00
Mark Otto
25c9b6b59a nuke and flatten and stuff 2013-01-14 22:05:55 -08:00
Mark Otto
d247f71217 Reset docs jumbotron button to blue defaults 2013-01-13 04:27:51 -08:00
Mark Otto
7d8d5c7838 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap-affix.js
	docs/assets/js/bootstrap-alert.js
	docs/assets/js/bootstrap-button.js
	docs/assets/js/bootstrap-carousel.js
	docs/assets/js/bootstrap-collapse.js
	docs/assets/js/bootstrap-dropdown.js
	docs/assets/js/bootstrap-modal.js
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap-scrollspy.js
	docs/assets/js/bootstrap-tab.js
	docs/assets/js/bootstrap-tooltip.js
	docs/assets/js/bootstrap-transition.js
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/components.html
	docs/css.html
	docs/examples/fluid.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	docs/templates/pages/extend.mustache
	docs/templates/pages/getting-started.mustache
	docs/templates/pages/index.mustache
	docs/templates/pages/javascript.mustache
	js/bootstrap-affix.js
	js/bootstrap-alert.js
	js/bootstrap-button.js
	js/bootstrap-carousel.js
	js/bootstrap-collapse.js
	js/bootstrap-dropdown.js
	js/bootstrap-modal.js
	js/bootstrap-popover.js
	js/bootstrap-scrollspy.js
	js/bootstrap-tab.js
	js/bootstrap-tooltip.js
	js/bootstrap-transition.js
	js/bootstrap-typeahead.js
	less/bootstrap.less
	less/buttons.less
	less/forms.less
	less/navbar.less
	less/popovers.less
	less/responsive-767px-max.less
	less/responsive.less
	less/tables.less
	less/tooltip.less
	less/type.less
	less/variables.less
	package.json
2013-01-13 04:26:52 -08:00
Mark Otto
76ed6b0b2c Remove comment out code and simplify what's left for button group toggles 2013-01-13 04:05:34 -08:00
Mark Otto
1916eb7c7f Fix btn link hover and tweak dropdown border/shadows 2013-01-13 04:04:16 -08:00
Mark Otto
0b31cfc90e Fix up .brand in navbar of docs 2013-01-12 20:10:42 -08:00
Mark Otto
01db5db2f6 white text on buttons on hover for links 2013-01-12 20:08:13 -08:00
Mark Otto
4b34f4947a Update Holder.js 1.6 to 1.9 2013-01-12 19:49:15 -08:00
Mark Otto
ea1a12593d Nuke shadow on pagination 2013-01-12 19:46:47 -08:00
Mark Otto
8670021935 fixed navbars fixings 2013-01-12 19:44:51 -08:00
Mark Otto
1ea647ce98 Remove shadows from active links in navbar 2013-01-12 19:02:58 -08:00
Mark Otto
7bcd02c167 Tweak button 2013-01-12 19:02:48 -08:00
Mark Otto
583fc4b962 buttons and button group flattening improvements 2013-01-12 18:52:06 -08:00
Mark Otto
fb4fc323a2 remove font-sizes from button group btn sizes 2013-01-12 17:54:30 -08:00
Mark Otto
a9a66e9c34 finetune buttons flattened colors 2013-01-12 17:51:57 -08:00
Mark Otto
ff02043bbc Flatten navbar 2013-01-12 14:31:18 -08:00
Mark Otto
a33d45f308 Merge branch '3.0.0-wip' into bs3-flatten 2013-01-12 14:16:49 -08:00
Mark Otto
24f7df15e6 Remove mention of Extend page from readme and index page 2013-01-12 13:57:41 -08:00
Mark Otto
b1f0a7e62b Remove Extend page from the docs entirely
* Information was old and out of date on compiling Bootstrap
* Information was also not directly related to Bootstrap with background info on Less and apps for compiling (Google it, yo)
* Starter template and recommended HTML is already in use on the Getting Started page
2013-01-12 13:46:07 -08:00
Mark Otto
7a3f078fb4 Remove parent div from pagination component
* No more div.pagination; it's now just ul.pagination
* No more .pagination-right or .pagination-centered
* Sizes remain
* Any further customization, such as alignment, should be done on the individual application or site level.
2013-01-12 13:15:19 -08:00
Mark Otto
6f275c6148 Update extend page to point to readme for compiling.
Note that we'll be dropping this page entirely as it's out of date and other compiling options are not recommended for contributing back to the project.
2013-01-12 12:41:01 -08:00
Mark Otto
a7231854c9 Address #6459 and add mention of disabled links in dropdowns to le docs 2013-01-12 00:33:12 -08:00
Mark Otto
8a16746542 Merge pull request #6462 from cvrebert/input-required-docs-fix-2.3.0
update 2.3.0 docs to reflect #5786
2013-01-12 00:29:34 -08:00
Mark Otto
3773b99969 Merge pull request #6463 from cvrebert/input-required-docs-fix-3.0.0
update 3.0.0 docs to reflect #5786
2013-01-12 00:29:23 -08:00
Mark Otto
e195457728 Merge pull request #6472 from RWOverdijk/patch-1
Update composer.json
2013-01-12 00:21:08 -08:00
Mark Otto
aaf80d410a fix username navbar text in fluid example for responsive variations 2013-01-12 00:20:13 -08:00
Mark Otto
19e2ad0eb6 Fixes #6538: Add th support to all the .table-rounded selectors 2013-01-11 23:38:53 -08:00
Mark Otto
6f894c62a5 Fixes #6528: Make .navbar a:hover .caret use @navbarlinkcolorhover and not -active 2013-01-11 23:35:22 -08:00
Mark Otto
42efd9f730 Address #6545: clarify initialization of tooltips in docs 2013-01-11 20:58:24 -08:00
Mark Otto
4de3a77a64 Fixes #6547: Make blockquotes use multiple of @baseFontSize 2013-01-11 20:55:09 -08:00
Mark Otto
88e816956a Fixes #6552: example fix for button group 2013-01-11 20:52:39 -08:00
Mark Otto
b242ff7851 Fixes #6553: example fix for validation states 2013-01-11 20:51:11 -08:00
Mark Otto
767a293b4d Increase input group margin on bottom and vertically center to match inputs 2013-01-11 20:46:21 -08:00
Mark Otto
56a24027c3 Fixes #6473: Make .input-prepend and .input-append inline-block to match other form states 2013-01-11 20:42:44 -08:00
Mark Otto
d3b3b4c48f Fixes #6474: remove duplicate .btn border colors to make @btn-border work 2013-01-11 20:40:17 -08:00
Mark Otto
d7c93fc647 Fixes #6478: scope table backgrounds to immediate td/th elements 2013-01-11 20:38:14 -08:00
Mark Otto
53f9e25150 Comment fix 2013-01-11 20:30:56 -08:00
Mark Otto
7b3f74311e Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip 2013-01-11 20:27:00 -08:00
Mark Otto
7626cc629f Remove overflow: auto; from .tab-content 2013-01-11 20:26:48 -08:00
Mark Otto
b9b5cd786d Fixes #6555: remove .controls-row from responsive 2013-01-11 20:23:37 -08:00
Mark Otto
0f34666f07 Merge pull request #6550 from Boulox/font-variable-fix
Add glyphicons font path variable
2013-01-11 11:11:32 -08:00
Mark Otto
649d8c985e Remove navbar links from sticky footer navbar example 2013-01-11 11:00:45 -08:00
Mark Otto
839f83c610 Merge branch 'wilfra-patch-2' into 2.3.0-wip 2013-01-11 10:58:17 -08:00
Fabien
c91bf424b0 Add glyphicons font path variable 2013-01-11 18:32:00 +01:00
Mark Otto
6e5a2fedaa Nuke .popover-inner from the JS since we nuked it from the CSS/HTML long ago 2013-01-10 18:51:04 -08:00
William Franceschine
cf852c1f62 Update docs/examples/marketing-narrow.html
Updated copyright to 2013
2013-01-10 02:14:14 -08:00
William Franceschine
9fdc9887cf Update docs/examples/marketing-alternate.html
Updated copyright to 2013
2013-01-10 02:13:57 -08:00