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

6 Commits

Author SHA1 Message Date
Chris Rebert
833f391090 Add support for example IDs to {% example %} template tag
e.g. {% example html id=some-example-id-here %}
2014-12-02 18:46:42 -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
Heinrich Fenkart
30df201abc Use a Jekyll plugin instead of the copy:configBridge grunt task 2014-11-05 18:35:13 +01:00
Heinrich Fenkart
0d291e8623 HTTPS for Apple Safari Radar in bugify filter 2014-11-04 19:40:39 +01:00
Heinrich Fenkart
069488dea3 Use Jekyll data for Wall of Browser Bugs 2014-11-04 07:25:52 +01:00
Mark Otto
be877bc691 plugins: add new example doodad hackery bullshitery and markdown block plugin for markdown includes 2014-07-09 20:00:22 -07:00