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

42 Commits

Author SHA1 Message Date
Mark Otto
c84cf4f7f5 rename classes from .bs-docs and .bs to .bd 2015-04-16 14:07:20 -07:00
Mark Otto
0e5d17d5f6 Merge branch 'master' into v4
Conflicts:
	Gruntfile.js
	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
	dist/js/bootstrap.min.js
	docs/_data/glyphicons.yml
	docs/_includes/components/alerts.html
	docs/_includes/components/badges.html
	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/input-groups.html
	docs/_includes/components/jumbotron.html
	docs/_includes/components/labels.html
	docs/_includes/components/list-group.html
	docs/_includes/components/media.html
	docs/_includes/components/navbar.html
	docs/_includes/components/navs.html
	docs/_includes/components/page-header.html
	docs/_includes/components/pagination.html
	docs/_includes/components/panels.html
	docs/_includes/components/progress-bars.html
	docs/_includes/components/responsive-embed.html
	docs/_includes/components/thumbnails.html
	docs/_includes/components/wells.html
	docs/_includes/css/buttons.html
	docs/_includes/css/code.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/tables.html
	docs/_includes/css/type.html
	docs/_includes/customizer-variables.html
	docs/_includes/getting-started/accessibility.html
	docs/_includes/getting-started/disabling-responsiveness.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/whats-included.html
	docs/_includes/js/alerts.html
	docs/_includes/js/buttons.html
	docs/_includes/js/carousel.html
	docs/_includes/js/collapse.html
	docs/_includes/js/modal.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tabs.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/components.html
	docs/_includes/nav/javascript.html
	docs/_jade/customizer-variables.jade
	docs/_layouts/default.html
	docs/about.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/src/customizer.js
	docs/customize.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
	less/glyphicons.less
	less/mixins/vendor-prefixes.less
	less/navbar.less
	less/popovers.less
	less/tables.less
	less/theme.less
	less/tooltip.less
	less/variables.less
	package.json
	scss/_carousel.scss
	scss/_close.scss
	scss/_forms.scss
	test-infra/npm-shrinkwrap.json
2015-01-03 20:08:58 -08:00
Mark Otto
2a78159a20 grunt 2014-12-11 12:06:08 -08:00
XhmikosR
4e27c48248 Run grunt. 2014-12-11 08:24:31 +02:00
Mark Otto
e020d50838 fix variable, run grunt 2014-11-09 22:05:09 -08:00
Heinrich Fenkart
6020bb06f2 grunt 2014-11-05 00:36:52 +01:00
Mark Otto
f26821a83a fix progress bar animated biznas 2014-10-26 22:48:12 -07:00
Mark Otto
05c785bfae grunt 2014-10-26 14:42:06 -07:00
XhmikosR
0ba39d45b4 Move "Copy" button in code. 2014-10-25 01:48:02 +03:00
XhmikosR
27478b966b Run grunt.
[ci skip]
2014-10-22 14:18:18 +03: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
b3d068f2d3 regenerate docs/assets/js/docs.min.js 2014-07-15 17:21:39 -07:00
Mark Otto
cabb86d126 Merge branch 'master' into derp
Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css.map
	docs/_includes/components/progress-bars.html
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css.map
2014-07-11 00:38:28 -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
fb775bae21 fix sidenav js 2014-07-10 00:24:34 -07:00
Mark Otto
857fe32a70 Refactor navs: new classes, remove separate pills & tabs files, drop justified nav because it never really worked 2014-07-09 16:04:31 -07:00
Mark Otto
54537b500e Refactor: drop all custom .progress-bar styles and replace with <progress> element 2014-07-09 01:39:34 -07:00
Mark Otto
97008c381a restore font-weight and knock down font-size for .lead 2014-07-08 00:10:31 -07:00
XhmikosR
225351431e Update dependencies. 2014-06-30 18:35:50 +03:00
Chris Rebert
fde088751a regenerate docs.min.js
[skip sauce]
2014-06-26 12:21:45 -07:00
Mark Otto
82bd8b6dfd twerk copy 2014-06-09 23:29:44 -07:00
XhmikosR
1b8935ee95 Run grunt dist. 2014-06-10 08:30:17 +03:00
XhmikosR
03a8949d7c Run grunt. 2014-06-06 01:23:07 +03:00
Mark Otto
12b5d46f17 move it to the sidebar 2014-05-22 18:38:43 -07:00
Chris Rebert
bdd822a94c regenerate minified docs JS & CSS 2014-05-07 20:19:40 -07:00
XhmikosR
30b07b942e Run grunt. 2014-04-26 08:35:48 +03:00
Chris Rebert
eaddbd92bb grunt dist 2014-04-20 16:19:13 -07:00
XhmikosR
2f0f8ec6d1 Run grunt dist. 2014-04-09 10:02:34 +03:00
Mark Otto
0143e38a67 Merge branch 'master' into document_popover_focus
Conflicts:
	docs/assets/js/docs.min.js
2014-03-07 01:30:28 -08:00
Chris Rebert
40142bdc51 fix #12708 by updating class names in the docs JS 2014-02-12 11:02:56 -08:00
Mark Otto
784a95d945 Documents #10140 2014-02-10 21:34:05 -08:00
XhmikosR
c3cb63b69f Update holder.js to v2.3.1.
Fix #12653.
2014-02-08 18:19:39 +02:00
XhmikosR
7b9c0a38a7 Downgrade holder.js to v2.2.0.
Fixes #12440.
2014-01-31 09:32:55 +02:00
Mark Otto
d07e8fece4 grunt 2014-01-16 15:03:34 -08:00
Mark Otto
eca81939cc Merge branch 'master' into docs_derp
Conflicts:
	docs/assets/css/pack.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
2014-01-13 22:43:18 -08:00
Chris Rebert
ea591748ed sort out attribution banners of docs assets; fixes #11976 2014-01-13 21:58:27 -08:00
Mark Otto
b17dca240e Merge branch 'master' into docs_derp
Conflicts:
	docs/assets/js/docs.min.js
2014-01-12 16:10:57 -08:00
Chris Rebert
80bed836e0 grunt dist build-customizer 2014-01-12 14:53:21 -08:00
Mark Otto
79c18da452 homepage improvements 2014-01-11 19:35:40 -08:00
XhmikosR
d7bf9372ec Remove extra newline from banner. 2014-01-08 13:41:17 +02:00
XhmikosR
016d573a80 Use the docs banner for all the docs generated files. 2014-01-08 13:41:17 +02:00
XhmikosR
ebf7807985 docs-assets: concatenate and minify all javascript files. 2014-01-08 13:41:16 +02:00