0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-12 00:08:59 +01:00
Commit Graph

890 Commits

Author SHA1 Message Date
Mark Otto
1ddc3f5e21 Merge branch 'master' into v4m 2015-08-04 22:29:45 -07:00
Mark Otto
ab412b2404 grunt 2015-08-04 21:36:11 -07:00
XhmikosR
abdf41f5f3 Add a local jQuery fallback.
Shouldn't really happen, but China for example has blocked Google so this should help.
2015-07-26 10:07:33 +03:00
XhmikosR
f4a44208f4 Run grunt. 2015-07-26 00:16:58 +03:00
Mark Otto
e4d72c914d fix vars, grunt that shit 2015-06-19 00:01:57 -07:00
Mark Otto
169d2a4a78 Merge branch 'master' into v4 2015-06-18 23:56:43 -07:00
Julian Thilo
a49f8e98f7 Update customize.min.js with version bump 2015-06-16 18:45:08 +02:00
Mark Otto
57a9a5c803 bump version 2015-06-16 09:37:42 -07:00
Mark Otto
16b48259a6 customizer and raw files 2015-06-16 09:13:22 -07:00
Mark Otto
29ff44d311 grunt 2015-06-16 09:06:51 -07:00
XhmikosR
b5ed74d43d Run grunt.
[ci skip]
2015-06-01 10:29:18 +03:00
XhmikosR
82aa0cd56b docs: update uglify-js to v2.4.23.
[ci skip]
2015-06-01 10:29:18 +03:00
Mark Otto
67f2e77955 don't use anchor.js on h1s in the docs 2015-05-28 14:08:25 -07:00
Mark Otto
663576a7ae Merge branch 'v4' of https://github.com/twbs/derpstrap into v4
Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	docs/assets/css/docs.min.css
2015-05-27 15:49:55 -07:00
XhmikosR
315907c97c Use https when possible. 2015-05-17 12:43:20 +03:00
XhmikosR
9b6a2013d6 docs: update uglify-js to v2.4.21.
[ci skip]
2015-05-17 00:55:26 +03:00
XhmikosR
c56032a0e5 Remove grunt-banner completely.
Add a license header in theme instead.
2015-05-16 12:57:27 +03:00
XhmikosR
9e395712a5 Run grunt. 2015-05-16 09:58:16 +03:00
Bryan Braun
dec2faec3d Update Anchor.js and port over the existing styles.
Anchor.js 1.0.0 drops the need to use anchor.css, so we remove it
from the codebase and move any leftover styles over to docs.css.

Closes #16488 by merging it.
2015-05-16 09:58:15 +03:00
Chris Rebert
c111c291be Relicense ie10-viewport-bug-workaround.js under MIT License
Fixes #16470
Closes #16483
2015-05-14 22:43:27 -07:00
Mark Otto
588b7e564e grrrrrrrrrrrrrrrrrrrunt 2015-05-14 11:11:03 -07:00
Mark Otto
82279a8eb2 Merge branch 'btn-borders' of https://github.com/martinbean/bootstrap into martinbean-btn-borders 2015-05-13 21:20:02 -07:00
XhmikosR
414d0a535a Run grunt. 2015-05-05 11:57:42 +03:00
XhmikosR
5ae00f2e7c Run grunt. 2015-05-05 06:50:18 +03:00
XhmikosR
49c4556354 Comply to the new JSCS rules. 2015-05-05 06:50:18 +03:00
XhmikosR
07e76a571d Redo changes needed to hide Copy button. 2015-04-29 08:56:33 +03:00
XhmikosR
438cae9d90 Revert "Update ZeroClipboard and remove Copy buttons when Flash is unavailable"
This reverts commit 229e888929.

ZeroClipboard v2.x drops IE < 9 support.
2015-04-29 08:55:29 +03:00
XhmikosR
16a44c208d Fix dab6a4f0e3. 2015-04-29 08:54:32 +03:00
XhmikosR
5ca44f94ac Run grunt. 2015-04-28 14:24:37 +03:00
XhmikosR
86400070b5 Bump copyright year.
[ci skip]
2015-04-28 11:40:42 +03:00
XhmikosR
3e7ca3bbc8 Minor lint tweaks. 2015-04-28 11:03:37 +03:00
Mark Otto
dab6a4f0e3 scope anchorjs to immediate children, fixes #16129 2015-04-27 14:16:27 -07:00
Martin Bean
9a451d4aea Add @btn-border-radius variables (#16271) 2015-04-26 17:42:34 +01:00
XhmikosR
fa4d7d2bd2 Run grunt. 2015-04-26 14:03:35 +03:00
XhmikosR
8cc39a3951 Update autoprefixer.js.
Taken from https://github.com/ai/autoprefixer-rails/blob/master/vendor/autoprefixer.js

[ci skip]
2015-04-26 14:01:17 +03:00
XhmikosR
a2680e8b6b Run grunt.
[ci skip`
2015-04-23 09:18:46 +03:00
XhmikosR
b29c15dfc8 Update Blob.js to v2015-03-21.
[ci skip]
2015-04-23 09:18:45 +03:00
XhmikosR
6df6452619 Update FileSaver.js to v2015-03-04.
[ci skip]
2015-04-23 09:18:45 +03:00
XhmikosR
7da5f13383 Update JSZip to v2.5.0.
[ci skip]
2015-04-23 09:18:45 +03:00
XhmikosR
cd23569d49 Update uglify-js to v2.4.20.
[ci skip]
2015-04-23 09:18:45 +03:00
XhmikosR
69308dc883 Update Holder.js to v2.6.0.
[ci skip]
2015-04-23 09:18:45 +03:00
XhmikosR
09f98453ce Update devDependencies. 2015-04-19 00:07:37 +03:00
Chris Rebert
3a279860b0 grunt docs 2015-04-16 17:25:00 -07:00
Mark Tareshawty
229e888929 Update ZeroClipboard and remove Copy buttons when Flash is unavailable
Fixes #16269.
Closes #16301 by merging a rebased version of it.
2015-04-16 17:17:28 -07:00
Mark Otto
c84cf4f7f5 rename classes from .bs-docs and .bs to .bd 2015-04-16 14:07:20 -07:00
Chris Rebert
bf3a64f2df grunt dist docs
[skip sauce]
2015-04-07 19:18:35 -07:00
Chris Rebert
05d381afc6 Upgrade to Holder v2.5.2
Fixes #16216, FWICT
2015-04-07 19:18:23 -07:00
Mark Otto
ce75f289f2 grunt 2015-03-28 23:33:11 -07:00
Chris Rebert
a10eb60bc0 full grunt 2015-03-16 08:44:41 -07:00
Chris Rebert
4d652035dc v3.3.2 => v3.3.4 2015-03-16 08:39:31 -07:00