0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-07 00:46:15 +01:00
Commit Graph

70 Commits

Author SHA1 Message Date
Mark Otto
a4ad96b848 mo betta justified nav 2013-01-18 01:33:55 -08:00
Mark Otto
8713fa1edf overhaul justified nav example 2013-01-17 21:05:23 -08:00
Mark Otto
70fca06f25 Remove docs and prettify css from examples thus far; update narrow page 2013-01-17 20:39:38 -08:00
Mark Otto
56f8b735a5 fix up jumbotron example 2013-01-17 20:35:59 -08:00
Mark Otto
0f1af68e69 Rename hero.html to jumbotron.html 2013-01-17 20:32:07 -08:00
Mark Otto
0050688fec finish updating starter template 2013-01-17 20:30:19 -08:00
Mark Otto
dd58217712 comment tweaks and updating starter template 2013-01-17 20:28:05 -08:00
Mark Otto
68475f8707 Merge branch '2.3.0-wip' into 3.0.0-wip
Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/css.html
	docs/customize.html
	docs/examples/fluid.html
	docs/extend.html
	docs/getting-started.html
	docs/index.html
	docs/javascript.html
	docs/scaffolding.html
	docs/templates/layout.mustache
	docs/templates/pages/base-css.mustache
	docs/templates/pages/components.mustache
	less/navbar.less
2013-01-17 20:23:33 -08:00
Mark Otto
0f9073c5cd Upgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing 2013-01-14 00:11:55 -08:00
Mark Otto
cecabeadec 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
d034ec74c4 fix username navbar text in fluid example for responsive variations 2013-01-12 00:20:13 -08:00
Mark Otto
07a5563a0b Comment fix 2013-01-11 20:30:56 -08:00
Mark Otto
99649aad71 Remove navbar links from sticky footer navbar example 2013-01-11 11:00:45 -08:00
Mark Otto
98b0d4946f Merge branch 'wilfra-patch-2' into 2.3.0-wip 2013-01-11 10:58:17 -08:00
William Franceschine
e7a13a9416 Update docs/examples/marketing-narrow.html
Updated copyright to 2013
2013-01-10 02:14:14 -08:00
William Franceschine
d05006349e Update docs/examples/marketing-alternate.html
Updated copyright to 2013
2013-01-10 02:13:57 -08:00
William Franceschine
82eeba11b1 Update docs/examples/hero.html
Updated copyright to 2013
2013-01-10 02:13:43 -08:00
William Franceschine
69cc97dd34 Update docs/examples/carousel.html
Updated copyright to 2013
2013-01-10 02:13:26 -08:00
William Franceschine
ebd17141e8 Update docs/examples/fluid.html
Updated copyright to 2013
2013-01-10 02:10:52 -08:00
Mark Otto
a2854c8307 Merge branch 'Justin-John-master' into 2.3.0-wip 2013-01-09 21:35:50 -08:00
Mark Otto
ee9cd0180d add sticky footer with navbar 2013-01-09 19:53:42 -08:00
Justin John Mathews
7b4971e4d1 Corrected carousel arrows to active.#6494, #6489
Corrected the carousel arrows to active on resizing the browser window.
2013-01-09 15:53:17 +05:30
Mark Otto
4fa4d5254d Fixes #6189: Add holder.js to carousel example 2012-12-21 19:10:05 -08:00
Mark Otto
b7f2a382b6 Update new example name and links 2012-12-20 20:27:07 -08:00
Mark Otto
0f9490bf3e Fixes #6352: marketing-alternate broken nav in FF17 2012-12-20 14:40:39 -08:00
Mark Otto
3e64d03731 Merge branch '2.2.3' 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/assets/js/bootstrap.min.js
	docs/index.html
	docs/templates/pages/base-css.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/responsive.less
	less/type.less
	package.json
2012-12-20 00:02:52 -08:00
Nathan Bridgewater
312509e1c0 lowered carousel beneath the nav 2012-12-09 22:10:38 -06:00
Mark Otto
cb67366206 Merge branch '2.2.2-wip' into 3.0.0-wip
Conflicts:
	README.md
	docs/assets/css/bootstrap.css
	docs/assets/js/bootstrap.js
	docs/assets/js/bootstrap.min.js
	docs/examples/fluid.html
	docs/scaffolding.html
	less/breadcrumbs.less
	less/popovers.less
	less/responsive.less
2012-12-05 11:05:10 -08:00
Mark Otto
5cf2e8a1cb Once more, update all the favicons to retina 2012-12-03 13:25:56 -08:00
Mark Otto
d37d269230 Improve rendering of carousel example for IE10 2012-12-03 13:01:27 -08:00
Mark Otto
145ed23ac5 Remove more fluid grid stuff
* No more fluid layout
* No fluid grid overrides for tables.less
* No more fluid example page
2012-11-30 16:18:40 -08:00
Mark Otto
4bfab509df add holder and replace placehold.it 2012-11-29 20:59:14 -08:00
Mark Otto
8db7111a63 add in latest carousel example, reorg examples on getting started 2012-10-16 12:50:10 -05:00
Mark Otto
814f9f17f9 improve spacing in carousel example 2012-10-15 13:57:09 -05:00
Mark Otto
e83a974afe compress images and add new carousel example for .net magazine article 2012-10-10 17:58:22 -07:00
Mark Otto
9a25a10ba6 comments in template 2012-10-08 18:59:44 -07:00
Mark Otto
01a7f17579 adding another template for same-width nav links using 'display: table-cell;' 2012-10-08 18:58:35 -07:00
Mark Otto
cfc032fd41 add sticky footer example per martin bean's suggestion, using the implementation by ryan fait 2012-09-30 22:09:51 -07:00
Mark Otto
6cfabf5e22 add link to examples on index page; add back narrow marketing page and signin page examples 2012-09-30 21:28:20 -07:00
Mark Otto
f12b0239bc nuke new examples for now 2012-09-17 08:53:13 -07:00
Mark Otto
2fd17aa6a8 more carouself example work 2012-09-16 21:54:06 -07:00
Mark Otto
fe4a2d2c96 way cooler carousel example, along with updated screenshots for examples 2012-09-14 15:55:46 -07:00
Mark Otto
7ea4783df8 tweak copy on each template, add sign in template 2012-09-14 15:21:44 -07:00
Mark Otto
8d97ae98d2 adding new examples 2012-09-14 15:17:46 -07:00
Mark Otto
f6271da47b 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
2b31caae2d fix navbar form alignment, and update examples to show these cases 2012-07-30 12:15:08 -07:00
Mark Otto
47d66e0a3f fix examples collapse classes, rename navbar-redux to navbar and delete the old one 2012-07-30 10:08:27 -07:00
Mark Otto
b3b04ec3ff fixes #4210: indenting on hero example 2012-07-29 12:07:18 -07:00
Mark Otto
1e2fdd0b7c move navbar and update paths so it sits in tests 2012-05-15 09:45:53 -07:00
Mark Otto
d8ff335cfd move forms test to less/tests 2012-05-14 23:45:25 -07:00