fat
d21369c1ed
fixes #10890
2013-12-26 19:40:18 -08:00
fat
3c73904e17
update tool/pop destroy placement
2013-12-26 18:27:43 -08:00
Jacob
6baf266cda
Merge pull request #10761 from jochenberger/dont-create-tooltip-for-destroy
...
don't create new Tooltip/Popover objects just to destroy them immediately
2013-12-26 18:25:29 -08:00
fat
39091b0748
nope
2013-12-26 18:18:53 -08:00
Jacob
bf3c525d05
Merge pull request #11496 from satazor/patch-1
...
Clear timeout on destroy.
2013-12-26 18:18:09 -08:00
fat
34fb5767cb
fixes #10798
2013-12-26 17:53:31 -08:00
Jacob
37bfd8fa60
Merge pull request #10801 from Travesty3/master
...
Add 'collapse' class back after expanding
2013-12-26 17:50:41 -08:00
Jacob
bea46fca70
Merge pull request #10834 from Prinzhorn/master
...
Only preventDefault on click on [data-toggle="modal"] when the element is a link
2013-12-26 17:46:59 -08:00
Mark Otto
d8e4c1578d
Merge pull request #12010 from ZDroid/wrong-indent
...
Fix wrong indent in .jscs.json
2013-12-26 12:54:23 -08:00
fat
fc7049b18f
fixes #10675
2013-12-25 20:33:05 -08:00
fat
c25fa0661a
Merge branch 'tooltip-events-fix' of git://github.com/lukaszfiszer/bootstrap into lukaszfiszer-tooltip-events-fix
...
Conflicts:
js/tooltip.js
2013-12-25 20:03:28 -08:00
Zlatan Vasović
1e05029d1a
Fix wrong indent in .jscs.json
2013-12-25 20:22:52 +01:00
fat
dffd4ffad2
Merge branch 'master' of github.com:twbs/bootstrap
2013-12-24 17:00:55 -08:00
fat
394e0fa611
fixes #11788 - focusin focusout instead of focus/blur
2013-12-24 17:00:34 -08:00
Jacob
0fab6e7ea7
Merge pull request #11722 from DocX/patch-1
...
Use document scroll height instead of offset height
2013-12-24 16:43:24 -08:00
fat
c77740bd3a
fixes #11720 - Add events trigger to affix
2013-12-24 16:29:51 -08:00
Jacob
139b395dfb
Merge pull request #10359 from ixti/patch-1
...
Pass $element to offset top/bottom calc funcs
2013-12-24 13:21:19 -08:00
fat
a93a753c7d
fixes #10134 – dont use jquery offset directly because it uses sub pixel rendering
2013-12-24 13:07:42 -08:00
fat
fe7fffe034
Merge branch 'slide-event-reset' of git://github.com/Rowno/bootstrap into Rowno-slide-event-reset
...
Conflicts:
js/tests/unit/carousel.js
2013-12-24 12:50:55 -08:00
fat
0a75e4c09b
fixes #10283
2013-12-24 12:40:24 -08:00
fat
558b6a478d
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
dist/js/bootstrap.min.js
docs-assets/js/raw-files.js
2013-12-24 12:35:24 -08:00
fat
50bd4edb8c
fixes #10236
...
if affixed top add scrollTop to it position.top
calculate and cache pinnedoffset independent of scrolling for initial load
2013-12-24 12:32:06 -08:00
Mark Otto
5c2dfbf33b
Merge branch 'master' of github.com:twbs/bootstrap
...
Conflicts:
docs-assets/js/raw-files.js
2013-12-24 12:17:48 -08:00
Mark Otto
679c786237
roll back version numbers to avoid broken links in docs and readme ( fixes #12000 )
2013-12-24 12:16:17 -08:00
fat
fe839e6e78
change where modal loads content -– fixes #10105 , #9318 , #9459
2013-12-23 23:30:06 -08:00
fat
1fc08c1973
fixes #10568 - kill hoverstate info once command has been executed
2013-12-23 22:57:39 -08:00
fat
a87b150bc7
fixes #10205 Scrollspy Doesn't Support Chinese ID Targets http://mathiasbynens.be/notes/html5-id-class
2013-12-23 22:08:43 -08:00
Mark Otto
45a8a9508e
Merge pull request #11974 from XhmikosR/meta
...
Normalize meta
2013-12-22 22:20:23 -08:00
XhmikosR
a05a11e5dc
Get rid of JSHint's laxcomma option now that the comma is used on the right side.
2013-12-22 09:02:08 +02:00
XhmikosR
6e3ac8f2a4
js/.jscs.json: sort by name.
2013-12-22 08:59:36 +02:00
Zlatan Vasović
1bf5abab31
No leading pluses
2013-12-19 15:32:37 +01:00
joep.joosten@ihomer.nl
1ceab8b89f
Fix: IE10 or lower incorrectly determines the scrollheight of the body. Use document.documentElement for IE. To make this browser agnostic, the maximum scrollheight of both body and documentElement is used.
2013-12-19 12:41:33 +01:00
joep.joosten@ihomer.nl
3bcb1cc255
Fix: IE10 or lower incorrectly determines the scrollheight of the body. Use document.documentElement for IE. To make this browser agnostic, the maximum scrollheight of both body and documentElement is used.
2013-12-19 12:18:51 +01:00
fat
22f9767714
check that href id's are followed by valid char – fixes #10044
2013-12-18 21:14:01 -08:00
Chris Rebert
df3716647d
update licensing header in JS files & run grunt
2013-12-18 15:29:19 -08:00
Mark Otto
b9ca65ebe7
Merge pull request #11416 from danielboendergaard/carousel-duration
...
Carousel: Use the transition duration from CSS
2013-12-18 15:01:47 -08:00
Mark Otto
e8e60ae4bc
version bump
2013-12-18 14:56:08 -08:00
Zlatan Vasović
ba3639b202
Require comma on left side
2013-12-16 18:06:31 +01:00
Mark Otto
35dd6b9fd7
Merge pull request #10704 from XhmikosR/various
...
rm unused vars
2013-12-14 18:55:25 -08:00
Zlatan Vasović
7f6cf5e50c
Add try and catch to keywords
2013-12-14 21:57:59 +01:00
Scott Plumlee
bbe551044c
Allow listbox AIRA role on dropdown component.
2013-12-10 14:17:32 -05:00
XhmikosR
5749039f8d
Remove unused variables.
2013-12-10 10:11:10 +02:00
XhmikosR
eca8ff3803
Use single quotes consistently.
2013-12-08 12:44:14 +02:00
Chris Rebert
c1dae1e13c
integrate JSCS
2013-12-06 17:26:07 -08:00
Chris Rebert
351f86e1db
fix some JS to pass jscs
2013-12-06 17:23:45 -08:00
XhmikosR
5e2ef69e1c
Use a space before functions' bracket consistently.
2013-12-06 12:43:48 +02:00
XhmikosR
4aad52797c
Use a space after function consistently.
2013-12-06 12:43:48 +02:00
Lukáš Doležal
6e9efb2024
Use document scroll height instead of offset height to support body with absolute height
2013-12-05 16:28:31 +01:00
mdxs
f7d21d6919
Dropping unused variable in dropdown.js
...
Dropping an unused variable in the Dropdown function inside the `dropdown.js` code.
There are no new/changed unit tests, as there are no feature/bug changes requiring new test cases.
For the record: I agree to dual-license this contribution under the Apache 2 and MIT licenses.
2013-12-04 11:15:48 +01:00
Mark Otto
8a74264344
bump version numbers to 3.0.3
2013-12-01 19:31:52 -08:00
Mark Otto
a06610a030
Merge pull request #11502 from 1000hz/patch-1
...
Add missing data namespace for dropdown
2013-11-29 23:55:43 -08:00
Michael Rotoloni
24e3a8b859
Added unit test for removing only active class from within the scroll spy key.
2013-11-18 09:29:10 -05:00
Valera Rozuvan
ad86d9a51b
Update dropdown.js
2013-11-18 11:55:33 +02:00
Cina S.
56f6847ed6
Add missing data namespace for dropdown
2013-11-16 09:43:47 -06:00
André Cruz
926b940e86
Clear timeout on destroy.
...
Clears the internal timeout on destroy so that hanging timers are not fired.
2013-11-15 23:33:23 +00:00
fat
7545da2e3c
fixes #11477 and updates slid event in carousel with namespace
2013-11-14 23:58:29 -08:00
moodyroto
9f30f55721
Update scrollspy.js
...
Scrollspy target in tab content does not work properly. Calling .parents('.active') will return all parents with an active class (including the tab pane). Changing this line to .parentsUntil(this.options.target, '.active') should resolve the issue. This will scope the query to only search for active elements inside the scrollspy target.
2013-11-11 12:21:34 -05:00
Brian Leonard
5d6e9212a6
Don't deselect radio buttons in data-toggle; fixes #9920
...
Merges #10787
2013-11-10 17:23:11 -08:00
Nathan Muir
934d1bcae5
Add unit test for #9920
...
Merges #10385
2013-11-10 17:23:11 -08:00
Daniel Bøndergaard
268f20e84c
Carousel: Use the transition duration from CSS
...
This makes it possible to change the transition duration in CSS
2013-11-08 11:55:06 +01:00
Chris Ziogas
ed5dbf1b2b
Update affix properly on scrollspy speedy scroll to top of page #11310
...
Fix scrollspy.js so as affix is updated properly when user scrolls fast
to top of page.
A fix for issue #11310 .
2013-11-07 16:39:57 +02:00
Mark Otto
6a42305565
bump versions to v3.0.2
2013-11-06 12:57:28 -08:00
Chris Rebert
f1b0cd491c
Merge pull request #10039 from daguej/js-refs
...
Don't explicitly reference global jQuery
2013-11-05 16:55:55 -08:00
Chris Rebert
4e0d022de5
update version numbers in JS file comment headers to v3.0.1 & regrunt
2013-11-01 17:15:34 -07:00
Jared Christensen
583697fec3
JS comments pointed to new documentation
2013-10-29 12:10:47 -05:00
Chris Rebert
7b24f3c47c
QUnit.equals() is deprecated; use QUnit.equal() instead
2013-10-25 14:14:30 -07:00
Zlatan Vasović
63433fbef9
Update license year
2013-10-22 18:41:33 +02:00
Arnold Daniels
5a38a5775f
Scrollspy acting up when targets are hidden
...
If elements are hidden using `display: none;` which are targets mapped by scrollspy, the plugin might select an incorrect or no menu item.
Checking if the target is visible solved this.
2013-10-22 13:31:23 +02:00
Chris Rebert
f11aa31023
Merge pull request #10519 from zba/master
...
changed attr('data-target') to data('target');
2013-10-14 19:14:58 -07:00
Zlatan Vasović
62c905f5bc
Remove [type]
...
type="text/css" isn't needed
2013-10-09 09:45:05 +02:00
Alexander Prinzhorn
12a3bb31f8
Only preventDefault on click on [data-toggle="modal"] when the element is a link
...
In it's current state Bootstrap always prevents the default action for a click
event on `[data-toggle="modal"]` elements
(see https://github.com/twbs/bootstrap/blob/master/js/modal.js#L233 ).
Instead this should only happen when the element is a link.
2013-09-27 11:32:06 +02:00
Travesty3
1c1850f63e
Add 'collapse' class back after expanding
2013-09-25 08:59:01 -04:00
Jochen Berger
f350d1ba3d
don't create new Tooltip/Popover objects just to destroy them immediately
2013-09-23 15:14:37 +02:00
XhmikosR
3c0489102e
Sort by name.
2013-09-18 20:36:17 +03:00
Alexey
7ee2b6a976
changed attr('data-target') to data('target');
...
this will extend js interface, to be possible to setup targets for tabs as
var content=$('<div class="tab-pane">',{text: 'content'});
var tab=('<li>',{html: $('<a>',{text: 'Main options'})}).addClass('active').data({target: $main,toggle: 'tab'}).appendTo(tabs);
2013-09-08 04:49:27 +03:00
Aleksey V. Zapparov
626cef9fa4
Pass $element to offset top/bottom calc funcs
...
At the moment to make dynamic top offset calculator on multiple elements, one would write:
``` javascript
$('.my-affix').each(function () {
var $el = $(this);
$el.affix({
offset: {
top: function () { return $el.offset().top; }
}
});
})
```
This patch will allow to:
``` javascript
$('.my-affix').affix({
offset: {
top: function ($el) { return $el.offset().top; }
}
});
```
2013-09-02 03:24:27 +02:00
Roland Warmerdam
ed1bd2b150
carousel: correctly reset when the slide event is prevented
2013-08-31 18:03:09 +12:00
Martin Hansen
6d3ad5ed7f
deleted files not used anymore after transition to grunt-contrib-qunit
2013-08-30 21:39:48 +02:00
Lukasz Fiszer
0adb4e35f0
Fix hidden.bs.tooltip and shown.bs.tooltip events firing too early in tooltip.js
...
* events fire only after the CSS animation is completed
* this fixes also events in popover.js (as it inherits from tooltip.js)
2013-08-26 20:57:47 +02:00
Josh Dague
f140084f2b
Don't explicitly reference global jQuery
...
Removes `window.jQuery` in favor of `jQuery`, fixes #10038
2013-08-22 14:50:15 -04:00
fat
734b6acf13
add small fix for tooltip consistency + fix customizer syntax issue
2013-08-17 20:28:58 -07:00
fat
4696565044
fixes #9745
2013-08-17 16:18:26 -07:00
fat
63ac9e354f
fixes #9674
2013-08-17 16:13:48 -07:00
fat
c0eabdda9f
fixes #9543
2013-08-17 16:11:05 -07:00
fat
d754e6564d
add some crap
2013-08-17 15:54:42 -07:00
fat
1d53dd31f5
add role=menu to html
2013-08-17 15:48:29 -07:00
fat
a10ec62f63
fixes #9579
2013-08-17 15:05:59 -07:00
fat
712b89ed4e
fixes #9362
2013-08-17 14:24:38 -07:00
fat
5e89f71ab2
fix for #8768
2013-08-17 13:14:19 -07:00
Mark Otto
237640c706
Drop the accordion for the panel
...
* Deletes the accordion.less file
* Extends the panel to be collapsible with our JS plugin
* Supports panel color variations
2013-08-12 23:36:25 -07:00
Jacob Thornton
92c2ad98e7
fixes #8983
2013-08-11 15:41:06 -07:00
Jacob Thornton
89b3cb0dac
fixes #9318
2013-08-11 15:17:04 -07:00
Jacob Thornton
bf2ab457ea
fix comment in tooltip
2013-08-11 14:59:39 -07:00
Jacob Thornton
6393a78bf0
fixes #9279
2013-08-11 14:32:32 -07:00
Jacob Thornton
1abb7947c2
fixes #9222
2013-08-10 14:09:05 -07:00
Jacob Thornton
a4f0e8d37a
fixes #9111
2013-08-10 13:35:20 -07:00
Jacob Thornton
dbed9da774
fixes #6159
2013-08-09 00:16:47 -07:00
Chris Rebert
f86f6ee955
fix 'Calcuated' typo & run grunt; thanks @FagnerMartinsBrack
...
fixes typo introduced in 2b6ec38987
2013-08-08 13:31:22 -07:00
Jacob
d22bd3a660
Merge pull request #9089 from jdiamond/3.0.0-wip
...
accordion's data-parent can't contain dots
2013-08-07 23:37:05 -07:00
Braden Whitten
f816a18f79
Fix spacing after '='
...
Just added a space after a function definition to tidy up the code.
2013-08-06 17:02:57 -04:00
Mark Otto
f266595092
Fixes #9150 : Hide popover titles in IE8
...
Properly hides popover titles in IE8 because apparently it doesn't
accept the `:empty` selector. /cc @fat @cvrebert
2013-08-06 11:18:12 -07:00
Jason Diamond
fb57eda268
use quotes to allow dots in data-parent
2013-08-04 23:59:57 -07:00
Jason Diamond
700e742a9c
failing test for dot in data-parent
2013-08-04 23:59:30 -07:00
Chris Rebert
180034a4b4
tooltip.js: add missing space
2013-08-04 17:36:08 -07:00
fat
2b6ec38987
fixes #8880
2013-08-04 17:22:49 -07:00
fat
f6cec812a6
fixes #8957
2013-08-02 15:13:12 -07:00
Jacob Thornton
7a3c61ee33
fixes #8892
2013-07-31 22:57:00 -07:00
Jacob Thornton
ccd4c9d7b5
fixes #8864
2013-07-31 22:28:05 -07:00
Cesidio Di Landa
3696530aaf
Removed trailing whitespaces
...
Changed hard tabs to soft tabs
2013-07-31 18:11:11 +02:00
fat
c54b8adb85
fixes #8814
2013-07-30 13:33:56 -07:00
fat
5ee2a221ca
fixes #8816
2013-07-30 13:31:57 -07:00
liuyl
270316f140
fix transition end
2013-07-29 20:23:01 +08:00
Jacob Thornton
a31c5cea42
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-28 22:16:17 -07:00
Jacob Thornton
e5a7af36d5
fixes #8703
2013-07-28 22:14:43 -07:00
Chris Rebert
9c672c6b20
get jshint close to passing by updating .jshintrc settings
...
I don't agree with these personally, but they jive with BS/@fat's JS code style.
The remaining jshint complaints are things that really actually should get fixed.
2013-07-27 21:56:44 -07:00
fat
cfa4ab90f3
fix scrollspy for window *and* children
2013-07-26 22:24:51 -07:00
fat
38044e55ae
rebuild + fix #2539
2013-07-26 20:44:35 -07:00
fat
e2d4cf5f68
change how collapse works - collapse, collapsing, and in
2013-07-26 20:34:39 -07:00
John-Philip Johansson
0d33455ef4
Replace Makefile with GruntJS
...
A rebase (against soon-to-be 3.0.0-rc.1) & squash of
https://github.com/twbs/bootstrap/pull/7786 AKA
https://github.com/twitter/bootstrap/pull/7786
originally by
@seriema
@mokkabonna
@jojohess
Rebased by @cvrebert
2013-07-26 00:39:14 -07:00
fat
f5f04ae4a0
fix affix…
2013-07-25 23:30:13 -07:00
fat
0190128ebc
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
2013-07-25 21:34:02 -07:00
fat
15d9c82fc5
fix collapse event #8596
2013-07-25 21:33:26 -07:00
Jacob
f1ddf7681c
Merge pull request #8419 from hollensteiner/3.0.0-wip
...
Replace position() with offset() in scrollspy.js
2013-07-25 21:19:57 -07:00
Chris Rebert
90fb40b707
twbs ALL the links
2013-07-25 12:24:13 -07:00
Jacob Thornton
e9c83647af
fixes #8568 -- account for margins in offset
2013-07-24 20:57:26 -07:00
Jacob Thornton
aad910465c
fixes #8569
2013-07-24 20:21:23 -07:00
Jacob Thornton
eaefed517a
fixes #8399 w/ tests
2013-07-24 20:10:16 -07:00
Jacob Thornton
217eb988b8
add placement auto for tooltips + tests… kinda sad about this doe
2013-07-23 23:50:23 -07:00
Jacob Thornton
6841c50968
fixes #7814
2013-07-23 22:59:09 -07:00
Jacob Thornton
72d2661ff0
fixes #8232
2013-07-23 20:53:12 -07:00
Jacob Thornton
faa00629c4
add additional carousel test
2013-07-23 18:56:00 -07:00
Jacob Thornton
68e87183a0
fixes #8134
2013-07-23 18:54:00 -07:00
Jacob Thornton
f1009c19b3
revert collapse change + add emulateTransitionEvent to catch dead css transitions
2013-07-23 18:44:08 -07:00
Jacob Thornton
43e5e90a6d
shown.bs.modal fix
2013-07-23 17:32:20 -07:00
Jacob Thornton
7b12a0dcbc
fixes #7970
2013-07-23 17:23:02 -07:00
fat
4b40ee692d
cleaner way of preventing double click events + clean up tests for jshint
2013-07-18 01:07:11 -07:00
fat
37e899d766
get button js working with actual form elements p cooll
2013-07-18 00:59:31 -07:00
fat
b13eecaeec
fixes #7880
2013-07-17 23:52:29 -07:00
fat
59f847e8ee
fixes #7777
2013-07-17 23:30:05 -07:00
fat
8cf04911db
fixes #7776
2013-07-17 23:25:26 -07:00
fat
451acb42db
fixes #7755
2013-07-17 23:15:50 -07:00
fat
57768d7ea9
fix #7660
2013-07-17 23:01:33 -07:00
fat
18d23b892c
rebuild js + fixes #7583
2013-07-17 21:35:28 -07:00
fat
2cccc0889f
make sure triggering element is visible before focusing #7521
2013-07-17 21:30:38 -07:00
fat
a7a9a14379
fix @muan's unit test ;)
2013-07-17 21:17:39 -07:00
fat
102df4ff33
Merge branch '3.0.0-wip' of git://github.com/muan/bootstrap into muan-3.0.0-wip
...
Conflicts:
docs/assets/js/bootstrap.min.js
2013-07-17 21:14:02 -07:00
fat
eb3333a612
fix #7000
2013-07-17 21:08:50 -07:00
fat
392bf0c9c9
fixes #6691
2013-07-17 20:29:41 -07:00
fat
13cad5061d
maybe fix this old ass issue #5973
2013-07-17 19:28:43 -07:00
ClausH
0a72530429
Replace position with offset
2013-07-08 12:02:31 +02:00
Mu-An Chiou
55fa1acbd6
Tooltip: apply position class before positioning
2013-06-28 11:05:38 +01:00
Jacob
d23800c828
Merge pull request #7424 from sody/3.0.0-wip
...
Fixes #7213 Collapse plugin does not correctly set the "collapsed" class.
2013-06-27 22:36:33 -07:00
fat
b0da97588e
fixes #6982
2013-06-27 19:19:22 -07:00
Mark Otto
2aec6dae59
Fixes #7730 : Better hiding of empty titles in popovers
...
If the popover's title contains no text, hide it via JS. Previously was
done via CSS's `:empty` property, but that doesn't work in IE8, so JS
it is.
/cc @fat becaue I probably did this wrong <3
2013-06-20 16:02:05 -07:00
Ivan Khalopik
e138b0df3a
Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
2013-06-10 10:31:51 +03:00
Robert Burns
cc684750e5
Fix for carousel indicators
2013-06-01 08:15:40 -04:00
fat
f5ce66177b
fix event binding in modal.js
2013-05-29 11:24:00 -04:00
fat
9257bdc097
fixes #7163
2013-05-27 12:45:13 -07:00
Ivan Khalopik
3285f4c306
Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
...
Conflicts:
js/bootstrap-collapse.js
2013-05-27 11:06:31 +03:00
Jacob Thornton
7cbb1c0452
add data-ride=carousel support for starting carousel on load
2013-05-25 00:16:52 -07:00
Jacob Thornton
e424b3879c
fixes #4781
2013-05-24 23:53:44 -07:00
Jacob Thornton
f3e45c3778
add show/shown hide/hidden events to dropdown + update dropdown links for testing + catch a few missed namespace things
2013-05-24 23:15:04 -07:00
Mark Otto
432d417ade
fixes #6898 : typo in modal test
2013-05-22 23:17:39 -07:00
fat
e7b4fedee8
remove 3rd arg from $.each call
2013-05-22 15:18:30 -07:00
Jacob Thornton
ccfa989898
upgrade jshint to 2.1.2 for anton <3
2013-05-21 19:31:51 -07:00
fat
140ef2320b
change namespace back to dot notation and someother js shizzle
2013-05-16 20:19:51 -07:00
fat
5ab72f7687
fix tooltip defaults
2013-05-16 18:45:53 -07:00
fat
b239542a5e
carousel bug with data
2013-05-16 18:21:42 -07:00
fat
f37b351288
only overlay dropdowns for mobile
2013-05-16 18:15:34 -07:00
fat
a72d0d6e3a
fix tests
2013-05-16 17:44:50 -07:00
fat
19de2e8603
add bs- prefix to tooltip
2013-05-16 17:19:23 -07:00
fat
149ecd21bf
straight trash wang
2013-05-16 17:18:15 -07:00
fat
92245e8bc7
change dropdown strategy to use an overlay - fixes mobile click anywhere + allows for firefox middle click
2013-05-16 12:50:06 -07:00
fat
bdbd268cb9
update collapse js style
2013-05-16 11:20:18 -07:00
fat
14651035de
a bunch javascript junk
2013-05-16 11:06:30 -07:00
Ivan Khalopik
3c7a43a1f3
Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
...
Conflicts:
js/tests/unit/bootstrap-collapse.js
2013-05-07 15:16:45 +03:00
Stephen Edgar
1b132ddcb4
'js' folder .editorconfig code guide updates
2013-04-23 17:34:27 +10:00
Mark Otto
23d7215dbe
Modify scrollspy to add .active to all parent li items /cc @fat
2013-03-29 23:32:47 -07:00
Ivan Khalopik
41c7825677
Fixes #7213 Collapse plugin does not correctly set the "collapsed" class on accordion heading links
2013-03-29 19:17:03 +03:00
Mark Otto
a70c50d1f7
Merge branch 'master' into 3.0.0-wip
...
Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/index.html
docs/templates/pages/index.mustache
js/bootstrap-affix.js
js/bootstrap-alert.js
js/bootstrap-button.js
js/bootstrap-carousel.js
js/bootstrap-collapse.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/responsive.less
package.json
2013-03-01 12:37:21 -08:00
fat
839b0c893f
shiiiit
2013-02-28 21:15:33 -08:00
fat
3469339068
2.3.1
2013-02-28 20:55:14 -08:00
fat
01e0f8c653
only pass unique options through to child nodes in tooltips
2013-02-28 20:39:07 -08:00
fat
ef80765726
pass true to cycle
2013-02-28 19:47:01 -08:00
fat
40b7a909a6
le sigh
2013-02-28 19:37:30 -08:00
Mark Otto
2aa1a4dc70
Merge branch 'master' into 3.0.0-wip
...
Conflicts:
docs/assets/js/bootstrap.min.js
2013-02-07 22:18:53 -08:00
fat
501aabf572
remove prevent default on focus
2013-02-07 21:42:34 -08:00
fat
366e1e0a6d
only fire hidden once backdrop has been removed
2013-02-07 20:13:40 -08:00
fat
1bf070b4ce
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
...
Conflicts:
docs/assets/js/bootstrap.min.js
2013-02-07 19:47:01 -08:00
fat
d8a7a380bc
if no callback, don't try to call callback ya goof
2013-02-07 19:45:42 -08:00
Mark Otto
a9729c5fd0
fix js from @fat feedback for modal
2013-02-07 19:38:46 -08:00
Yohn
60c9ff4364
unit tests
2013-02-06 06:20:05 -05:00
Yohn
beb60309d1
dont remove title attribute part 2
2013-02-06 06:17:48 -05:00
Mark Otto
8ca70bd83a
Overhaul modal to make it responsive and not super lame
2013-02-06 02:07:40 -08:00
Mark Otto
421f9f67c4
Merge branch '2.3.0-wip' into 3.0.0-wip
...
Conflicts:
docs/assets/css/bootstrap-responsive.css
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap.js
docs/css.html
docs/templates/pages/base-css.mustache
js/bootstrap-popover.js
less/mixins.less
less/tooltip.less
2013-02-05 22:42:54 -08:00
fat
3b56227553
Merge branch '2.3.0-wip' of github.com:twitter/bootstrap into 2.3.0-wip
...
Conflicts:
docs/assets/js/bootstrap.min.js
2013-02-05 22:30:54 -08:00
fat
4814281540
clean up styles
2013-02-05 22:29:59 -08:00
fat
5e4db94c24
Merge branch '2.3.0-wip' of git://github.com/ghusse/bootstrap into ghusse-2.3.0-wip
2013-02-05 22:10:41 -08:00
fat-kun
6a9cd513c0
Merge pull request #6783 from joprice/popoverOptionsOverride
...
reordered access of options in tooltip and popover
2013-02-05 21:48:34 -08:00
Mark Otto
1629df8008
screwed up a merge and an old version number crept in
2013-02-05 21:20:29 -08:00
