root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity
7,744 Commits 104 Branches 92 Tags 676 MiB
Commit Graph

536 Commits

Author SHA1 Message Date
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
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
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
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
fat 7545da2e3c fixes #11477 and updates slid event in carousel with namespace 2013-11-14 23:58:29 -08: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
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
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
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