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

84 Commits

Author SHA1 Message Date
Mark Otto
b648a77ed3 Merge branch 'master' into v4
Conflicts:
	Gruntfile.js
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/fonts/glyphicons-halflings-regular.eot
	dist/fonts/glyphicons-halflings-regular.svg
	dist/fonts/glyphicons-halflings-regular.ttf
	dist/fonts/glyphicons-halflings-regular.woff
	docs/_data/glyphicons.yml
	docs/_includes/components/alerts.html
	docs/_includes/components/badges.html
	docs/_includes/components/button-dropdowns.html
	docs/_includes/components/button-groups.html
	docs/_includes/components/dropdowns.html
	docs/_includes/components/glyphicons.html
	docs/_includes/components/input-groups.html
	docs/_includes/components/labels.html
	docs/_includes/components/media.html
	docs/_includes/components/navbar.html
	docs/_includes/components/navs.html
	docs/_includes/components/pagination.html
	docs/_includes/components/panels.html
	docs/_includes/components/progress-bars.html
	docs/_includes/css/buttons.html
	docs/_includes/css/forms.html
	docs/_includes/css/grid.html
	docs/_includes/css/helpers.html
	docs/_includes/css/images.html
	docs/_includes/css/less.html
	docs/_includes/css/responsive-utilities.html
	docs/_includes/css/sass.html
	docs/_includes/css/tables.html
	docs/_includes/css/type.html
	docs/_includes/getting-started/accessibility.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/getting-started/community.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/examples.html
	docs/_includes/getting-started/whats-included.html
	docs/_includes/js/affix.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.html
	docs/_includes/js/overview.html
	docs/_includes/js/tabs.html
	docs/_includes/nav/components.html
	docs/_includes/nav/css.html
	docs/_includes/nav/javascript.html
	docs/_includes/nav/main.html
	docs/about.html
	docs/assets/css/docs.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/fonts/glyphicons-halflings-regular.eot
	docs/dist/fonts/glyphicons-halflings-regular.svg
	docs/dist/fonts/glyphicons-halflings-regular.ttf
	docs/dist/fonts/glyphicons-halflings-regular.woff
	docs/examples/carousel/index.html
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/navbar/index.html
	docs/examples/non-responsive/index.html
	docs/examples/non-responsive/non-responsive.css
	docs/examples/sticky-footer-navbar/index.html
	docs/examples/theme/index.html
	fonts/glyphicons-halflings-regular.eot
	fonts/glyphicons-halflings-regular.svg
	fonts/glyphicons-halflings-regular.ttf
	fonts/glyphicons-halflings-regular.woff
	less/_carousel.less
	less/_forms.less
	less/glyphicons.less
2014-11-30 20:17:45 -08:00
Mark Otto
0988cfbf20 bump docs version 2014-11-29 15:00:04 -08:00
Mark Otto
9a7e365c2c bump version to v3.3.1 2014-11-12 09:03:16 -08:00
Mark Otto
8611ed4dbd baseurl 2014-11-09 23:54:13 -08:00
Mark Otto
86af1f39ab Merge branch 'master' into derp
Conflicts:
	Gruntfile.js
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/components/button-groups.html
	docs/_includes/components/jumbotron.html
	docs/_includes/components/media.html
	docs/_includes/components/navs.html
	docs/_includes/customizer-variables.html
	docs/_includes/footer.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/js/carousel.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/getting-started.html
	docs/_includes/nav/javascript.html
	docs/_layouts/default.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/assets/js/raw-files.min.js
	docs/browser-bugs.html
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/examples/justified-nav/index.html
	less/_forms.less
	less/_tooltip.less
	less/navs.less
	less/theme.less
2014-11-09 22:02:53 -08:00
Chris Rebert
505171ef5d Revert "Use jsDelivr CDN until BootstrapCDN gets updated"
This reverts commit ea23969150.

BootstrapCDN has now uploaded Bootstrap v3.3.0
2014-10-30 17:38:40 -07:00
Heinrich Fenkart
ea23969150 Use jsDelivr CDN until BootstrapCDN gets updated 2014-10-30 07:20:41 +01:00
Mark Otto
94b59b57d6 version bump 2014-10-29 08:56:20 -07:00
XhmikosR
3908235e0f Remove baseurl as it doesn't serve any real purpose. 2014-10-27 19:35:59 +02:00
Mark Otto
dc7f92a0d4 ignore some files from jekyll compilation 2014-09-17 20:11:07 -07:00
Mark Otto
089d434895 Merge branch 'master' into derp
Conflicts:
	_config.yml
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/components/glyphicons.html
	docs/_includes/css/forms.html
	docs/_includes/css/tables.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/header.html
	docs/_includes/js/affix.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/javascript.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/assets/js/raw-files.min.js
	docs/browser-bugs.html
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/examples/blog/index.html
	docs/examples/carousel/index.html
	docs/examples/cover/index.html
	docs/examples/dashboard/index.html
	docs/examples/grid/index.html
	docs/examples/jumbotron-narrow/index.html
	docs/examples/jumbotron/index.html
	docs/examples/justified-nav/index.html
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/navbar/index.html
	docs/examples/non-responsive/index.html
	docs/examples/offcanvas/index.html
	docs/examples/signin/index.html
	docs/examples/starter-template/index.html
	docs/examples/sticky-footer-navbar/index.html
	docs/examples/sticky-footer/index.html
	docs/examples/theme/index.html
	docs/examples/tooltip-viewport/index.html
	less/code.less
	less/panels.less
	less/variables.less
2014-08-02 18:30:59 -07:00
Chris Rebert
0fe4fe328c Use HTTPS in CDN URLs in _config.yml
For consistency with the rest of the docs and per our code guidelines.
2014-07-18 14:26:14 -07:00
Mark Otto
20349df3e7 markdownify browser bugs, add config vars for shorthand urls 2014-07-13 01:43:26 -07:00
Mark Otto
4993ab6e00 start markdowning getting started and moving things to separate pages 2014-07-10 17:54:06 -07:00
Mark Otto
57c709becd jquery links 2014-07-10 10:23:15 -07:00
Mark Otto
bb939f0004 Switch to Rogue over Pygments for speeeeeed 2014-07-07 18:20:18 -07:00
Mark Otto
c068162161 maxcdn urls 2014-06-26 09:36:48 -07:00
Mark Otto
ff6b279b3c bump to v3.2.0 2014-06-26 09:13:24 -07:00
Mark Otto
c7783f5ad8 Fixes #13587: Switch to Kramdown for Markdown compiler in Jekyll 2014-06-09 22:24:51 -07:00
XhmikosR
d0fca8aaad Remove RTL leftovers. 2014-05-13 09:26:24 +03:00
Mark Otto
f5513fd30e nuke rtl 2014-05-12 19:47:53 -07:00
Chris Rebert
d6104b1151 include RTL CSS CDN URL in Download docs 2014-05-04 02:09:34 -07:00
Zlatan Vasović
8ae48183b2 Fix #13138: use underscore prefix to ignore directories 2014-03-24 21:47:59 +01:00
Zlatan Vasović
dd9946e919 Remove redundant _config.yml quotes 2014-03-08 23:03:28 +01:00
Zlatan Vasović
3bdaa831e9 Remove ./ from _config.yml paths 2014-03-07 23:11:59 +01:00
Zlatan Vasović
d08bbdc6ec Reorganize docs assets 2014-03-07 17:37:23 +01:00
XhmikosR
17722e5ef2 Add sitemap.xml and robots.txt files. 2014-02-27 17:05:52 +02:00
Mark Otto
88fdd45427 v3.1.1 bump 2014-02-13 01:12:26 -08:00
Zlatan Vasović
938779ca93 Move jade files to docs/jade/ 2014-02-08 22:29:06 +01:00
Julian Thilo
a9567a9e0c Apply eaa2b83 to master as well 2014-01-30 21:16:48 +01:00
Mark Otto
1409cde7e8 Bump versions, run grunt 2014-01-30 08:30:37 -08:00
XhmikosR
4bca3c79b3 Move docs third-party libraries to a separate folder. 2014-01-18 08:15:21 +02:00
Chris Rebert
208df78971 Merge pull request #12241 from twbs/jekyll-encoding
Set Jekyll encoding and tweak Windows notes
2014-01-15 13:43:12 -08:00
Julian Thilo
00239f6034 Set Jekyll encoding and tweak Windows notes 2014-01-15 22:18:35 +01:00
Mark Otto
ed5c7baaf1 Merge branch 'master' into docs_derp 2014-01-05 17:49:40 -08:00
Zlatan Vasović
f63cd94e43 Reorganize vars 2014-01-05 11:51:49 +01:00
Mark Otto
b253cb2c1e Merge branch 'master' into docs_derp
Conflicts:
	_config.yml
	docs/_includes/footer.html
	docs/_includes/nav-main.html
	docs/_includes/old-bs-docs.html
	docs/_layouts/default.html
	docs/_layouts/home.html
	docs/getting-started.html
	docs/index.html
2013-12-31 13:53:33 -08:00
Mark Otto
a9c829bc0c Rearrange repository contents because muahahahahahaha 2013-12-28 22:47:03 -08:00
Mark Otto
5b02dbd97a Merge branch 'master' into docs_derp
Conflicts:
	_config.yml
2013-12-26 21:40:15 -08:00
Mark Otto
679c786237 roll back version numbers to avoid broken links in docs and readme (fixes #12000) 2013-12-24 12:16:17 -08:00
Mark Otto
f32796559a Merge pull request #11978 from XhmikosR/clean-up-_gh-pages
Jekyll: exclude more files/folders.
2013-12-22 23:15:35 -08:00
XhmikosR
ea5a4ec31e Jekyll: exclude more files/folders.
We still can't exclude `./fonts/" and "./js/" due to https://github.com/jekyll/jekyll/issues/906
2013-12-22 11:45:18 +02:00
Mark Otto
176e35d33d rework downloads to simplify and add sass 2013-12-21 13:40:42 -08:00
Mark Otto
bb644eede6 Team members on About page 2013-12-21 10:08:04 -08:00
Mark Otto
e8e60ae4bc version bump 2013-12-18 14:56:08 -08:00
Mark Otto
8a74264344 bump version numbers to 3.0.3 2013-12-01 19:31:52 -08:00
Chris Rebert
3887f540b9 update remaining version numbers 2013-11-06 13:19:18 -08:00
Mark Otto
98acdaeb00 bump links to 3.0.2; change readme download to release URL format 2013-11-06 13:09:35 -08:00
Mark Otto
867e2bef8d 3.0.1 2013-10-30 10:03:56 -07:00
Zlatan Vasović
40c61a9bd7 Remove .ruby-version due to 4f20a29c32 2013-09-30 11:26:52 +02:00