]> git.ipfire.org Git - thirdparty/bootstrap.git/log
thirdparty/bootstrap.git
11 years agoadd docs note about browsers w/ JS disabled; fixes #14134 14143/head
Chris Rebert [Tue, 15 Jul 2014 00:16:11 +0000 (17:16 -0700)] 
add docs note about browsers w/ JS disabled; fixes #14134

[skip sauce]

11 years agofix #14114 mo' betta
Chris Rebert [Mon, 14 Jul 2014 21:50:53 +0000 (14:50 -0700)] 
fix #14114 mo' betta

11 years agoMerge pull request #14138 from danielnixon/master
Chris Rebert [Sun, 13 Jul 2014 22:28:07 +0000 (15:28 -0700)] 
Merge pull request #14138 from danielnixon/master

Fix inaccessible buttons.

11 years agoFix inaccessible buttons. 14138/head
Daniel Nixon [Sun, 13 Jul 2014 22:13:17 +0000 (08:13 +1000)] 
Fix inaccessible buttons.

11 years agotypos
Mark Otto [Sun, 13 Jul 2014 07:08:25 +0000 (00:08 -0700)] 
typos

11 years agoRedundant thanks to bb1286a0ab073bce1d18f704d7ac0545ea76c6ef
Chris Rebert [Sun, 13 Jul 2014 01:15:45 +0000 (18:15 -0700)] 
Redundant thanks to bb1286a0ab073bce1d18f704d7ac0545ea76c6ef

11 years agogrunt
Mark Otto [Sun, 13 Jul 2014 01:06:26 +0000 (18:06 -0700)] 
grunt

11 years agoFixes #14074: Make open dropdown nav links in navbar use gradients
Mark Otto [Sun, 13 Jul 2014 00:59:02 +0000 (17:59 -0700)] 
Fixes #14074: Make open dropdown nav links in navbar use gradients

11 years agoFixes #14133
Mark Otto [Sun, 13 Jul 2014 00:53:31 +0000 (17:53 -0700)] 
Fixes #14133

11 years agoFixes #14132: add .alert-dismissible to docs examples
Mark Otto [Sun, 13 Jul 2014 00:51:57 +0000 (17:51 -0700)] 
Fixes #14132: add .alert-dismissible to docs examples

11 years agoUse bootstrapcdn links
Mark Otto [Sun, 13 Jul 2014 00:26:43 +0000 (17:26 -0700)] 
Use bootstrapcdn links

11 years agoNew Android select example
Mark Otto [Sun, 13 Jul 2014 00:23:51 +0000 (17:23 -0700)] 
New Android select example

Fixes #14114

11 years agoMerge pull request #14111 from hnrch02/bug-report-template
Mark Otto [Sat, 12 Jul 2014 23:17:06 +0000 (16:17 -0700)] 
Merge pull request #14111 from hnrch02/bug-report-template

Update JS Bin template in CONTRIBUTING.md

11 years agoUpdate JS Bin template in CONTRIBUTING.md 14111/head
Heinrich Fenkart [Thu, 10 Jul 2014 17:20:04 +0000 (19:20 +0200)] 
Update JS Bin template in CONTRIBUTING.md

Refs: #14109

11 years agoFixes #14095: Add basic styling for captions, which we've for some reason been missin...
Mark Otto [Sat, 12 Jul 2014 22:55:15 +0000 (15:55 -0700)] 
Fixes #14095: Add basic styling for captions, which we've for some reason been missing all this time.

11 years agogrunt
Mark Otto [Sat, 12 Jul 2014 22:47:42 +0000 (15:47 -0700)] 
grunt

11 years agoMerge pull request #14104 from KyleMit/add-pointer-events
Mark Otto [Sat, 12 Jul 2014 22:43:49 +0000 (15:43 -0700)] 
Merge pull request #14104 from KyleMit/add-pointer-events

Add Pointer Events

11 years agogrunt
Mark Otto [Sat, 12 Jul 2014 22:37:13 +0000 (15:37 -0700)] 
grunt

11 years agocode guide, fixes #14126
Mark Otto [Sat, 12 Jul 2014 22:36:08 +0000 (15:36 -0700)] 
code guide, fixes #14126

11 years agoFixes #13974, #14123: Remove translate3d repaint performance enhancement for text...
Mark Otto [Sat, 12 Jul 2014 22:22:29 +0000 (15:22 -0700)] 
Fixes #13974, #14123: Remove translate3d repaint performance enhancement for text rendering and position wonkiness

11 years agoFixes #14116: Use <button> elements over empty anchors
Mark Otto [Sat, 12 Jul 2014 22:16:43 +0000 (15:16 -0700)] 
Fixes #14116: Use <button> elements over empty anchors

11 years agoFixes #14107: Lighten placeholder text
Mark Otto [Sat, 12 Jul 2014 22:13:18 +0000 (15:13 -0700)] 
Fixes #14107: Lighten placeholder text

11 years agoGruntfile-specific JSHint config: disable ASI
Chris Rebert [Thu, 10 Jul 2014 23:57:26 +0000 (16:57 -0700)] 
Gruntfile-specific JSHint config: disable ASI

Refs #14118

11 years agoMerge pull request #14118 from vsn4ik/add-semicolon-in-gruntfile
Chris Rebert [Thu, 10 Jul 2014 23:56:25 +0000 (16:56 -0700)] 
Merge pull request #14118 from vsn4ik/add-semicolon-in-gruntfile

Gruntfile.js: Add semicolon in "_update-shrinkwrap" task.

11 years agoGruntfile.js: Add semicolon in "_update-shrinkwrap" task. 14118/head
vsn4ik [Thu, 10 Jul 2014 23:42:09 +0000 (03:42 +0400)] 
Gruntfile.js: Add semicolon in "_update-shrinkwrap" task.

11 years agoMerge pull request #14113 from vsn4ik/add-attributes-for-dropdown-example
Chris Rebert [Thu, 10 Jul 2014 20:32:22 +0000 (13:32 -0700)] 
Merge pull request #14113 from vsn4ik/add-attributes-for-dropdown-example

dropdowns.html: Add role="button" and id="..." to link in example.

11 years agodropdowns.html: Add role="button" and id="..." to link in example. 14113/head
vsn4ik [Thu, 10 Jul 2014 17:44:46 +0000 (21:44 +0400)] 
dropdowns.html: Add role="button" and id="..." to link in example.

11 years agoMerge pull request #14112 from vsn4ik/fix-sr-only-progress-bars
Chris Rebert [Thu, 10 Jul 2014 17:41:40 +0000 (10:41 -0700)] 
Merge pull request #14112 from vsn4ik/fix-sr-only-progress-bars

Fix text on ".progress-bar .sr-only" elements in docs

11 years agoFix text on ".progress-bar .sr-only" elements. 14112/head
vsn4ik [Thu, 10 Jul 2014 17:30:21 +0000 (21:30 +0400)] 
Fix text on ".progress-bar .sr-only" elements.

11 years agoRun `grunt`.
XhmikosR [Thu, 10 Jul 2014 07:03:24 +0000 (10:03 +0300)] 
Run `grunt`.

11 years agoUpdate uglify-js to v2.4.15.
XhmikosR [Thu, 10 Jul 2014 07:02:41 +0000 (10:02 +0300)] 
Update uglify-js to v2.4.15.

11 years agoUpdate dependencies.
XhmikosR [Thu, 10 Jul 2014 06:52:11 +0000 (09:52 +0300)] 
Update dependencies.

11 years agoAdd Pointer Events 14104/head
Kyle [Wed, 9 Jul 2014 23:21:45 +0000 (19:21 -0400)] 
Add Pointer Events

11 years agoRun `grunt`.
XhmikosR [Wed, 9 Jul 2014 07:24:39 +0000 (10:24 +0300)] 
Run `grunt`.

11 years agoUpdate uglify-js to v2.4.14.
XhmikosR [Tue, 8 Jul 2014 16:49:57 +0000 (19:49 +0300)] 
Update uglify-js to v2.4.14.

11 years agoMerge pull request #14090 from hnrch02/unit-tests-ie8
Chris Rebert [Tue, 8 Jul 2014 23:17:16 +0000 (16:17 -0700)] 
Merge pull request #14090 from hnrch02/unit-tests-ie8

Fix IE8 problems with unit tests

11 years ago`document.head` is undefined in IE8 14090/head
Heinrich Fenkart [Tue, 8 Jul 2014 22:38:44 +0000 (00:38 +0200)] 
`document.head` is undefined in IE8

11 years agoFix IE8 reporting type object for `getBoundingClientRect`
Heinrich Fenkart [Tue, 8 Jul 2014 22:29:38 +0000 (00:29 +0200)] 
Fix IE8 reporting type object for `getBoundingClientRect`

11 years agoFix IE8 reporting height style as all uppercase
Heinrich Fenkart [Tue, 8 Jul 2014 20:19:46 +0000 (22:19 +0200)] 
Fix IE8 reporting height style as all uppercase

11 years agoMerge pull request #14091 from twbs/tooltip-test-html-fix
Chris Rebert [Tue, 8 Jul 2014 22:40:46 +0000 (15:40 -0700)] 
Merge pull request #14091 from twbs/tooltip-test-html-fix

Fix unusual HTML in "should allow html entities" tooltip unit test

11 years agoFix invalid HTML in "should allow html entities" tooltip unit test 14091/head
Chris Rebert [Tue, 8 Jul 2014 21:39:35 +0000 (14:39 -0700)] 
Fix invalid HTML in "should allow html entities" tooltip unit test

Refs #14090.
Also, fix one typo.

11 years agoMerge pull request #14089 from twbs/accordion-panel-group-aria-multiselectable
Chris Rebert [Tue, 8 Jul 2014 19:56:06 +0000 (12:56 -0700)] 
Merge pull request #14089 from twbs/accordion-panel-group-aria-multiselectable

Add role="tablist" & aria-multiselectable="true" to accordion .panel-group

11 years agoMerge pull request #14088 from twbs/panel-collapse-role-tabpanel
Chris Rebert [Tue, 8 Jul 2014 19:55:41 +0000 (12:55 -0700)] 
Merge pull request #14088 from twbs/panel-collapse-role-tabpanel

add role="tabpanel" to .panel-collapse to improve accessibility

11 years agoAdd role="tablist" & aria-multiselectable="true" to accordion .panel-group to improve... 14089/head
Chris Rebert [Tue, 8 Jul 2014 19:43:57 +0000 (12:43 -0700)] 
Add role="tablist" & aria-multiselectable="true" to accordion .panel-group to improve accessibility

Refs #13555.
Per https://github.com/paypal/bootstrap-accessibility-plugin/blob/master/README.md#collapse
Credit: https://github.com/paypal/bootstrap-accessibility-plugin

[skip sauce]

11 years agoadd role="tabpanel" to .panel-collapse to improve accessibility 14088/head
Chris Rebert [Tue, 8 Jul 2014 19:39:15 +0000 (12:39 -0700)] 
add role="tabpanel" to .panel-collapse to improve accessibility

Refs #13555.
Per https://github.com/paypal/bootstrap-accessibility-plugin/blob/master/README.md#collapse
Credit: https://github.com/paypal/bootstrap-accessibility-plugin

[skip sauce]

11 years agoMerge pull request #14085 from twbs/tab-lis-role-preso
Chris Rebert [Tue, 8 Jul 2014 19:25:38 +0000 (12:25 -0700)] 
Merge pull request #14085 from twbs/tab-lis-role-preso

add role="presentation" to tab <li>s to improve accessibility

11 years agoMerge pull request #14086 from twbs/tab-pane-role-tabpanel
Chris Rebert [Tue, 8 Jul 2014 19:14:59 +0000 (12:14 -0700)] 
Merge pull request #14086 from twbs/tab-pane-role-tabpanel

Add role="tabpanel" to .tab-pane <div>s to improve accessibility

11 years agoAdd role="tabpanel" to .tab-pane <div>s to improve accessibility 14086/head
Chris Rebert [Tue, 8 Jul 2014 19:09:38 +0000 (12:09 -0700)] 
Add role="tabpanel" to .tab-pane <div>s to improve accessibility

Refs #13554.
Per https://github.com/paypal/bootstrap-accessibility-plugin/blob/master/README.md#tab-panel
Credit: https://github.com/paypal/bootstrap-accessibility-plugin

[skip sauce]

11 years agoadd role="presentation" to tab <li>s to improve accessibility 14085/head
Chris Rebert [Tue, 8 Jul 2014 18:58:33 +0000 (11:58 -0700)] 
add role="presentation" to tab <li>s to improve accessibility

Refs #13554.
Per https://github.com/paypal/bootstrap-accessibility-plugin/blob/master/README.md#tab-panel
Credit: https://github.com/paypal/bootstrap-accessibility-plugin

[skip sauce]

11 years agoMerge pull request #14083 from twbs/fix-14078
Chris Rebert [Tue, 8 Jul 2014 17:53:36 +0000 (10:53 -0700)] 
Merge pull request #14083 from twbs/fix-14078

Properly integrate Rouge into the Travis build

11 years agoproperly integrate Rouge into the Travis build; fixes #14078 14083/head
Chris Rebert [Tue, 8 Jul 2014 17:46:10 +0000 (10:46 -0700)] 
properly integrate Rouge into the Travis build; fixes #14078

[skip sauce]

11 years agoFix that @mdo nightlife <3
Julian Thilo [Tue, 8 Jul 2014 11:33:21 +0000 (13:33 +0200)] 
Fix that @mdo nightlife <3

11 years agoderp
Mark Otto [Tue, 8 Jul 2014 10:51:32 +0000 (03:51 -0700)] 
derp

11 years agoFixes #14068: Update docs note for inline forms
Mark Otto [Tue, 8 Jul 2014 03:44:43 +0000 (20:44 -0700)] 
Fixes #14068: Update docs note for inline forms

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Tue, 8 Jul 2014 03:29:51 +0000 (20:29 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agomore accurate homepage title
Mark Otto [Tue, 8 Jul 2014 03:29:43 +0000 (20:29 -0700)] 
more accurate homepage title

11 years agoMerge pull request #14072 from twbs/carousel-gloss-buttons
Chris Rebert [Tue, 8 Jul 2014 03:16:52 +0000 (20:16 -0700)] 
Merge pull request #14072 from twbs/carousel-gloss-buttons

Add screenreader text to prev/next carousel buttons in examples to improve accessibility

11 years agoMerge pull request #14071 from twbs/carousel-inner-role-listbox
Chris Rebert [Tue, 8 Jul 2014 03:09:58 +0000 (20:09 -0700)] 
Merge pull request #14071 from twbs/carousel-inner-role-listbox

add role="listbox" to .carousel-inner to improve accessibility of Carousels

11 years agoAdd screenreader text to prev/next carousel buttons in examples to improve accessibility 14072/head
Chris Rebert [Tue, 8 Jul 2014 03:04:22 +0000 (20:04 -0700)] 
Add screenreader text to prev/next carousel buttons in examples to improve accessibility

Refs #13556.
Per https://github.com/paypal/bootstrap-accessibility-plugin/blob/master/README.md#carousel
Credit: https://github.com/paypal/bootstrap-accessibility-plugin

[skip sauce]

11 years agoadd role="listbox" to .carousel-inner to improve accessibility of Carousels 14071/head
Chris Rebert [Tue, 8 Jul 2014 02:53:57 +0000 (19:53 -0700)] 
add role="listbox" to .carousel-inner to improve accessibility of Carousels

Refs #13556.
Per https://github.com/paypal/bootstrap-accessibility-plugin/#carousel
Credit: https://github.com/paypal/bootstrap-accessibility-plugin

[skip sauce]

11 years agoCut down on homepage file size; reorg some docs CSS
Mark Otto [Tue, 8 Jul 2014 02:40:15 +0000 (19:40 -0700)] 
Cut down on homepage file size; reorg some docs CSS

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Tue, 8 Jul 2014 02:38:32 +0000 (19:38 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoMerge pull request #14036 from twbs/fix-13575
Chris Rebert [Tue, 8 Jul 2014 02:36:32 +0000 (19:36 -0700)] 
Merge pull request #14036 from twbs/fix-13575

Jekyll: Use non-minified assets when not running from GitHub Pages

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Tue, 8 Jul 2014 02:33:44 +0000 (19:33 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoMerge pull request #14070 from twbs/pills-role-tablist-too
Chris Rebert [Tue, 8 Jul 2014 02:30:18 +0000 (19:30 -0700)] 
Merge pull request #14070 from twbs/pills-role-tablist-too

Add role="tablist" to .nav-pills in examples to improve accessibility

11 years agoAdd role="tablist" to .nav-pills in examples to improve accessibility 14070/head
Chris Rebert [Tue, 8 Jul 2014 02:22:00 +0000 (19:22 -0700)] 
Add role="tablist" to .nav-pills in examples to improve accessibility

Follow-up to e9374c0609c9e63fd6033f684b18ff105e1756ae
Per https://github.com/paypal/bootstrap-accessibility-plugin/commit/f203dea4b6d17264d7b776f02feaeeaa386cc9b2
Credit: https://github.com/paypal/bootstrap-accessibility-plugin & @rohk

[skip sauce]

11 years agoSwitch to Rogue over Pygments for speeeeeed
Mark Otto [Tue, 8 Jul 2014 01:20:18 +0000 (18:20 -0700)] 
Switch to Rogue over Pygments for speeeeeed

11 years agoPart 2 for fixing #13996: Add a docs callout to help folks using SVG images in IE8-10
Mark Otto [Tue, 8 Jul 2014 00:26:52 +0000 (17:26 -0700)] 
Part 2 for fixing #13996: Add a docs callout to help folks using SVG images in IE8-10

11 years agoPart 1 for fixing #13996: Revert the width: 100% \9; IE hack for SVG img-responsive
Mark Otto [Mon, 7 Jul 2014 23:59:59 +0000 (16:59 -0700)] 
Part 1 for fixing #13996: Revert the width: 100% \9; IE hack for SVG img-responsive

11 years agoMerge pull request #14065 from twbs/glyphicons-grunt-bye
Chris Rebert [Mon, 7 Jul 2014 19:07:58 +0000 (12:07 -0700)] 
Merge pull request #14065 from twbs/glyphicons-grunt-bye

remove Glyphicons docs autogeneration from Grunt

11 years agoremove Glyphicons docs autogeneration from Grunt 14065/head
Chris Rebert [Mon, 7 Jul 2014 18:00:32 +0000 (11:00 -0700)] 
remove Glyphicons docs autogeneration from Grunt

Simplifies the build tooling a teeny bit.
This data file shouldn't need to be updated for v3 ever again.
This task will also be unnecessary in v4.

[skip sauce] [skip validator]

11 years agogrunt
Mark Otto [Mon, 7 Jul 2014 07:59:51 +0000 (00:59 -0700)] 
grunt

11 years agoMerge pull request #14058 from twbs/btn_focus
Mark Otto [Mon, 7 Jul 2014 07:59:10 +0000 (00:59 -0700)] 
Merge pull request #14058 from twbs/btn_focus

Follow up to #13907: Add .focus styles for buttons

11 years agoFollow up to #13907: Add .focus styles for buttons 14058/head
Mark Otto [Mon, 7 Jul 2014 07:56:06 +0000 (00:56 -0700)] 
Follow up to #13907: Add .focus styles for buttons

11 years agoMerge pull request #14051 from loic/issue13325
Mark Otto [Mon, 7 Jul 2014 07:39:06 +0000 (00:39 -0700)] 
Merge pull request #14051 from loic/issue13325

Address margins on .navbar-right to fix #13325 #13464.

11 years agoMerge pull request #13907 from twbs/fat-12145
Mark Otto [Mon, 7 Jul 2014 07:36:59 +0000 (00:36 -0700)] 
Merge pull request #13907 from twbs/fat-12145

add "focus" to focused btns with button plugin

11 years agodocs HTML5 validity fixup to 8e2348e9eda51296eb680192379ab37f10355ca3
Chris Rebert [Mon, 7 Jul 2014 07:25:55 +0000 (00:25 -0700)] 
docs HTML5 validity fixup to 8e2348e9eda51296eb680192379ab37f10355ca3

11 years agoMerge pull request #14057 from hnrch02/patch-1
Chris Rebert [Mon, 7 Jul 2014 07:24:13 +0000 (00:24 -0700)] 
Merge pull request #14057 from hnrch02/patch-1

Fix small typo introduced in e2029e1

11 years agoFix small typo introduced in e2029e1 14057/head
Heinrich Fenkart [Mon, 7 Jul 2014 07:23:12 +0000 (09:23 +0200)] 
Fix small typo introduced in e2029e1

11 years agonitpick phrasing of the docs added for #13835
Chris Rebert [Mon, 7 Jul 2014 07:10:49 +0000 (00:10 -0700)] 
nitpick phrasing of the docs added for #13835

11 years agogrammar fix; indicate that img[src] shouldn't actually be empty
Chris Rebert [Mon, 7 Jul 2014 07:04:14 +0000 (00:04 -0700)] 
grammar fix; indicate that img[src] shouldn't actually be empty

11 years agoMerge branch 'master' of github.com:twbs/bootstrap
Mark Otto [Mon, 7 Jul 2014 06:45:36 +0000 (23:45 -0700)] 
Merge branch 'master' of github.com:twbs/bootstrap

11 years agoMerge pull request #14029 from BBosman/touch-action
Mark Otto [Mon, 7 Jul 2014 06:43:43 +0000 (23:43 -0700)] 
Merge pull request #14029 from BBosman/touch-action

Add touch-action: manipulate to .btn

11 years agoAddress margins on .navbar-right to fix #13325 #13464. 14051/head
Loic Bistuer [Mon, 7 Jul 2014 05:56:52 +0000 (12:56 +0700)] 
Address margins on .navbar-right to fix #13325 #13464.

This commit follows f9fde56.

11 years agofix scrollspy test in firefox mac os
fat [Mon, 7 Jul 2014 04:50:46 +0000 (21:50 -0700)] 
fix scrollspy test in firefox mac os

11 years agoMerge pull request #13853 from hnrch02/unit-tests-cleanup
Jacob [Mon, 7 Jul 2014 04:43:48 +0000 (21:43 -0700)] 
Merge pull request #13853 from hnrch02/unit-tests-cleanup

Major unit tests cleanup

11 years agoFixes #13746: Add docs section for brand image
Mark Otto [Mon, 7 Jul 2014 01:39:37 +0000 (18:39 -0700)] 
Fixes #13746: Add docs section for brand image

11 years agoFixes #13835: More explicitly document mobile dropdown menu dismissing behavior
Mark Otto [Sun, 6 Jul 2014 23:55:35 +0000 (16:55 -0700)] 
Fixes #13835: More explicitly document mobile dropdown menu dismissing behavior

11 years agoFixes #14053: Don't show radio/checkbox in justified button groups
Mark Otto [Sun, 6 Jul 2014 23:48:41 +0000 (16:48 -0700)] 
Fixes #14053: Don't show radio/checkbox in justified button groups

11 years agoMerge pull request #14021 from CFXd/add_collapsed_default_class_to_navbar_collapse_button
Mark Otto [Sun, 6 Jul 2014 23:37:42 +0000 (16:37 -0700)] 
Merge pull request #14021 from CFXd/add_collapsed_default_class_to_navbar_collapse_button

Add collapsed default class to navbar-toggle

11 years agogrunt
Mark Otto [Sun, 6 Jul 2014 22:35:24 +0000 (15:35 -0700)] 
grunt

11 years agoFixes #13997: Move min-height for radio/checkbox to their inner label
Mark Otto [Sun, 6 Jul 2014 22:09:20 +0000 (15:09 -0700)] 
Fixes #13997: Move min-height for radio/checkbox to their inner label

11 years agogrunt
Mark Otto [Sun, 6 Jul 2014 22:08:37 +0000 (15:08 -0700)] 
grunt

11 years agojscs fix
Mark Otto [Sun, 6 Jul 2014 22:08:33 +0000 (15:08 -0700)] 
jscs fix

11 years agoMerge branch 'breaddevil-replace-scrollspy-default-behavior-test'
fat [Sun, 6 Jul 2014 21:11:38 +0000 (14:11 -0700)] 
Merge branch 'breaddevil-replace-scrollspy-default-behavior-test'

11 years agoMerge branch 'replace-scrollspy-default-behavior-test' of git://github.com/breaddevil...
fat [Sun, 6 Jul 2014 21:11:23 +0000 (14:11 -0700)] 
Merge branch 'replace-scrollspy-default-behavior-test' of git://github.com/breaddevil/bootstrap into breaddevil-replace-scrollspy-default-behavior-test

Conflicts:
js/tests/unit/scrollspy.js

11 years agoMerge pull request #13815 from hnrch02/tabs-fade-not-active
Jacob [Sun, 6 Jul 2014 20:50:54 +0000 (13:50 -0700)] 
Merge pull request #13815 from hnrch02/tabs-fade-not-active

Allow tabs to fade in if no initially active pane is present

11 years agoUpdate package.json.
XhmikosR [Sun, 6 Jul 2014 11:20:49 +0000 (14:20 +0300)] 
Update package.json.

* "grunt-jscs-checker" was renamed to "grunt-jscs"
* update deps

11 years agoMove to leading pluses 13853/head
Heinrich Fenkart [Sun, 6 Jul 2014 09:56:12 +0000 (11:56 +0200)] 
Move to leading pluses

11 years agoMerge pull request #14015 from twbs/possible-14013-fix
Chris Rebert [Sun, 6 Jul 2014 07:36:52 +0000 (00:36 -0700)] 
Merge pull request #14015 from twbs/possible-14013-fix

Possible fix for #14013