root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
10,154 Commits 132 Branches 94 Tags 672 MiB
Commit Graph

4555 Commits

Author SHA1 Message Date
Mark Otto 38217ee405 Merge branch 'pr/14801' 
Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
 2014-10-25 18:16:40 -07:00
Mark Otto 6e3c55a115 grunt 2014-10-25 18:13:50 -07:00
Mark Otto a0e6bd96de grunt 2014-10-25 17:54:06 -07:00
Mark Otto 018c1c0b6e Merge pull request #14871 from twbs/fix-#14810 
Move "Copy" button in `code`.
 2014-10-25 17:49:13 -07:00
Heinrich Fenkart e9d6f256c2 grunt 2014-10-26 01:59:25 +02:00
XhmikosR db550a9235 Run `grunt`. 2014-10-25 14:12:21 +03:00
XhmikosR 0ba39d45b4 Move "Copy" button in code. 2014-10-25 01:48:02 +03:00
Mark Otto 80aca8c17e grunt 2014-10-24 13:27:28 -07:00
Mark Otto 79b38361ab 20px from bottom because the final frontier 2014-10-24 13:26:05 -07:00
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
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 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 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
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 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 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 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
Heinrich Fenkart 930c422f22 grunt 2014-10-22 04:28:16 +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 8a6a253355 clarify that "build & test everything" Grunt task requires Jekyll 
Refs #13131.
 2014-10-14 11:41:30 -07:00
XhmikosR 9f82f27b9d Update less/print.less to the latest html5 bp version. 
Also, keep the html5 boilerplate link in the built CSS.
 2014-10-13 13:32:39 +03:00
Heinrich Fenkart 4a89fd02b7 grunt 2014-10-10 08:35:56 +02:00
XhmikosR 9299f5dfa2 Run `grunt`. 
[ci skip]
 2014-10-09 08:17:56 +03:00
XhmikosR a1a2dfebb5 Update less.js to v1.7.5. 2014-10-09 08:16:32 +03:00
XhmikosR 924c68f8bb Update FileSaver.js v2014-08-29. 2014-10-09 08:16:32 +03:00
XhmikosR 7ded2d185d Update Blob.js to v2014-07-24. 2014-10-09 08:16:31 +03:00
XhmikosR 07f1d89dd2 Run `grunt`. 2014-10-07 19:57:01 +03:00
XhmikosR 909a178362 Change Twitter links to use `https`. 2014-10-07 15:28:41 +03:00
Heinrich Fenkart 5bb08c50fa grunt 2014-10-03 08:17:49 +02:00
Jacob 2c562d2386 Merge pull request #14590 from twbs/carousel-keyboard-option 
Add `keyboard` option to carousel
 2014-10-02 23:11:14 -07:00