root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
12,004 Commits 105 Branches 92 Tags 675 MiB
Commit Graph

294 Commits

Author SHA1 Message Date
Heinrich Fenkart 0cf94b82ee grunt 2014-09-13 02:42:18 +02:00
Heinrich Fenkart cabace78da G R U N T 2014-09-11 23:43:27 +02:00
James Friend 4ba4b7c3cf added banner about generated file 2014-09-09 08:47:23 +08:00
Heinrich Fenkart 9b9e2f5d13 grunt and missing new line 2014-09-09 01:23:48 +02:00
Heinrich Fenkart 9702579aeb run `grunt` 2014-09-09 00:12:33 +02:00
Heinrich Fenkart c9602c29c3 grunt 2014-09-08 22:41:45 +02:00
Mark Otto 48a1308e5d grunt 2014-09-08 10:23:25 -07:00
XhmikosR 5b9fcea9f2 Run `grunt`. 2014-09-08 09:04:33 +03:00
James Friend 9aeaf19b1d Merge remote-tracking branch 'upstream/master' into node-requirable 
Conflicts:
	Gruntfile.js
 2014-08-28 09:32:08 +08:00
James Friend e7991a9a1e generate commonjs/npm entrypoint module via grunt task 2014-08-28 09:24:23 +08:00
Mark Otto 4fc96e8029 grunt 2014-08-23 13:35:22 -07:00
Mark Otto 6a0eb4e6bd grunt 2014-08-23 12:19:36 -07:00
Chris Rebert e7d5905f38 grunt 2014-08-17 15:44:25 -07:00
James Friend 689faaf16f added a separate npm-specific main file 2014-08-05 10:51:31 +08:00
Mark Otto feed9aed5b Fixes #13202: Always use overflow: auto; on .table-responsive to prevent content breaking out of containers 2014-08-02 13:05:11 -07:00
XhmikosR de1d8c36ad Run `grunt`. 2014-08-01 19:49:54 +03:00
Mark Otto 5713bd74d6 Fixes #12669 again: Redeclare the line-heights again for date inputs in IE8+ 2014-07-23 20:32:05 -07:00
Chris Rebert 49519e9816 grunt dist 2014-07-21 00:35:41 -07:00
XhmikosR 643effe382 Run `grunt`. 2014-07-09 10:24:39 +03:00
Mark Otto a0d8d56593 grunt 2014-07-07 00:59:51 -07:00
Mark Otto 354d423668 grunt 2014-07-06 15:08:37 -07:00
Chris Rebert a34e52de4d Merge pull request #14015 from twbs/possible-14013-fix 
Possible fix for #14013
 2014-07-06 00:36:52 -07:00
Mark Otto 3c99de9764 grunt 2014-07-05 19:57:15 -07:00
Chris Rebert 1ce5e9f3ae possible fix for #14013 2014-07-02 10:09:28 -07:00
Mark Otto ff6b279b3c bump to v3.2.0 2014-06-26 09:13:24 -07:00
XhmikosR 15c63fa137 Run `grunt`. 2014-06-24 19:01:40 +03:00
Chris Rebert c2c19a4d2d Revert UMD (#13772 & friends) for now, due to #13812. 
Will hopefully revert this reversion and land a fully-working version of UMD in v3.3.0.

Revert "some changes from #13801 - add strict mode back and =="
This reverts commit 2b302f69ee.

Revert "Fix regression of #10038 introduced by #13772"
This reverts commit e9d6756a1a.

Revert "MD/CommonJS/Globals #12909"
This reverts commit 1c6fa9010d.

Revert "address #13811"
This reverts commit f347d7d955.

Conflicts:
    js/carousel.js
    js/collapse.js
    js/dropdown.js
    js/modal.js
    js/tab.js
    js/tooltip.js
 2014-06-23 11:11:59 -07:00
Mark Otto a4fa8d07c8 grunt dist 2014-06-19 15:24:24 -07:00
XhmikosR 6d45f733e5 Run `grunt`. 2014-06-18 13:16:32 +03:00
Chris Rebert f347d7d955 address #13811 2014-06-17 18:53:52 -07:00
Chris Rebert 8bee6549ad grunt dist 2014-06-17 18:23:14 -07:00
Mark Otto b1a9168b15 grunt dist 2014-06-11 18:13:50 -07:00
Mark Otto 57bd8f943b grunt 2014-06-10 22:47:25 -07:00
Mark Otto 9a51410fd3 grunt 2014-06-10 18:11:26 -07:00
Mark Otto 9e1652aa50 grunt 2014-06-09 22:25:24 -07:00
Mark Otto 85cde774b9 remove max-width: 100%; from table and place it on .table 2014-06-08 16:54:05 -07:00
Mark Otto 1e3b93804f grunt 2014-06-08 11:18:59 -07:00
XhmikosR 03a8949d7c Run `grunt`. 2014-06-06 01:23:07 +03:00
Chris Rebert 8e568a8e36 grunt dist 2014-05-23 15:49:13 -07:00
Chris Rebert ef62254917 Merge pull request #13557 from bassettsj/aria-describedby-tooltip-13480 
Aria describedby tooltip: #13480
 2014-05-23 14:11:15 -07:00
Chris Rebert 1340a491e5 grunt dist 2014-05-21 23:37:06 -07:00
Steven Bassett a70da16f6f Adds aria described by to tooltip plugin for accessibility 
Generates a unique id for tooltip and adds [aria-describedby] to the element
it is called on. Resolves issue #13480

- set up test
- linted the code styles
- passed the tests
- integrated feedback from @cvrebert
 2014-05-16 10:45:38 -07:00
Mark Otto f39b272fed grunt 2014-05-12 21:19:01 -07:00
Mark Otto 7e1f2994d1 grunt dist 2014-05-12 21:15:27 -07:00
Mark Otto 0d1018cb2f grunt 2014-05-12 19:53:12 -07:00
Mark Otto f5513fd30e nuke rtl 2014-05-12 19:47:53 -07:00
Chris Rebert cb2ef1eff4 grunt dist 2014-05-08 16:35:03 -07:00
Mark Otto b217357252 grunt dist 2014-04-30 19:35:47 -07:00
XhmikosR 30b07b942e Run `grunt`. 2014-04-26 08:35:48 +03:00
Chris Rebert eaddbd92bb grunt dist 2014-04-20 16:19:13 -07:00
Mark Otto 06fb9406bd grunt dist 2014-04-17 00:56:22 -07:00
XhmikosR 2f0f8ec6d1 Run `grunt dist`. 2014-04-09 10:02:34 +03:00
Mark Otto de86b36b50 grunt dist 2014-04-08 23:59:17 -07:00
XhmikosR 4c2626fecb Run `grunt`. 2014-04-03 10:53:44 +03:00
XhmikosR 8c95ff748f Run `grunt`. 2014-04-01 08:26:47 +03:00
Tyler Cipriani 0907244256 Modal body shift fix for IE10/11 
Closes #13103 by merging it.
 2014-03-28 23:45:22 -07:00
Mark Otto 6951b48e65 grunt 2014-03-24 20:01:46 -07:00
Mark Otto ce013440e7 grunt 2014-03-24 19:31:12 -07:00
Mark Otto 21084192b6 Fixes #13079: Scope .open class in button variant mixin to immediate children 2014-03-24 19:08:05 -07:00
Mark Otto 43cf003f9a Update gruntfile to point to new customizer nav, run grunt 2014-03-16 20:40:30 -07:00
Heinrich Fenkart 4e4e456341 Fix #12845 - Modal#hide should only be called with an event argument 
Closes #12850
 2014-03-16 20:24:33 -07:00
Zlatan Vasović ead17b7ca6 Fix #12375: stop using document.body.scrollTop as it's deprecated in the strict mode 
Closes #12377
 2014-03-16 20:10:52 -07:00
Tobias Lindig 0f366e0376 correct event naming of `scroll` and `load' event 
closes #12337
 2014-03-16 19:58:12 -07:00
fat dd7cab84f6 build 2014-03-16 18:44:58 -07:00
XhmikosR 9d027d2bee Remove unneeded quotes. 2014-03-09 11:10:52 +02:00
fat 4d96e69a55 fixes #9836 2014-03-08 19:45:38 -08:00
fat e9cced72fd fix #9342 2014-03-08 19:20:47 -08:00
Mark Otto 8526adf69c grunt 2014-03-06 20:33:10 -08:00
Mark Otto 4b622c60c1 grunt 2014-02-21 17:42:25 -08:00
Heinrich Fenkart 8a78bc065f Remove event aliases from JavaScript 
Makes life for people with custom jQuery builds excluding event aliases much easier.
 2014-02-16 21:00:04 +01:00
Mark Otto 88fdd45427 v3.1.1 bump 2014-02-13 01:12:26 -08:00
Mark Otto ec6c9d2824 Don't offset customizer alert, grunt dist 2014-02-04 00:18:34 -08:00
Mark Otto 1409cde7e8 Bump versions, run grunt 2014-01-30 08:30:37 -08:00
Mark Otto 7b42103df6 kill bottom margin on last docs section 2014-01-18 11:33:50 -08:00
Tobias Lindig 084f0fb113 add namespace `.bs` also to the event `dismiss.modal` 2014-01-17 12:16:53 -08:00
Tobias Lindig 7fab3c30f2 remove needless space character 2014-01-17 13:34:03 +01:00
Mark Otto d07e8fece4 grunt 2014-01-16 15:03:34 -08:00
fat 3b2418e688 remove flaky pos bottom test which is effect by unit scroll pos 2014-01-16 13:44:08 -08:00
XhmikosR d06d61dc12 Use single quotes in the jqueryCheck too. 2014-01-08 13:41:17 +02:00
XhmikosR d7bf9372ec Remove extra newline from banner. 2014-01-08 13:41:17 +02:00
Julian Thilo 8fd177bfa7 Fix #12073: Consistent order of variations 
This changes the order of component variations throughout the repo (code and docs) to be more consistent.
The order now used everywhere is the one most frequently found in the repo before:
Default, Primary, Success, Info, Warning, Danger
 2014-01-07 22:24:45 +01:00
Julian Thilo 7fcfe61f4d Update copyright notices in all places 
- Implements new format "Copyright 2011-xxxx Twitter, Inc.", which resonates well with our History page and more accurately reflects the copyright status of the repo
- grunt dist to update all the files
 2014-01-07 01:05:24 +01:00
Zlatan Vasović 1c83d68ca4 New Year 2014-01-01 15:37:08 +01:00
fat d18ba50837 add note about ios dropdown compat 2013-12-29 19:40:31 -08:00
fat 8a62f21113 fixes #11379 - Fix carousel this.sliding not getting reset if $next.hasClass('active') 2013-12-29 19:01:32 -08:00
fat 76f0d0ff32 fixes #11373 - adds related target to dropdown events 2013-12-29 18:57:22 -08:00
fat 162d9e1776 Merge branch 'scrollspy-speedy-scroll-top' of git://github.com/ziogaschr/bootstrap into ziogaschr-scrollspy-speedy-scroll-top 
Conflicts:
	dist/js/bootstrap.min.js
 2013-12-29 18:04:43 -08:00
fat ce4a2e4352 fixes #11288 - Vertical scroll position of modal saves between openings 2013-12-29 17:53:59 -08:00
fat 5bf13914e4 fixes #10658 jQuery Popover content loses bound events on second setContent call. 2013-12-28 20:59:45 -08:00
fat c595db19ff fixes #10911 - add loading event for use with remote option :| 2013-12-26 20:26:27 -08:00
fat d21369c1ed fixes #10890 2013-12-26 19:40:18 -08:00
fat cd0ad94aae rebuild 2013-12-26 18:30:16 -08:00
fat 34fb5767cb fixes #10798 2013-12-26 17:53:31 -08:00
fat fc7049b18f fixes #10675 2013-12-25 20:33:05 -08:00
fat 3161acd710 build js 2013-12-25 20:04:49 -08:00
fat 394e0fa611 fixes #11788 - focusin focusout instead of focus/blur 2013-12-24 17:00:34 -08:00
fat c77740bd3a fixes #11720 - Add events trigger to affix 2013-12-24 16:29:51 -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 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 2854c5c3fb Fixes #11952: Refactor blockquote styles 
* Deprecate .pull-right class for .blockquote-reverse
* Move font-size change to the parent, blockquote, instead of setting on the p element to allow more flexible content
 2013-12-19 19:40:08 -08: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 922cd046ef grunt after that carousel merge 2013-12-18 15:13:50 -08:00
Mark Otto 40651cf1ea more license mentions 2013-12-18 15:08:16 -08:00
Mark Otto e8e60ae4bc version bump 2013-12-18 14:56:08 -08:00
Mark Otto 961687e4db run grunt dist 2013-12-18 14:26:37 -08: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
Mark Otto 2b4fa90902 grunt dist 2013-12-07 11:44:32 -08:00
Chris Rebert 4be126e014 Merge pull request #11745 from XhmikosR/function-spaces 
Be consistent with function () spaces
 2013-12-06 16:43:09 -08:00
Chris Rebert 2e9cde6fd9 grunt 2013-12-06 11:33:18 -08:00
XhmikosR 4aad52797c Use a space after function consistently. 2013-12-06 12:43:48 +02:00
Mark Otto a45d839874 Fixes #11712: Better support for .table-responsive within .panel's 2013-12-04 21:13:33 -08:00
Mark Otto a42e9163cb Merge branch 'master' into responsive-visibility-table 
Conflicts:
	dist/css/bootstrap.min.css
 2013-12-03 22:58:25 -08:00
Chris Rebert bac153127c grunt 2013-12-03 13:54:56 -08:00
Mark Otto 8a74264344 bump version numbers to 3.0.3 2013-12-01 19:31:52 -08:00
Mark Otto a52e528d27 Fix up new margins on modals by not setting auto until screen-sm-min 2013-11-30 11:56:06 -08:00
Zlatan Vasović ab87085625 Use pkg.homepage 2013-11-30 16:11:41 +01:00
Mark Otto a7a9dcaeb2 Alternate fix for #11303: add link to site in banner and remove @mdo and @fat usernames from it 2013-11-30 00:42:36 -08:00
Mark Otto bb4a39d51c Merge branch 'master' into pr/11388 
Conflicts:
	dist/css/bootstrap.min.css
 2013-11-30 00:26:53 -08:00
Mark Otto 594d0c700d grunt after merge of last pr; unsure why, but this is rengerating the banners and spacing 2013-11-28 11:33:00 -08:00
Tobias Lindig 3d5e598e5c add builded files from dist/ 2013-11-28 18:40:15 +01:00
Mark Otto 9829c86f7c run grunt 2013-11-26 15:21:27 -08:00
Mark Otto a2c6daafd0 fixes #10744: back to solid borders on carets 2013-11-16 17:48:31 -08:00
fat 7545da2e3c fixes #11477 and updates slid event in carousel with namespace 2013-11-14 23:58:29 -08:00
Chris Rebert 7a3f41b11b <3 @asselin for figuring out this combo of 2 patches for #9920; re-grunt 2013-11-10 17:25:17 -08: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
Chris Rebert 798e64cebf use nesting to make .table-striped & .table-hover mixin-able again; fixes #11387 2013-11-06 18:33:07 -08:00
Mark Otto d1048a7837 run grunt after version bumps 2013-11-06 13:02:15 -08:00
Mark Otto 6a42305565 bump versions to v3.0.2 2013-11-06 12:57:28 -08:00
Chris Rebert 89d489dfc7 re-grunt 2013-11-05 16:58:18 -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
Mark Otto 867e2bef8d 3.0.1 2013-10-30 10:03:56 -07:00
Mark Otto 147837efaa more grunt 2013-10-30 08:00:32 -07:00
Zlatan Vasović 20cba845c2 Add another newline to improve final code readability 
This divides banner from code.
 2013-10-26 10:57:09 +02:00
Chris Rebert b05a287eb6 run grunt 2013-10-14 20:47:56 -07:00
Chris Rebert c43462678c run grunt 2013-10-03 10:42:55 -07:00
Mark Otto b352061d1d run grunt 2013-10-01 11:37:47 -05:00
Chris Rebert 2b5d7d23d0 generate CSS banners via Gruntfile; fixes #10101 2013-09-10 19:22:20 -07:00
Chris Rebert 76d8757b0a rm period from licensing header so it's not mistaken as part of the URL 2013-09-10 19:01:40 -07:00
Mark Otto 48d929d69e Use jekyll var for current version in docs; update banner in gruntfile to match .less banner 2013-08-23 22:38:51 -07:00
fat 734b6acf13 add small fix for tooltip consistency + fix customizer syntax issue 2013-08-17 20:28:58 -07:00
fat 2dbf02b129 rebuild 2013-08-17 16:19:09 -07:00