2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-15 11:59:39 +03:00
Commit Graph

726 Commits

Author SHA1 Message Date
Mark Otto 16dbdbd7a2 Merge branch 'master' into v3.3.0
Conflicts:
	docs/assets/js/customize.min.js
	docs/assets/js/raw-files.min.js
2014-10-29 11:56:48 -07:00
Mark Otto 15d668dd15 grunt 2014-10-29 11:13:25 -07:00
Mark Otto 5429e71401 fixes #14913: badges in list group shouldn't have text shadow 2014-10-29 10:27:18 -07:00
Mark Otto e07d741088 grunt 2014-10-29 09:54:43 -07:00
Mark Otto 22f9c8fc0a grunt 2014-10-29 08:58:51 -07:00
Mark Otto 94b59b57d6 version bump 2014-10-29 08:56:20 -07:00
Mark Otto a369a0a729 grunt 2014-10-29 08:51:05 -07:00
Mark Otto a75c6d84e1 grunt 2014-10-28 23:08:42 -07:00
Heinrich Fenkart cf88a65f30 Fix customizer download with Firefox. 2014-10-29 06:48:00 +02:00
Heinrich Fenkart bf2ad00ee0 grunt 2014-10-29 04:56:02 +01:00
Heinrich Fenkart 94b544c229 grunt 2014-10-29 04:44:52 +01:00
Heinrich Fenkart a7f58a8356 grunt 2014-10-29 04:30:31 +01:00
Mark Otto a5497da5be grunt 2014-10-27 20:37:17 -07:00
Mark Otto dcee894a8c grunt 2014-10-26 22:57:38 -07:00
Mark Otto 05c785bfae grunt 2014-10-26 14:42:06 -07:00
Heinrich Fenkart 66e140db82 Docs: progress bars' animation now needs to be manually toggled
Refs #14409
2014-10-26 20:43:41 +01:00
Heinrich Fenkart 2cbb1d9374 grunt 2014-10-26 04:39:49 +01:00
Mark Otto 783eced7ab follow up fix for #14837 /cc @hnrch02 2014-10-25 20:20:24 -07:00
Heinrich Fenkart 5f2e6fa58b grunt 2014-10-26 03:53:10 +01:00
Heinrich Fenkart 44cc763229 grunt 2014-10-26 03:17:19 +01:00
Mark Otto 2c2564faef Fixes #14736: Reverts the remaining progress bar min value overrides from #12848 2014-10-25 19:10:03 -07:00
Mark Otto 3fcd65af41 Fixes #14806: reset the text-shadow in the themed buttons 2014-10-25 18:57:27 -07:00
Mark Otto 9bf9aab132 grunt 2014-10-25 18:29:15 -07:00
Mark Otto 41a26ced24 Fixes #14814: Use the link active bg variables for theme navbar gradients 2014-10-25 18:27:40 -07:00
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 23e3995cec guhrunt 2014-10-24 13:24:28 -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
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