root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 13 Packages Projects Releases Wiki Activity
10,350 Commits 111 Branches 92 Tags 671 MiB
Commit Graph

10350 Commits

Author SHA1 Message Date
Mark Otto 1979a311d4 Merge branch 'master' of github.com:twbs/bootstrap 2014-10-24 13:24:34 -07:00
Mark Otto 23e3995cec guhrunt 2014-10-24 13:24:28 -07:00
Mark Otto e631b721ec Merge pull request #14848 from knownasilya/patch-1 
Make the docs' nav sidebar scrollable
 2014-10-24 13:24:14 -07:00
Mark Otto dbd45f2f6c Merge pull request #14857 from twbs/fix-14856 
Fix #14856
 2014-10-24 12:09:44 -07:00
Jenn Dodd e8643ed8b3 Remove .media-object from docs. 
Signed-off-by: Geoff Pleiss <gpleiss@pivotal.io>
 2014-10-23 18:48:50 -04:00
Nicole Sullivan 919b4ccb15 Fixes #14799: Add vertical alignment of image in media component 
Signed-off-by: Jenn Dodd <jedodd@pivotal.io>
 2014-10-23 18:48:18 -04:00
Chris Rebert 3bea2a45ef Merge pull request #14847 from twbs/node-deps 
Update node dependencies.
 2014-10-23 13:53:35 -07:00
Chris Rebert 16a5f874d0 grunt update-shrinkwrap 
[skip sauce]
 2014-10-23 13:26:48 -07:00
XhmikosR d59b235242 Update node dependencies. 2014-10-23 13:26:48 -07:00
XhmikosR 2df585ad6b Merge pull request #14860 from twbs/comment-typo 
Fix a small typo in comment.
 2014-10-23 09:19:03 +03:00
XhmikosR c6d1aa76fc Update Jekyll to v2.4.0 and rouge to v1.7.2. 2014-10-23 09:17:54 +03:00
XhmikosR f33ed634fc Docs: Use a 180x180 apple-touch-icon.png. 
Refs:
1c4fcf3214
345925f043

[ci skip]
 2014-10-23 09:17:27 +03:00
XhmikosR 41dbc53b9b Fix a small typo in comment. 
[ci skip]
 2014-10-23 09:11:12 +03:00
Heinrich Fenkart 51f1f58be8 grunt 2014-10-23 06:39:51 +02:00
Heinrich Fenkart 9814256736 Merge pull request #14852 from twbs/jquery-version-check 
Add jQuery version check to existing jQuery presence check
 2014-10-23 06:15:36 +02:00
Heinrich Fenkart fe51148434 Merge pull request #14669 from vsn4ik/dropdown_event_target 
Use e.target instead :focus selector.
 2014-10-23 06:13:46 +02:00
Heinrich Fenkart 1604af041b Add jQuery version check to existing jQuery presence check 
Fixes #14809.
Closes #14825.
 2014-10-23 05:57:15 +02:00
Heinrich Fenkart e0cea19cbc grunt 2014-10-23 05:23:29 +02:00
Chris Rebert 57e4b58782 Merge pull request #14859 from twbs/fix-14853 
Clarify order of tabs events
 2014-10-22 18:57:43 -07:00
Chris Rebert 5c18722453 Merge pull request #14858 from twbs/fix-14802 
Document .alert-dismissible .close restrictions
 2014-10-22 18:40:43 -07:00
Chris Rebert b421dc9490 Clarify order of tabs events; fixes #14853 
[skip sauce]
 2014-10-22 18:38:18 -07:00
Chris Rebert 8d806b0ae5 Document .alert-dismissible .close restrictions; fixes #14802 
[skip sauce]
 2014-10-22 18:05:42 -07:00
Chris Rebert 58143b128b Fix #14856 
[skip sauce]
 2014-10-22 17:53:59 -07:00
Heinrich Fenkart 3c98dd35ba Fix IE8 unit test breakage introduced by #14767 2014-10-22 22:09:58 +02:00
Phil Hughes ab8dbc214e Implement `hide` and `hidden` events for tabs 
Closes #14772.
 2014-10-22 21:42:35 +02:00
Heinrich Fenkart 40c309b39a grunt 2014-10-22 21:39:37 +02:00
Heinrich Fenkart 95e0f48e3a Follow-up to e2cfbd5: Fix spaces in placement calculation 2014-10-22 21:38:34 +02:00
saranya.r e2cfbd5f2d Fixes tooltip misplacements in scrollable viewports with auto positioning 
Fixes #14756.
Closes #14767.
 2014-10-22 21:35:44 +02:00
Heinrich Fenkart 2bc5277b44 grunt 2014-10-22 21:04:18 +02:00
Patrick H. Lauke e1d40f7633 Add `aria-pressed` to single toggle buttons 
also includes tiny fix/clarification to two existing unit tests for the
.active class, adding data-toggle=“button” explicitly to the tested
buttons

Closes #14819.
 2014-10-22 21:02:19 +02:00
Heinrich Fenkart 60bb69acd5 Merge pull request #14829 from lipis/blank-lines 
Added/removed blank lines in the docs for consitency
 2014-10-22 19:46:40 +02:00
Ilya Radchenko fb70b13dc3 Allow to scroll the nav 
Basically it's impossible to use the navigation if it's expanded. This will allow it to be scrollable so that the menus are accessable.
 2014-10-22 11:56:12 -04:00
XhmikosR b2385016ec Merge pull request #14794 from twbs/docs-libs 
Update customizer libraries
 2014-10-22 18:52:05 +03:00
Chris Rebert 3a7d2691be Merge pull request #14830 from lipis/sort 
Sorted various lines using atom/sort-lines
 2014-10-22 08:45:02 -07:00
Chris Rebert fece552ce0 Merge pull request #14841 from twbs/role-button 
add role="button" to a couple more dummy-anchor btns
 2014-10-22 08:31:35 -07:00
Panayiotis Lipiridis aa8269cfb6 Sorted various lines using atom/sort-lines 2014-10-22 14:06:09 +02:00
Panayiotis Lipiridis a4f93895be Added/removed blank lines in the docs for consitency 2014-10-22 13:52:49 +02:00
XhmikosR 27478b966b Run `grunt`. 
[ci skip]
 2014-10-22 14:18:18 +03:00
XhmikosR 961ed36f01 Update Holder.js to v2.4.1. 
[ci skip]
 2014-10-22 14:18:13 +03:00
XhmikosR 40ce5670e7 Update JSZip to v2.4.0. 
[ci skip]
 2014-10-22 14:17:48 +03:00
XhmikosR 908190a6c5 Replace the unicode ellipsis symbol with 3 dots. 
[ci skip]
 2014-10-22 13:49:24 +03:00
Chris Rebert fc0eee7d47 Merge pull request #14838 from twbs/ie9-bizarre-table-hover-bug 
Add min-height: 0% to .table-responsive; fixes #14837
 2014-10-22 01:55:26 -07:00
Heinrich Fenkart 930c422f22 grunt 2014-10-22 04:28:16 +02:00
Heinrich Fenkart e811a24118 Don't fire show event if show is prevented because other element is still transitioning 
Fixes #14844.
Closes #14845.
 2014-10-22 04:25:05 +02:00
Chris Rebert f26dde085f add role="button" to a couple more dummy-anchor btns 2014-10-20 20:16:09 -07:00
Chris Rebert 15236f517f Add min-height: 0% to .table-responsive; Fixes #14837 2014-10-20 17:35:36 -07:00
Chris Rebert a096c3f6f6 Merge pull request #14836 from lipis/double 
Removed double parentheses from expressions
 2014-10-20 13:26:42 -07:00
Panayiotis Lipiridis b43a7a932e Removed double parentheses from expressions 2014-10-20 21:43:03 +02:00
Chris Rebert 8a6a253355 clarify that "build & test everything" Grunt task requires Jekyll 
Refs #13131.
 2014-10-14 11:41:30 -07:00
XhmikosR 87c1665528 Merge pull request #14790 from twbs/print 
Print style updates
 2014-10-13 20:39:50 +03:00