0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Commit Graph

75 Commits

Author SHA1 Message Date
Mark Otto
fd89531f6a Update commenting and structure of layout.mustache 2013-01-17 20:26:17 -08:00
Mark Otto
d9b35c2602 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
b30b8c2c12 Restore nav tabs, pills, justified variation, disabled links, and a few more things. Still need to add the dropdowns back though. 2013-01-17 17:02:35 -08:00
Mark Otto
32bcbe5671 cleanup example templates 2013-01-17 15:00:49 -08:00
Mark Otto
f6226c9b91 Update Getting Started page to include mention of Respond 2013-01-17 14:49:52 -08:00
Mark Otto
5c76518f7d Add respond.js to main docs pages, but only for IE8 and down 2013-01-17 14:00:03 -08:00
Mark Otto
7e46b6f636 Update nav and add bounds for tablet container 2013-01-17 00:58:34 -08:00
Mark Otto
255cb87734 update getting started to reflect latest changes; pull list of components because fuck that 2013-01-17 00:27:46 -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
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
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
f69d12af3d Merge pull request #6407 from aurnik/master
Fix link to File structure anchor
2012-12-28 11:10:46 -08:00
Aurnik Islam
aa997e274e Fix link to File structure anchor 2012-12-27 01:49:09 -08:00
Mark Otto
c1e82732cf Update new example name and links 2012-12-20 20:27:07 -08:00
Mark Otto
a24e47b5b8 Update the examples index:
* Retina ready screenshots
* Added screenshot and link to justified nav example (previously unlinked marketing-alternate.html)
2012-12-20 15:08:05 -08:00
Mark Otto
65edc9cd6e Change .jumbotron usage in docs layout to .bs-docs-jumbotron 2012-12-19 21:42:36 -08:00
Mark Otto
33e14fe5bf 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
b3019d7aab add gallery page, fill with a few screenshots to start 2012-12-04 20:30:21 -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
dd11d0a3fa move around social buttons 2012-12-01 13:47:07 -08:00
Mark Otto
ebd2215e49 remove deleted css files, run make 2012-11-30 16:31:24 -08:00
Mark Otto
fca35c0dba Merge branch '2.2.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/alerts.less
	less/button-groups.less
	less/buttons.less
	less/tests/css-tests.html
2012-11-30 00:13:30 -08:00
Mark Otto
acc037de15 add holder and replace placehold.it 2012-11-29 20:59:14 -08:00
Mark Otto
7e56e2265d Merge branch '2.2.2-wip' into exploratory
Conflicts:
	less/button-groups.less
2012-11-22 22:04:21 -08: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
05a2d37559 run make after removing responsive css file 2012-11-04 00:37:49 -07:00
Mark Otto
3de6f3ff88 Swap old icons for new in docs 2012-11-03 16:18:02 -07:00
Mark Otto
1477e081d4 Merge branch '2.2.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	docs/getting-started.html
	docs/templates/pages/getting-started.mustache
	less/accordion.less
	less/alerts.less
	less/breadcrumbs.less
	less/buttons.less
	less/code.less
	less/dropdowns.less
	less/forms.less
	less/navbar.less
	less/progress-bars.less
	less/responsive-navbar.less
	less/tables.less
	less/thumbnails.less
	less/tooltip.less
	less/wells.less
2012-11-02 09:36:51 -07:00
Mark Otto
d5697fcf6b fixes #5717: add retina favicon, recompile docs 2012-10-31 10:41:41 -07:00
Mark Otto
bf78333531 add in latest carousel example, reorg examples on getting started 2012-10-16 12:50:10 -05: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
bbd543db53 Merge branch '2.1.2-wip' into exploratory
Conflicts:
	docs/getting-started.html
	docs/templates/pages/getting-started.mustache
2012-09-30 22:45:39 -07:00
Mark Otto
a4a6244eb7 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
b6ba717b75 fix getting started examples 2012-09-25 23:01:18 -07:00
Mark Otto
c59e5251e1 initial pass at removing navbar-inner from .navbar component 2012-09-25 22:48:02 -07:00
Mark Otto
f12946be5a thumbnails cleanup: no more UL or LI elements needed, instead just use standard grid markup 2012-09-25 22:40:48 -07:00
Mark Otto
6c4b276cd4 way cooler carousel example, along with updated screenshots for examples 2012-09-14 15:55:46 -07:00
Mark Otto
faa760f563 revert docs change 2012-09-14 10:30:55 -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
Mark Otto
39791a8ea8 fixes #5059 manually: include media type in css getting started block 2012-09-10 22:44:08 -07:00
Ramiro Morales
138b5a8c05 Fix small documentatio typos. 2012-09-05 23:07:52 -03:00
Mark Otto
e8c5b3c9a5 fixes #4869: typo in getting started 2012-08-31 23:51:48 -07:00
Mark Otto
72f176d1f5 fixes #4748: document jquery dependency better 2012-08-27 09:17:20 -07:00
Mark Otto
eb8aad85b8 fixes #4734 manually: doctype in getting started in examples 2012-08-26 22:29:40 -07:00
Mark Otto
535dfc2153 fixes #4561: typo 2012-08-22 09:51:41 -07:00
Mark Otto
6160667b19 fixes #4564 manually: typo in getting started jumbotron 2012-08-22 09:48:57 -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