diff options
| author | Mark Otto <[email protected]> | 2015-03-01 13:44:10 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-03-01 13:44:10 -0800 |
| commit | c16fee5efd5620197ab1213ca3699830d590ee39 (patch) | |
| tree | cd608536dfc7fbaaf60658bcaa5210ebd8ef5624 /docs/javascript/scrollspy.md | |
| parent | 50a51ffc361276d13c4da16684277279fd567d4c (diff) | |
| parent | 1ba2630ccf460106036129086c98c5bacd7baa98 (diff) | |
| download | bootstrap-c16fee5efd5620197ab1213ca3699830d590ee39.tar.xz bootstrap-c16fee5efd5620197ab1213ca3699830d590ee39.zip | |
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
Diffstat (limited to 'docs/javascript/scrollspy.md')
| -rw-r--r-- | docs/javascript/scrollspy.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/javascript/scrollspy.md b/docs/javascript/scrollspy.md index 5ae045fd1..892d641da 100644 --- a/docs/javascript/scrollspy.md +++ b/docs/javascript/scrollspy.md @@ -74,9 +74,9 @@ body { {% endhighlight %} {% highlight html %} -<body data-spy="scroll" data-target=".navbar-example"> +<body data-spy="scroll" data-target="#navbar-example"> ... - <div class="navbar-example"> + <div id="navbar-example"> <ul class="nav nav-tabs" role="tablist"> ... </ul> @@ -90,7 +90,7 @@ body { After adding `position: relative;` in your CSS, call the scrollspy via JavaScript: {% highlight js %} -$('body').scrollspy({ target: '.navbar-example' }) +$('body').scrollspy({ target: '#navbar-example' }) {% endhighlight %} <div class="bs-callout bs-callout-danger"> |