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

295 Commits

Author SHA1 Message Date
Mark Otto
7e86bfd9ac change nav to use index files for each section; stub out index views for everything 2015-04-18 12:28:50 -07:00
Mark Otto
c84cf4f7f5 rename classes from .bs-docs and .bs to .bd 2015-04-16 14:07:20 -07:00
Mark Otto
bbce37c52d fix page layout for examples overview 2015-03-09 15:21:05 +00:00
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
TJ
10c8dad848 Prevent collapsed navbar in Non-responsive Example
Closes #15291 by merging it.
2015-02-25 22:53:21 -08:00
Kevin Kirsche
3ed961e4c1 Document justified navbar for #15906
Document in the source code that the justified nav is meant for single line list items only. This should help prevent Issues like #15906 in the future.
2015-02-24 23:04:59 -05:00
Mark Otto
05513c52c4 Fix #15911: Clear the floats and move the padding to the header 2015-02-24 16:43:07 -08:00
Chris Rebert
a2c7233ac0 Use just holder.js instead of docs.min.js in examples when possible
And add explanatory comments to the Carousel & Dashboard examples regarding holder.js

[skip sauce]
2015-02-16 19:17:01 -08:00
Chris Rebert
d13e879042 Remove docs.min.js from Blog & Cover examples since it's unnecessary. 2015-02-16 11:40:42 +02:00
XhmikosR
7a4fadb7b8 Fix carousel example images after c08bf4ba8b.
The revert was incomplete.
2015-02-16 11:39:14 +02:00
Mark Otto
2fad6e8dd2 Merge pull request #15648 from Nikita240/master
Improve image layout in the carousel example.
2015-02-08 17:25:13 -08:00
XhmikosR
391054fa2d Merge pull request #15658 from kkirsche/patch-3
Fix issue #15601 — Position of Charset, X-UA-Compatible, and Viewport Meta Tags
2015-02-03 07:22:45 +02: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
Christian
37fbe1cf62 Update non-responsive.css
Fix typo on Utilize
2015-01-27 20:51:55 +09:00
Nikita Rushmanov
d41f114e9b Fix image order in carousel example
When the screen is shrunk below the md threshold, all the featurette columns stack.
However, since the second featurette is "backwards", when stacked the second featurette
looked awkward as the image came before the heading.
2015-01-23 02:14:12 -08:00
Nikita Rushmanov
ca0fb736c7 Center images in carousel example
In order to see the changes, you must shrink the browser to below the md threshold.
2015-01-23 02:02:21 -08:00
Mark Otto
c08bf4ba8b keep the base64 2015-01-21 21:06:11 -08:00
XhmikosR
53d2abff92 Carousel example: move the Base64 images outside of the HTML.
Use a simple blank.gif and change the background color instead of duplicating stuff.
2015-01-21 09:51:12 +02:00
Mark Otto
6ebf68296a Merge pull request #61 from twbs/clear-out-fonts
remove unused font files
2015-01-20 15:40:37 -08:00
Mark Otto
325748ff68 Merge branch 'master' into v4
Conflicts:
	_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
	dist/js/bootstrap.min.js
	docs/_includes/components/thumbnails.html
	docs/_includes/css/forms.html
	docs/_includes/css/grid.html
	docs/_includes/customizer-variables.html
	docs/_includes/footer.html
	docs/_includes/getting-started/download.html
	docs/_includes/getting-started/template.html
	docs/_includes/js/overview.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/assets/css/docs.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/assets/js/src/customizer.js
	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/dist/js/bootstrap.js
	docs/dist/js/bootstrap.min.js
	docs/examples/navbar-fixed-top/index.html
	docs/examples/navbar-static-top/index.html
	docs/examples/non-responsive/index.html
	docs/examples/theme/index.html
	grunt/configBridge.json
	less/alerts.less
	less/badges.less
	less/jumbotron.less
	less/panels.less
	less/tables.less
	less/theme.less
	less/variables.less
	package.json
	scss/_button-group.scss
	scss/_buttons.scss
	scss/_forms.scss
2015-01-19 14:48:12 -08:00
Chris Rebert
8ce8cd992e remove more Glyphicon references from the docs 2015-01-09 12:33:34 -08:00
XhmikosR
9db1de2a3a Update jQuery to v1.11.2. 2015-01-07 00:31:18 +02:00
Chris Rebert
2e815e891b Fix @mdo's grammar 2014-12-30 12:45:24 -08:00
Mark Otto
f9aec74124 add [hidden] utility for hiding any html element (see #15274 for more context) 2014-12-23 04:10:59 -08:00
Mark Otto
94753bc3ec grunt 2014-12-18 20:19:53 -08:00
Chris Rebert
c7ef5810e1 rename .item => .carousel-item 2014-12-17 18:44:55 -08:00
Chris Rebert
a8299b5b45 Remove ancillary references to IE<9 in comments+docs 2014-12-16 19:06:57 -08:00
Mark Otto
a1a3a007b6 tweak grid docs, add new tier 2014-12-04 21:02:04 -08:00
Mark Otto
d05e58449a linting 2014-12-04 15:20:55 -08:00
Mark Otto
aab9218c7f rem-ify blog example and clean a few visuals up 2014-12-04 14:32:13 -08:00
Mark Otto
b811553147 new look for carousel example, convert to rems 2014-12-04 14:18:13 -08:00
Mark Otto
908f776c08 more rem fixes for examples 2014-12-04 14:02:38 -08:00
Mark Otto
0d7115928b convert narrow jumbotron to rems 2014-12-04 01:10:26 -08:00
Mark Otto
7c391867d7 use static top navbar in jumbotron 2014-12-04 01:07:04 -08:00
Mark Otto
04d9091158 rename css file 2014-12-04 01:06:09 -08:00
Mark Otto
15ec0e9811 rename 2014-12-04 01:05:43 -08:00
Mark Otto
471e5969ac convert jumbotron example to new navbar, fix container, and use rems in css 2014-12-04 01:04:07 -08:00
Mark Otto
c7c46acf48 update starter template to use new navbar 2014-12-04 00:59:36 -08:00
Mark Otto
8fdac3d3a2 move examples index again, clean up nav 2014-12-01 16:51:31 -08:00
Mark Otto
639a211344 add new album example 2014-12-01 15:19:15 -08:00
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
XhmikosR
2a1a3e6806 Example: minor image compression improvements.
[ci skip]
2014-11-30 13:16:27 +02:00
Mark Otto
bcb90ef3a0 Bump Glyphicons to v1.9 2014-11-30 01:31:49 -08:00
Mark Otto
d74fd9af2f Fixes #15096: Fix navbar forms in the non-responsive example 2014-11-30 00:54:43 -08:00
Mark Otto
149f32d9d3 Alternate fix for #15250 with a more descriptive theme jumbotron 2014-11-29 21:18:05 -08:00
Mark Otto
b53ad74d47 clean up navbar examples 2014-11-29 15:07:13 -08:00
Mark Otto
2a3680e187 drop the theme example 2014-11-21 15:27:52 -08:00
Mark Otto
b15ad9920d drop non responsive example 2014-11-21 15:25:55 -08:00
Patrick H. Lauke
bab36220c9 Redundant role="navigation" on <nav>s
plus one example that still used the old <div role="navigation"> and a
fix-up of the callout as per
https://github.com/twbs/bootstrap/issues/15109
2014-11-14 10:52:57 +00:00
Patrick H. Lauke
25cac1ea9a Redundant role="form" on <form>s 2014-11-14 10:52:56 +00:00