aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-03-01Merge pull request #15955 from twbs/fixture-on-screen-iosChris Rebert1-6/+11
Unit tests: Only display fixture on-screen for iOS
2015-03-02automatic grunt distBootstrap's Grunt bot2-2/+2
2015-03-01Merge pull request #15593 from ↵Chris Rebert2-1/+39
neoeno/handle_multiple_zero_offset_scrollspy_elements Handle multiple zero-offset Scrollspy elements.
2015-03-01Handle multiple zero-offset Scrollspy elements.Caden Lovelace2-1/+39
When the first two elements in a scrollspy content block have a document offset of zero (i.e. they're hard against the top of the page), Scrollspy would switch between them on every scroll event. This could happen, for example, in a system of nested sections: ``` <section id="animals"> <section id="dogs"> Content </section> </section> ``` This ocurred because Scrollspy's check to see if it's at the end of the array of sections uses `!arr[index]`. This misses the case where `arr[index]` does exist and is zero. This commit explicitly checks the array bounds.
2015-03-01Merge pull request #15965 from kkirsche/fixURLChris Rebert2-2/+2
[Docs / README] Fix URL to match the plugin keyword recommendation
2015-03-01Merge pull request #15964 from kkirsche/addAccidentlyRemovedTextChris Rebert2-2/+2
[Docs] Replace accidently removed tooltip / popover text
2015-03-01Remove dupe docs CSS, move anchor styles to scss directory, recompileMark Otto5-1415/+4
2015-03-01fix validation, run grunt distMark Otto8-383/+275
2015-03-01Fix URL to match the keywordKevin Kirsche2-2/+2
Fix URL to match the keyword
2015-03-01Merge branch 'master' into v4Mark Otto62-1507/+1734
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-01Replace accidently removed textKevin Kirsche2-2/+2
X-Ref #15742 cc: @mdo
2015-03-01Input group sizes: Properly position `.form-control-feedback`Heinrich Fenkart1-3/+5
Ref https://github.com/twbs/bootstrap/issues/12868#issuecomment-76291513 Ref 7733f24
2015-03-01Unit tests: Only display fixture on-screen for iOSHeinrich Fenkart1-6/+11
Since only on iOS tests fail when the fixture is displayed off-screen, see https://travis-ci.org/twbs/bootstrap/jobs/52605742
2015-03-01Merge pull request #15954 from twbs/sauce-hidepassedHeinrich Fenkart2-5/+1
Use different way to make failing test more visible in Sauce
2015-03-01Use different way to make failing test more visible in SauceHeinrich Fenkart2-5/+1
2015-02-28Merge pull request #15929 from kkirsche/patch-5Patrick H. Lauke1-3/+3
[Fixes #15928] Encourage use of icons with form validation states for co...
2015-02-28[Fixes #15928] Encourage use of icons with form validation states for ↵Kevin Kirsche1-3/+3
colorblind users [Fixes #15928] Encourage use of icons with form validation states for colorblind users Update text per @patrickhlauke's feedback Update text per @patrickhlauke's feedback. Fix stupid grammar mistake
2015-02-28iOS fix for role="button" elements; [fixes #15935]Patrick H. Lauke1-0/+11
Fixes "clickability" issue (and more generally, the firing of events such as focus as well) for traditionally non-focusable elements with role="button" (see https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile) Fixes #15935
2015-02-27[Fixes #15944] Add Z-Index to avoid border overlapping Kevin Kirsche1-0/+1
[Fixes #15944] Add Z-Index to avoid border overlapping
2015-02-27Merge pull request #96 from twbs/gem-badgeChris Rebert1-0/+1
Add Ruby Gem badge to README
2015-02-27automatic grunt distBootstrap's Grunt bot1-1/+1
2015-02-26Merge pull request #15826 from kkirsche/patch-19Mark Otto1-1/+1
[Fixes #15825] .initialism class should use mixin
2015-02-27automatic grunt distBootstrap's Grunt bot2-5/+5
2015-02-26Merge pull request #15941 from twbs/ijcheung-collapse-update-all-triggersChris Rebert2-7/+75
Update all collapse triggers with .collapsed class and aria-expanded
2015-02-26Update all collapse triggers with .collapsed class and aria-expandedIvan Cheung2-7/+75
Fixes #15741 Closes #15751 by merging it.
2015-02-26automatic grunt distBootstrap's Grunt bot1-1/+1
2015-02-26Run `grunt`.XhmikosR7-51/+51
2015-02-26Merge pull request #15933 from twbs/qunit-module-hooksHeinrich Fenkart13-26/+26
Unit tests: Use new names of module hooks
2015-02-25QUnit.jsDump => QUnit.dumpChris Rebert1-2/+2
Refs http://qunitjs.com/upgrade-guide-2.x/#replace-qunit-jsdump-with-qunit-dump
2015-02-25Use QUnit.log(...) instead of QUnit.log = ...Chris Rebert1-2/+2
Refs http://qunitjs.com/upgrade-guide-2.x/#replace-qunit-log-callback-with-qunit-log-callback-for-all-reporting-callbacks
2015-02-26automatic grunt distBootstrap's Grunt bot2-9/+11
2015-02-26Unit tests: Use new names of module hooksHeinrich Fenkart11-22/+22
Refs #15893
2015-02-26Merge pull request #15930 from twbs/modal-restore-inline-paddingHeinrich Fenkart2-7/+86
Modal: Apply any preexisting body padding again after closing
2015-02-26Modal: Apply any preexisting body padding again after closingnakupanda2-7/+86
2015-02-25Prevent collapsed navbar in Non-responsive ExampleTJ1-8/+4
Closes #15291 by merging it.
2015-02-26automatic grunt distBootstrap's Grunt bot2-3/+3
2015-02-26Tooltip: Avoid creating an unnecessary tooltip when `Tooltip#hide` is calledQuentin Spencer-Harper1-2/+2
Fixed performance bug where a tooltip element is created and then immediately destroyed when tooltip.hide() is called and there is no existing tooltip element Resolves #15557 by merging it.
2015-02-26automatic grunt distBootstrap's Grunt bot2-2/+2
2015-02-26Dropdowns: Skip `.disabled` instead of `.divider` on keydown eventvsn4ik2-1/+22
Fixes #15147. Closes #15520 by merging it.
2015-02-26automatic grunt distBootstrap's Grunt bot2-14/+14
2015-02-26Merge pull request #15923 from kkirsche/useExplicitVariableDeclarationHeinrich Fenkart4-12/+12
[Ref #15881] Use Explicit JS Variable Declarations rather than Chained
2015-02-26automatic grunt distBootstrap's Grunt bot2-7/+2
2015-02-25Merge pull request #15693 from huang-x-h/patch-1Chris Rebert1-5/+0
tip method in popover.js can be removed
2015-02-25[Ref #15881] Use Explicit Values rather than ChainKevin Kirsche4-12/+12
[Ref #15881] Use Explicit Values for javascript variables rather than chained ones. From https://github.com/twbs/bootstrap/pull/15881#discussion_r25330647
2015-02-24fix 2 typos in modal unit test assertion messagesChris Rebert1-2/+2
2015-02-24Merge pull request #15916 from kkirsche/patch-2Mark Otto1-0/+2
Add source code documentation of justified navbar for #15906
2015-02-24Merge pull request #15914 from StevenBlack/docs.js.headingsMark Otto2-9/+9
docs > js > headings
2015-02-24Document justified navbar for #15906Kevin Kirsche1-0/+2
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-25Follow-up to 769c27a19f: Add new section to navHeinrich Fenkart1-0/+1
2015-02-25Document how to properly handle modals with dynamic content heightKevin Kirsche1-0/+3
Fixes #15106. Closes #15910.