rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00
Code Issues Actions Packages Releases Activity
17,454 Commits 108 Branches 89 Tags 552 MiB
ed286e0f3d
Commit Graph

1480 Commits

Author SHA1 Message Date
XhmikosR
b55fa5579b tabs: make the active selector more restrictive again. 
When one uses say a carousel inside a tab, the `.active` selector previously matches the carousel ones too leading to broken tabs.

It's not the perfect solution but should the job for now.
 2017-08-11 15:04:07 +03:00
Mark Otto
35f80bb12e bump to beta 2017-08-10 20:56:35 -07:00
XhmikosR
88c9a1609c Fix ESLint docs errors. (#23163) 
Ignore ESLint error in ie-emulation-modes-warning.js.

Although the error is valid, enough time has been spent on old IE's problems, so just ignore it.
 2017-07-28 09:18:47 +03:00
Mark Otto
082c9d92fe dist 2017-07-16 13:11:21 -07:00
Bardi Harborow
028863dd08 Fall back to ESLint v3 indentation behaviour. 2017-07-16 13:51:16 +10:00
Bardi Harborow
d35020cee8 Update dependencies. 2017-07-16 13:51:16 +10:00
Mark Otto
2a745e54de npm build 2017-07-04 11:55:16 -07:00
Johann-S
0480a75a5a Dropdown - Disable applyStyle modifier instead of removing inline style applied by Popper.js 2017-07-04 10:37:44 +02:00
Mark Otto
93b2682880 npm build 2017-07-02 10:40:27 -07:00
Mark Otto
337ead4b27 build dist 2017-07-01 22:25:38 -07:00
Mark Otto
7f6479b0d9 build dist 2017-06-30 15:45:27 -07:00
Mark Otto
eedbe43ea7 build dist 2017-06-30 13:15:09 -07:00
Mark Otto
56d43eb3e9 Merge branch 'v4-dev' into colors-redux 2017-06-30 08:33:09 -07:00
Mark Otto
f83c981d08 build dist 2017-06-30 08:32:49 -07:00
Mark Otto
6055453e41 Merge branch 'v4-dev' into colors-redux 2017-06-29 23:15:48 -07:00
Mark Otto
f46f26bbaa build 2017-06-29 21:31:11 -07:00
Mark Otto
52cf0fe648 update instances of .bg-inverse and .bg-faded to .bg-dark and .bg-light 2017-06-25 18:31:23 -07:00
Mark Otto
36e482ed27 update navbars to rename .navbar-inverse to .navbar-dark, update all navbar examples and variables 2017-06-25 18:29:43 -07:00
Mark Otto
16d77b4cb0 build 2017-06-18 18:32:16 -07:00
Mark Otto
72a0093200 build 2017-06-18 00:14:35 -07:00
Johann-S
8170816094 Detect if the dropdown is in a navbar or not when update is called 2017-06-17 13:12:39 -07:00
Catalin Zalog
f640ec9662 Some .navbar .dropdown-menu optimisation (#22776) 2017-06-17 13:12:39 -07:00
Johann-S
af93db294b Reset Popper.js styles for Dropdowns in navbar 2017-06-17 13:12:39 -07:00
Mark Otto
ce98a1da5b build 2017-06-17 10:13:43 -07:00
Johann-S
6ed8a735d0 fix some errors in our js 2017-06-16 10:57:13 +02:00
Mark Otto
9c0e423008 Rename popover classes 
Part of an update to align the naming schemes across our components.

- Renames .popover-title to .popover-header
- Renames .popover-content to .popover-body

Refs: #22092
 2017-06-15 09:05:30 -07:00
Mark Otto
6c8c0aa4cf Rename .card-block to .card-body to match nomenclature of modals 2017-06-15 09:05:16 -07:00
Mark Otto
2e798301ca build 2017-06-14 20:44:32 -07:00
Johann-S
f0124769c9 Collapse supports multi-target thanks to @vanduynslagerp (#22713) 2017-06-14 13:21:49 +02:00
Johann-S
4a2b183e48 Fix unit tests with no assertion 2017-06-14 11:18:12 +02:00
Johann-S
1ec68d748b Upgrade QUnit to 2.3.3 2017-06-14 11:18:12 +02:00
Johann-S
2d87895089 Update path to our docs assets for visual tests 2017-06-04 11:08:31 +02:00
Mark Otto
620257456e build 2017-05-31 21:25:47 -07:00
Mark Otto
332d882cdb Merge branch 'v4-dev' into v4-docs-streamlined 2017-05-31 20:46:29 -07:00
Johann-S
5f493cfc74 Remove the use of x-arrow attribute for Tooltips/Popovers arrows 2017-05-31 09:54:58 +02:00
Mark Otto
2fd192968d Merge branch 'v4-dev' into v4-docs-streamlined 2017-05-30 23:31:40 -07:00
CDAGaming
ccd86bdc96 Update Dependencies (REUPLOAD) (#22594) 
* Update Dependencies (REUPLOAD)

Uglify-JS: 2.8.22 > 3.0.3
QUnitJS: 2.3.1 > 2.3.2
PostCSS-CLI: 3.1.1 > 4.0.0
Clean-CSS-CLI: 4.0.12 > 4.1.0
Babel-Eslint: 7.2.2 > 7.2.3
AutoPrefixer: 6.7.7 > 7.0.1

* Updates More Dependencies

Autoprefixer: v7.0.1 > v7.1.1
Clean-CSS-CLI: v4.1.0 > v4.1.3
Node-Sass: v4.5.2 > v4.5.3
PostCSS-FlexBugs-Fixes: v2.1.1 > v3.0.0
Uglify-JS: v3.0.3 > v3.0.11
Signed-off-by: CDAGaming <cstack2011@yahoo.com>

* Update Gem Bundler Dependency

Signed-off-by: CDAGaming <cstack2011@yahoo.com>

* Update Gemfile.lock Dependency

Signed-off-by: CDAGaming <cstack2011@yahoo.com>

* Update QUnit

Signed-off-by: CDAGaming <cstack2011@yahoo.com>

* Update Uglify-JS to v3.0.13

Signed-off-by: CDAGaming <cstack2011@yahoo.com>
 2017-05-30 21:11:56 -07:00
Mark Otto
73a550c7f8 update paths 2017-05-29 23:32:28 -07:00
Geremia Taglialatela
db44e4b311 Update nav and navbar HTML markup 
According to the docs, you just need to apply the `navbar-nav` to an
`<ul>` tag in a list-based navbar. In fact, `navbar-nav` seems to
override all the css properties set by `nav`.

Also, `nav-item` class should be used only for `<li>` tags, or in
conjunction with `<a>` tags to entirely avoid the list-based approach.

This commit removes the redundant `nav` class from `navbar-nav` `<ul>`
tags, moves `nav-item` from `<a>` tags to `<li>` tags and properly
adds `nav-item` class to `<li>` tags where missing.

Refs:

* https://v4-alpha.getbootstrap.com/components/navs/
* https://v4-alpha.getbootstrap.com/components/navbar/#nav
 2017-05-27 15:21:49 -07:00
Mark Otto
4282d892f3 build 2017-05-26 20:20:10 -07:00
Johann-S
4c3b6c5ceb Placement auto for popovers 2017-05-24 14:57:40 +02:00
Johann-S
2c72af88ee Placement auto for tooltips 2017-05-24 14:57:40 +02:00
Johann-S
aa36439e17 Use Popper.js to manage arrow position 2017-05-23 15:19:54 +02:00
Johann-S
70f4a30def Better management of dropdown/dropup with alignment 2017-05-22 16:14:10 +02:00
Johann-S
b36d8ae6cb Use popper to align dropdown menu instead of using css with important 2017-05-17 22:03:11 +02:00
Johann-S
3719ed4cb6 build 2017-05-16 10:09:48 +02:00
Johann-S
c78cbb275b Change fallbackPlacement to flip by default for Tooltips/Popovers 2017-05-14 11:41:19 +02:00
Johann-S
cc455c16c3 Fix bad position for Tooltips with animation at true 2017-05-14 11:41:19 +02:00
Johann-S
0cdf176f7a Use _jQueryInterface for Dropdown to call toggle method 2017-05-14 11:41:19 +02:00
Johann-S
0ae9d28ba3 Add fallbackPlacement option for Tooltip and Popover 2017-05-14 11:41:19 +02:00
Johann-S
ab7dc8ae2a Fix dropdown in scrollspy visual test (add Popper.js) 2017-05-14 11:41:19 +02:00
Johann-S
4f882a840c Allow to disable flip behaviour on Dropdown + documentation 2017-05-14 11:41:19 +02:00
Johann-S
e5a0471b0b Add an update method to allow to update position for Tooltip/Popover/Dropdown manually 2017-05-14 11:41:19 +02:00
Johann-S
fc8b85b626 Fix some css for the arrow of Popover/Tooltip + update documentation 2017-05-14 11:41:19 +02:00
Johann-S
18e4e851e2 Better placement for Dropdown + Handle flip of Tooltip/Popover 2017-05-14 11:41:19 +02:00
Johann-S
d5fabf8de5 Remove totaly Tether from documentation + dependencies 2017-05-14 11:41:19 +02:00
Johann-S
53ee455bc7 Handle dropup for Dropdown 2017-05-14 11:41:19 +02:00
Johann-S
69de65180f Fix unit tests + Update Popper to 1.6.0 2017-05-14 11:41:19 +02:00
Johann-S
c21a2b0d92 Remove constraints option and check every options 2017-05-14 11:41:19 +02:00
Johann-S
54a8ab4011 Begin to use Popper for Dropdown 2017-05-14 11:41:19 +02:00
Johann-S
d8996a7e0a Fix arrow for tooltip and popover 2017-05-14 11:41:19 +02:00
Johann-S
b40b1bc396 Add attachment classes 2017-05-14 11:41:19 +02:00
Johann-S
81e07ec052 Begin to add arrow to Popover and Tooltip 2017-05-14 11:41:19 +02:00
Johann-S
6cf0fe8780 Use Popper for tooltip and popover 2017-05-14 11:41:19 +02:00
Joyce Babu
db2db6cd0e Fix typo removeData for Tabs plugin 
Should remove `data` not `class` on dispose
 2017-04-28 15:31:35 +02:00
Anna
33715a73d2 Fix Toggle buttons don't honor [disabled] or .disabled 2017-04-26 18:46:05 +02:00
Pierre Vanduynslager
ab39defe74 Detach accordion from card without requiring 'data-children' 2017-04-25 09:32:14 +02:00
Mark Otto
ba312c20a5 build 2017-04-21 23:58:09 -07:00
Zach Leatherman
638b97f19c Arguably more professional pictures of Rick Ross 2017-04-21 20:51:35 -07:00
Bardi Harborow
2906b612d5 More minor build tweaks and docs updates. 2017-04-21 21:08:40 +10:00
Patrick H. Lauke
fb3303f5dd Fix for copy/paste error in iOS hack to tooltips 
(with apologies, this slipped through due to build system problems on my
end)
 2017-04-20 14:35:33 +01:00
Patrick H. Lauke
1f37c536b2 Tweak iOS hack for dropdown 
Tweak to https://github.com/twbs/bootstrap/pull/22426, where the wrong selector slipped through the net (selecting all of `<body>`s grand-children rather than children)
 2017-04-20 14:08:40 +01:00
Patrick H. Lauke
ef099ad05d Add iOS hack to tooltips 
Same hack as in https://github.com/twbs/bootstrap/pull/22426 (modulo the selector, which is wrong in that PR and will be updated in a separate PR) to get tooltips to work correctly on iOS. Dynamically adds/removes empty (`noop`) `touchstart` event handlers to all children of `<body>` in order to coax iOS into proper event delegation/bubbling
 2017-04-20 13:49:35 +01:00
Bardi Harborow
b4ac48fdec Build system overhaul. 2017-04-20 14:31:22 +10:00
Patrick H. Lauke
6ae5fb12e6 Fix carousel "hover" behavior on touch-enabled devices 
* Add carousel mouse listeners even if touch events enabled

- touch events are enabled not just on "mobile", just also on
touch-enabled desktop/laptop devices; additionally, it's possible to
pair a mouse with traditionally touch-only devices (e.g. Android
phones/tablets); currently, in these situations the carousel WON'T pause
even when using a mouse

* Restart cycle after touchend

as `mouseenter` is fired as part of the touch compatibility events, the
previous change results in carousels which cycle until the user
tapped/interacted with them. after that they stop cycling (as
`mouseleave` is not sent to the carousel after user scrolled/tapped
away).
this fix resets the cycling after `touchend` - essentially returning
to the previous behavior, where on touch the carousel essentially never
pauses, but now with the previous fix it at least pauses correctly for
mouse users on touch-enabled devices.
includes documentation for this new behavior.
 2017-04-17 13:26:46 +01:00
Mark Otto
bc0cf36dc8 grunt 2017-04-16 13:54:07 -07:00
Patrick H. Lauke
6d64afe508 Replace dropdown backdrop hack with cleaner JS-only hack 
* Replace backdrop with simple noop mouse listener

As discussed in https://github.com/twbs/bootstrap/pull/22422 the current
approach of injecting a backdrop (to work around iOS' broken event
delegation for the `click` event) has annoying consequences on
touch-enabled laptop/desktop devices.
Instead of a backdrop `<div>`, here we simply add extra empty/noop
mouse listeners to the immediate children of `<body>` (and remove
them when the dropdown is closed) in order to force iOS to properly
bubble a `click` resulting from a tap (essentially, method 2 from
https://www.quirksmode.org/blog/archives/2014/02/mouse_event_bub.html)
This is sufficient (except in rare cases where the user does manage to tap
on the body itself, rather than any child elements of body - which is not
very likely in an iOS phone/tablet scenario for most layouts) to get iOS to
get a grip and do the correct event bubbling/delegation, meaning the regular
"click" event will bubble back to the `<body>` when tapping outside of the dropdown,
and the dropdown will close properly (just like it already does, even without
this fix, in non-iOS touchscreen devices/browsers, like Chrome/Android and
Windows on a touch laptop).
This approach, though a bit hacky, has no impact on the DOM structure, and
has no unforeseen side effects on touch-enabled laptops/desktops. And crucially,
it works just fine in iOS.

* Remove dropdown backdrop styles

* Update doc for dropdowns and touch-enabled devices
 2017-04-14 09:19:00 +01:00
Pierre Vanduynslager
2f94166276 Merge branch 'v4-dev' into dropdown-keyboard 2017-04-12 16:31:50 -04:00
Patrick H. Lauke
3275ca4b30 Reword "mobile" to "touch-enabled" 
...as touch is not exclusive to "mobile" anymore nowadays. also explicitly clarifies this is a fix for iOS, and that it impacts touch laptops etc as well. lastly, renames the variable from "dropdown" to "backdrop" for clarity/consistency
 2017-04-12 18:39:23 +01:00
Pierre Vanduynslager
208e0384df Merge branch 'v4-dev' into dropdown-keyboard 2017-04-12 10:36:14 -04:00
Pierre-Denis Vanduynslager
81e12d5715 Indent 2017-04-12 09:41:27 -04:00
Patrick H. Lauke
53b2c5520b Remove inappropriate role="listbox" from carousels 2017-04-11 11:12:30 +01:00
Pierre Vanduynslager
025ddb185e Merge branch 'v4-dev' into dropdown-keyboard 2017-04-10 11:04:05 -04:00
Patrick H. Lauke
18e8704221 Fix collapse.js aria-expanded behavior 
* Remove aria-expanded from collapse.js target element

aria-expanded="true"/aria-expanded="false" only applies to the trigger,
not the element that is being expanded/collapsed.

* Tweak collapse.js accessibility section

...to make it clearer that the aria-expanded attribute always just goes
on the control.

* Fix collapse.js unit tests

- reword some of the text to make it clear we're checking behavior of
trigger/control
- move incorrect aria-expanded out of the <div>s and to the actual
trigger/control <a>s
- fix incorrect test assertion text output false -> true
 2017-04-10 14:51:22 +01:00
Patrick H. Lauke
3f6e1faf45 Only change aria-pressed if it's not an input-based radio or checkbox group 
* Only change aria-pressed if it's not an input-based radio or checkbox group

aria-pressed="true"/aria-pressed="false" is really only useful for
making on/off toggles out of, say, `<button>` elements. the attribute is
useless (and potentially confusing/conflicting) on, say, `<label>`
elements for an existing `<input type="radio">` or similar.

* Add unit test for buttons.js and radio/checkbox inputs in button groups
 2017-04-10 14:43:54 +01:00
Pierre Vanduynslager
d3fbebefcd Merge branch 'v4-dev' into dropdown-keyboard 2017-04-09 18:16:37 -04:00
Patrick H. Lauke
2626eba5f1 Prevent default for ESC in modal.js 
ESC can be used to close modals, but on OS X/macOS this also jumps out
of full-screen mode. `preventDefault` suppresses this.
 2017-04-09 16:19:20 +01:00
Pierre Vanduynslager
fe72daf2b3 Merge branch 'v4-dev' into dropdown-keyboard 2017-04-08 18:43:25 -04:00
Mark Otto
364e01885f grunt 2017-04-08 13:22:53 -07:00
Ilias
e6e070b02a Fix #22332: Adjust tests for hidden scrollbar 2017-04-03 13:27:15 +02:00
Mark Otto
7d88f365c0 Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2017-04-02 12:00:52 -07:00
Ilias
a14451deb3 Fix #18373: properly adjust padding-right of body and fixed elements when opening or closing modal 2017-04-02 13:26:25 +02:00
Pierre Vanduynslager
91b62941af Tabs/Scrollspy/.nav/.list-group/.active independent of markup (<nav>, .nav-item, <li> etc...) 2017-04-02 11:21:04 +02:00
Mark Otto
49b6cf845d grunt 2017-04-01 19:18:29 -07:00
Johann-S
5142de7e59 Popover + Tooltip - fix error when content or title is a number 2017-03-31 10:03:54 +02:00
Johann-S
fb42d6e043 Collapse - Fix check to not prevent event for input and textarea 2017-03-29 00:10:27 +02:00
Pierre Vanduynslager
48c5efa4c3 Fix JS components console error "Error: <Component> is transitioning" 2017-03-28 23:43:15 +02:00
Mark Otto
cf7d3e11e0 grunt 2017-03-28 09:31:32 -07:00
Johann
904efc043d Fix different tooltips offset when hovering 2017-03-28 15:55:03 +02:00
Mark Otto
7742ba6dc9 grunt 2017-03-27 22:56:14 -07:00
Johann
24924c23b2 Collapse - do not prevent event for input and textarea 2017-03-27 10:08:39 +02:00
Mark Otto
4ab06ca453 grunt 2017-03-26 11:26:31 -07:00
Mark Otto
90c5f6230b rename from .navbar-toggleable to .navbar-expand to reflect mobile first approach everywhere else 2017-03-23 23:02:28 -07:00
Mark Otto
11ba308b2f more docs updates 2017-03-23 23:02:28 -07:00
Johann
3f247a42f2 Fix Modal documentation about _handleUpdate method + move to public scope (#21877) 
Fix Modal documentation about _handleUpdate method + move to public scope
 2017-03-23 22:22:09 +01:00
Pierre Vanduynslager
37f438910f Accordion behavior with JQuery interface (#21726) 
Fix accordion behavior with JQuery interface
 2017-03-23 21:15:41 +01:00
Johann
c72a315740 Carousel - Add attributes from and to for Slid and Slide events (#21668) 
Carousel - Add attributes from and to for Slid and Slide events
 2017-03-22 22:42:13 +01:00
Pierre Vanduynslager
78fc4d23fc Always append element to fixture in Scrollspy unit tests (#22234) 2017-03-21 10:21:00 -07:00
Bardi Harborow
cab6f7d16c More config tweaks. 2017-03-21 21:37:33 +11:00
Bardi Harborow
09fb2b9af3 Update dependencies. 2017-03-20 17:37:05 +11:00
Mark Otto
e506e59c45 grunt 2017-03-19 19:03:32 -07:00
Mark Otto
3730c5dbf5 Merge branch 'collapse' of https://github.com/Johann-S/bootstrap into Johann-S-collapse 2017-03-19 18:43:13 -07:00
Pierre-Denis Vanduynslager
f5cc591456 Merge branch 'twbs/v4-dev' into dropdown-keyboard 2017-03-18 22:08:55 -04:00
Mark Otto
ae50bb7845 grunt 2017-03-18 18:47:57 -07:00
Pierre Vanduynslager
275821bbb0 HTMLElement.offset* by getBoundingClientRect() (#21788) 
* Replace element.offet* by getBoundingClientRect()

* Use variable to store BoundingClientRect

* Fix cc issue...
 2017-03-18 18:24:54 -07:00
Johann
f2f2e39a45 Fix getSelectorFromElement when # is a selector (#21615) 
* Fix getSelectorFromElement when # is a selector

* Thanks to @vanduynslagerp remove regex to validate selector
 2017-03-18 17:42:11 -07:00
Pierre Vanduynslager
f2f8051285 Fix backdrop for dropdown menu on mobile (#21578) 
- Create backdrop only if the menu is actually open (do not create it if the show event is prevented)
- Drop the backdrop only when the corresponding menu is closed (do not remove if there is no menu to close or if the hide event is prevented)
 2017-03-18 17:41:13 -07:00
Mark Otto
5a5ab4c0de grunt 2017-03-18 16:51:32 -07:00
Johann
1a46d8c730 Allow to use Tab.js with list-group (#21756) 
* Allow to use Tab.js with list-group

* Allow to use list-group with div parent instead of an ul parent
 2017-03-18 16:36:33 -07:00
Bardi Harborow
84ce248f06 Update config files across the board. 2017-03-12 16:15:00 +11:00
Johann-S
21b537cc24 Add unit test 2017-03-09 11:08:47 +01:00
Johann-S
fa1504e6f6 Fix code style 2017-03-08 11:15:58 +01:00
Johann-S
099486f294 Detach accordions from .card 2017-03-07 10:46:08 +01:00
Bardi Harborow
6593b15555 Refactor QUnit test page. 2017-02-22 11:14:47 +11:00
Pierre-Denis Vanduynslager
4ab576a419 Fixes #21941 2017-02-08 18:51:50 -05:00
Bardi Harborow
cb87eebcbb Update dependencies. 2017-02-05 23:50:06 +11:00
Pierre-Denis Vanduynslager
403f55fba9 Fix spacebar key in Firefox for button elements 2017-01-22 17:34:54 -05:00
Pierre-Denis Vanduynslager
1cdd0d16c1 Merge branch 'twbs/v4-dev' into dropdown-keyboard 2017-01-22 17:32:50 -05:00
Mark Otto
deb1c59c53 grunt 2017-01-21 17:50:45 -08:00
Pierre-Denis Vanduynslager
ef2181ff4d Harmonize document.activeElement comparison 2017-01-20 23:22:50 -05:00
Pierre-Denis Vanduynslager
4448ca057b Refactor test to event and async 2017-01-20 23:02:45 -05:00
Pierre-Denis Vanduynslager
1a783a4255 Add unit test for keyboard navigation 2017-01-20 23:02:19 -05:00
Pierre-Denis Vanduynslager
59f438b40e Merge branch 'twbs/v4-dev' into dropdown-keyboard 2017-01-20 20:27:17 -05:00
Pierre-Denis Vanduynslager
9daf681478 Fix test to retrieve the proper item instead of it's parent 2017-01-20 20:27:14 -05:00
Pierre-Denis Vanduynslager
57713c9fc5 Fix missing closing tag 2017-01-18 15:01:06 -05:00
Pierre-Denis Vanduynslager
a85b80fa75 Merge branch 'twbs/v4-dev' into dropdown-keyboard 2017-01-15 10:33:54 -05:00
Pierre-Denis Vanduynslager
8fbd4aaa38 Correct reference to Direction.PREV constant. (#21709) 2017-01-15 13:46:03 +11:00
Pierre-Denis Vanduynslager
c80e13a48a Use existing keycode constants in dropdown. (#21697) 2017-01-15 13:42:24 +11:00
Patrick H. Lauke
6b48ba4e0d Remove incorrect aria-multiselectable 
Closes https://github.com/twbs/bootstrap/issues/21635
 2017-01-11 23:57:59 +00:00
Pierre-Denis Vanduynslager
4c2f544359 Merge branch 'twbs/v4-dev' into dropdown-keyboard 2017-01-06 15:57:15 -05:00
Pierre-Denis Vanduynslager
eb84c03ddf Update dropdown unit test to new markup 2017-01-06 15:56:38 -05:00
Mark Otto
d2fbf58546 grunt 2017-01-06 08:39:56 -08:00
Mark Otto
045888fa38 version bump 2017-01-06 08:38:04 -08:00
Mark Otto
43d9391fba grunt 2017-01-05 14:51:14 -08:00
Patrick H. Lauke
85a1fdcb29 Merge pull request #21093 from Johann-S/fixButtonGrpAria 
Close #21090 - Fix aria-pressed attribute for buttons in container with data-attribute="buttons"
 2017-01-05 09:35:43 +00:00
Mark Otto
0015da793a grunt 2017-01-04 11:59:07 -08:00
Pierre-Denis Vanduynslager
d1b742f228 Use pageYOffset instead of scrollY 2017-01-04 11:42:08 -08:00
Pierre-Denis Vanduynslager
67958f35e8 Merge conflict 2017-01-04 12:24:33 -05:00
Pierre-Denis Vanduynslager
c4867cfedb Merge branch 'twbs/v4-dev' into dropdown-keyboard 
# Conflicts:
#	js/src/dropdown.js
 2017-01-04 12:22:06 -05:00
Johann-S
0463b01282 Close #21090 - Fix aria-pressed attribute for buttons in container with data-toggle='buttons' 2017-01-04 11:02:16 +01:00