Commit Graph

314 Commits

Author SHA1 Message Date
Arnold Daniels
695c18090a Merge branch 'master' of git://github.com/twitter/bootstrap into 2.3.0-j4
Fixed variables when loading custom.json

Conflicts:
	Makefile
	README.md
	component.json
	composer.json
	docs/assets/css/bootstrap-responsive.css
	docs/assets/js/application.js
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/index.html
	docs/javascript.html
	docs/templates/pages/index.mustache
	docs/templates/pages/javascript.mustache
	js/bootstrap-typeahead.js
	package.json
2013-02-20 02:16:44 +01:00
Mark Otto
2fa77bf197 Update link to changelog 2013-02-05 22:46:45 -08:00
Mark Otto
f20c3368e4 Update pagination example HTML to match examples 2013-01-30 17:42:03 -08:00
Yohn
60bb95e611 adding class to example code 2013-01-16 07:45:31 -05:00
Mark Otto
f9ee99cf6f Upgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing 2013-01-14 00:11:55 -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
88e816956a Fixes #6552: example fix for button group 2013-01-11 20:52:39 -08:00
Arnold Daniels
ef7599fd94 Fixed comments in bootstrap-fileupload.js 2012-12-26 10:44:48 +01:00
Arnold Daniels
8727176325 Fix Submit issues link in site footer. Fixes #36 2012-12-25 05:40:15 +01:00
Quy Ton
a27bf30f0d Miscellaneous changes to docs 2012-12-20 21:38:53 -08:00
Arnold Daniels
b883581511 Added links to jasny.net 2012-12-14 16:35:19 +01:00
Arnold Daniels
eaad32b34f Added responsive tables 2012-12-14 16:27:33 +01:00
Arnold Daniels
f997a9ada7 Merge branch 'master' of git://github.com/twitter/bootstrap into 2.2.2-j3
Conflicts:
	Makefile
	README.md
	component.json
	docs/assets/css/docs.css
	docs/assets/img/bs-docs-bootstrap-features.png
	docs/assets/img/bs-docs-responsive-illustrations.png
	docs/assets/img/bs-docs-twitter-github.png
	docs/assets/js/bootstrap-typeahead.js
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/base-css.html
	docs/components.html
	docs/customize.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/layout.mustache
	docs/templates/pages/customize.mustache
	docs/templates/pages/index.mustache
	js/bootstrap-typeahead.js
	package.json
2012-12-10 00:22:22 +01:00
Quy Ton
81679981c5 Escape × 2012-12-05 15:28:14 -08:00
Mark Otto
12916b06aa Fix up display of dropdown submenu examples on responsive views 2012-12-04 18:25:16 -08:00
Mark Otto
0f2a423b8d Once more, update all the favicons to retina 2012-12-03 13:25:56 -08:00
Mark Otto
15a4399015 Align the touch icons attributes 2012-12-03 13:22:10 -08:00
Mark Otto
acc037de15 add holder and replace placehold.it 2012-11-29 20:59:14 -08:00
Arnold Daniels
176ab8f778 Merge branch 'master' of git://github.com/twitter/bootstrap into 2.1.1-j3-wip
Conflicts:
	Makefile
	README.md
	docs/assets/css/docs.css
	docs/assets/js/bootstrap.min.js
	docs/base-css.html
	docs/build/index.js
	docs/components.html
	docs/customize.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/layout.mustache
	docs/templates/pages/index.mustache
	js/bootstrap-typeahead.js
	package.json
2012-11-29 23:58:46 +01:00
Mark Otto
8df2811d49 Simpler footer for docs
* Remove back to top link (ya'll are lazy :P)
* Center text
* Decrease vertical padding
2012-11-21 23:29:20 -08:00
Mark Otto
ead5dbeba5 Fixes #5775: Collapse labels/badges
* When :empty, display: none;
* Add documentation for change in behavior
2012-11-03 13:18:23 -07:00
Mark Otto
d5697fcf6b fixes #5717: add retina favicon, recompile docs 2012-10-31 10:41:41 -07:00
Arnold Daniels
cf5ac2d729 Fixed docs: bordered tabbable 2012-10-16 15:02:12 +02:00
Arnold Daniels
9fcb8deb18 Use correct version in docs + readme + Makefile
Added the use of versions for Google analytics
Changed favicon
Modified package.json
2012-10-15 13:57:51 +02:00
Bradly Feeley
ed5c5994a7 Fixing typo in docs. 2012-10-13 18:31:41 -07:00
Arnold Daniels
ee0c1b4c62 Merge remote-tracking branch 'twitter/master' into 2.1.0-j2-wip 2012-10-09 13:37:41 +02:00
Mark Otto
6203535d2f Changing title of docs pages to simply say 'Bootstrap' like the docs home page 2012-10-07 21:38:28 -07:00
Mark Otto
e73cd15fc8 copy and style changes to improve docs rendering on mobile devices 2012-10-02 17:01:18 -07:00
Mark Otto
a2369021ce fixes #5352: update docs messaging for disable nav links 2012-10-02 15:10:22 -07:00
Mark Otto
1b814458c9 improve dropdown submenu docs; add docs for left submenu; remove all dupe css for left submenu 2012-10-01 16:41:13 -07:00
Mark Otto
86d5ed6f4f fixes #5377: change selectors for navbar collapse to be unique so only one open/closes at a time 2012-10-01 13:52:50 -07:00
Arnold Daniels
9e82eba470 Build 2.1.0-j2-wip 2012-09-27 15:19:58 +02:00
Mark Otto
443c43f6c4 fixes #5102, #5166, #5194, #5205: add overflow: visible; to .nav-collapse.collapse so that dropdowns overflow correctly in the navbar in IE7-8 2012-09-20 10:28:27 -07:00
Mark Otto
2d90c816ac add new vars for common border-radius, upping border-radius of inputs to 4px; add border-radius changes to -large, -small, -mini for buttons and paginations 2012-09-18 21:16:08 -07:00
Mark Otto
2769241aeb add new vars for common font-sizes and paddings with large, small, and mini components; resize pagination and buttons to better match each other 2012-09-18 20:56:20 -07:00
Mark Otto
37460e58d3 Merge branch '2.1.2-wip' of https://github.com/uberspeck/bootstrap into uberspeck-2.1.2-wip 2012-09-18 14:58:39 -07:00
Mark Otto
26ca131a95 Merge branch 'wpbrains-media-component' into 2.1.2-wip 2012-09-17 18:15:44 -07:00
Mark Otto
143fef9f95 overhaul the docs and css to merge into 2.1.2 since this was against master 2012-09-17 18:15:39 -07:00
Martin Bean
2ead9a5bc3 Standardized spelling of 'JavaScript'; added icons to file trees 2012-09-14 14:06:15 +01:00
Mark Otto
595e1a189c fixes #5119: javascript in navbar typo 2012-09-13 10:07:57 -07:00
Brian Campbell
2c8eff0eec Updated pagination to support .pagination-large, .pagination-small, .pagination-mini matching button sizes. Updated related docs. 2012-09-12 14:10:03 -06:00
Mark Otto
61332d727e fixes #5020: submenu support in dropup 2012-09-07 11:34:05 -07:00
Mark Otto
1c9d5c43b0 fixes #4640: pagination span issues resolved by scoping selectors to appropriate children, not all children; clarify docs on use of spans for disabled and active links 2012-08-27 10:56:46 -07:00
Mark Otto
f744ad57fc fixes #4676 manually: example html updated 2012-08-25 22:31:10 -07:00
Mark Otto
099cec1ca7 fixes #4493: typo in dimiss alerts docs 2012-08-21 13:00:40 -07:00
Mark Otto
6cf3752b9b fix ie7 dropdowns examples in docs 2012-08-20 12:16:15 -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
Jonas Pommerening
a1951ed7c0 stack mutliple progress bars 2012-08-20 10:12:03 +02: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