2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-18 12:39:41 +03:00
Commit Graph

2636 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
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
Heinrich Fenkart 40c309b39a grunt 2014-10-22 21:39:37 +02:00
Heinrich Fenkart 2bc5277b44 grunt 2014-10-22 21:04:18 +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 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
Heinrich Fenkart 930c422f22 grunt 2014-10-22 04:28:16 +02: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
Heinrich Fenkart 5bb08c50fa grunt 2014-10-03 08:17:49 +02:00
Mark Otto f75fc32462 grunt 2014-10-02 22:21:02 -07:00
Mark Otto 76268c4b96 more grunt 2014-10-02 21:21:49 -07:00
Mark Otto f579b66b80 Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
	docs/assets/js/raw-files.min.js
2014-10-02 21:19:43 -07:00
Mark Otto 12091b9567 Fixes #14711: Account for list groups in collapsing panels 2014-10-02 21:19:20 -07:00
Heinrich Fenkart 68b80836cf grunt 2014-10-03 05:20:23 +02:00
Heinrich Fenkart 32162b16cb grunt 2014-10-01 21:10:33 +02:00
Mark Otto 121b204b14 grunt 2014-09-26 13:48:31 -07:00
Mark Otto 8e25695d09 Fixes #14687: Include video element in responsive embed 2014-09-26 13:45:28 -07:00
Heinrich Fenkart 0d04dcaebd grunt 2014-09-26 00:10:41 +02:00
Heinrich Fenkart 7ce6824748 grunt 2014-09-25 02:23:48 +02:00
Mark Otto 4969c2055d grunt 2014-09-22 14:27:13 -07:00
Heinrich Fenkart 36ebec5e76 grunt 2014-09-22 21:47:24 +02:00
Mark Otto e33922eb06 grunt 2014-09-18 19:11:47 -07:00
Mark Otto 98b745a06b grunt 2014-09-18 19:00:30 -07:00
Mark Otto 75204aeafa grunt 2014-09-18 18:33:52 -07:00
Heinrich Fenkart 5a5cf224e1 grunt 2014-09-16 05:59:09 +02:00
Heinrich Fenkart 16f9529ed1 grunt 2014-09-16 05:40:03 +02:00
Heinrich Fenkart d0f76e416c grunt 2014-09-13 04:46:31 +02:00
Heinrich Fenkart 0a4c39dc40 Teh grunt
https://www.youtube.com/watch?v=L-4VxEtWyRo
2014-09-13 03:15:04 +02:00