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

21 Commits

Author SHA1 Message Date
Mark Otto
c16fee5efd Merge branch 'master' into v4
Conflicts:
	.travis.yml
	Gruntfile.js
	bower.json
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	dist/js/bootstrap.js
	dist/js/bootstrap.min.js
	docs/_data/glyphicons.yml
	docs/_includes/components/breadcrumbs.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/labels.html
	docs/_includes/components/list-group.html
	docs/_includes/components/media.html
	docs/_includes/components/navs.html
	docs/_includes/components/panels.html
	docs/_includes/components/progress-bars.html
	docs/_includes/components/thumbnails.html
	docs/_includes/components/wells.html
	docs/_includes/css/buttons.html
	docs/_includes/css/forms.html
	docs/_includes/css/helpers.html
	docs/_includes/css/images.html
	docs/_includes/css/less.html
	docs/_includes/customizer-variables.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/examples.html
	docs/_includes/getting-started/grunt.html
	docs/_includes/getting-started/license.html
	docs/_includes/getting-started/template.html
	docs/_includes/header.html
	docs/_includes/js/affix.html
	docs/_includes/js/alerts.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/popovers.html
	docs/_includes/js/scrollspy.html
	docs/_includes/js/tabs.html
	docs/_includes/js/tooltips.html
	docs/_includes/js/transitions.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/assets/js/vendor/FileSaver.js
	docs/assets/js/vendor/autoprefixer.js
	docs/assets/js/vendor/uglify.min.js
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/dist/js/bootstrap.min.js
	docs/examples/blog/index.html
	docs/examples/carousel/index.html
	docs/examples/cover/index.html
	docs/examples/dashboard/index.html
	docs/examples/narrow-jumbotron/narrow-jumbotron.css
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/non-responsive/index.html
	docs/examples/non-responsive/non-responsive.css
	docs/examples/theme/index.html
	grunt/configBridge.json
	js/affix.js
	js/carousel.js
	js/collapse.js
	js/dropdown.js
	js/modal.js
	js/popover.js
	js/scrollspy.js
	js/tab.js
	js/tests/unit/affix.js
	js/tests/unit/button.js
	js/tests/unit/carousel.js
	js/tests/unit/modal.js
	js/tests/unit/tooltip.js
	js/tooltip.js
	less/badges.less
	less/glyphicons.less
	less/type.less
	less/variables.less
	package.json
	scss/_dropdown.scss
	scss/_forms.scss
	test-infra/npm-shrinkwrap.json
2015-03-01 13:44:10 -08:00
Kevin Kirsche
a380e30f7e Fix issue #15601 — Position of X-UA-Compatible
Fix issue #15601 — Position of X-UA-Compatible, charset and viewport

Add comment to all examples

The non-responsive is correctly saying 2 instead of 3
2015-02-02 15:45:57 -05: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
XhmikosR
6b7d6565de Examples: Make use of the footer tag instead of a div. 2014-10-30 08:08:06 +02:00
XhmikosR
41dbc53b9b Fix a small typo in comment.
[ci skip]
2014-10-23 09:11:12 +03:00
Chris Rebert
9742bb2ee4 Fix #14164: move Windows Phone 8 IE10 viewport bug workaround script to footer of pages 2014-07-27 17:01:34 -07:00
Mark Otto
a5dbd936a6 Nuke IE8 stuff from docs 2014-07-09 02:41:57 -07:00
XhmikosR
29d00e0cd7 Move apple-touch-icon-precomposed.png and favicon.ico in docs root.
This way, it works in all browsers.
2014-06-09 01:14:44 +03:00
XhmikosR
cae7dee236 Revert 4f9270cc20.
The validator doesn't choke anymore on this and even though it's not spec compliant, it's needed for some IE versions. So until we move favicon.ico in root, this should do the job.
2014-05-22 10:55:28 +03:00
XhmikosR
ed98b3dfc0 Update html5shiv to 3.7.2. 2014-05-10 09:23:53 +03:00
Chris Rebert
a84a3693b1 add ie-emulation-modes-warning.js to docs & examples 2014-04-27 22:08:44 -07:00
Mark Otto
fe11ac77a2 Merge pull request #13390 from twbs/ie10-viewport-bug
add IE10 viewport bug workaround to examples
2014-04-24 18:50:30 -07:00
XhmikosR
52b6a32145 Use the new respond.js URL. 2014-04-21 19:12:43 +03:00
XhmikosR
a549e8c332 Update html5shiv to v3.7.1. 2014-04-21 19:11:23 +03:00
Chris Rebert
448086f95a add IE10 viewport bug workaround to examples
Closes #13379.
2014-04-20 16:09:49 -07:00
XhmikosR
4f9270cc20 Switch to icon instead of shortcut icon to fix the HTML validation tests. 2014-03-24 09:28:40 +02:00
XhmikosR
ef49635ae2 Fix csslint errors. 2014-02-27 11:15:53 +02:00
Panayiotis Lipiridis
40e1a3bd9f Sticky footers without any wrappers 2014-02-04 13:56:42 +01:00
Zlatan Vasović
cf8f1ec0cd Improve <meta> tags 2014-01-19 13:27:17 +01:00
wangsai
e4508bb37c fix assets links in all examples 2014-01-01 22:29:13 +08:00
Mark Otto
a9c829bc0c Rearrange repository contents because muahahahahahaha 2013-12-28 22:47:03 -08:00