Commit Graph

10790 Commits

Author SHA1 Message Date
Bootstrap's Grunt bot
cb939e2efe automatic grunt dist 2015-01-28 01:02:34 +00:00
Chris Rebert
b258a1f5b0 Merge pull request #15681 from twbs/fix-replaceArrow
Fix name of Tooltip.replaceArrow() parameter
2015-01-27 16:59:24 -08:00
Chris Rebert
ebedeaf2fe Fix name of Tooltip.replaceArrow() parameter
isHorizontal => isVertical
2015-01-27 11:15:55 -08:00
Chris Rebert
592950cc22 Merge pull request #15678 from coliff/patch-1
Update non-responsive.css
2015-01-27 08:33:26 -08:00
Christian
37fbe1cf62 Update non-responsive.css
Fix typo on Utilize
2015-01-27 20:51:55 +09:00
XhmikosR
03e41b355c Gruntfile.js: Remove now unneeded validator relaxError option. 2015-01-26 18:02:58 +02:00
XhmikosR
9f25895015 Fix validation errors.
Surprisingly those weren't reported by the validator; only in the grunt-contrib-htmlmin branch they were reported, so after digging into it, I saw they were indeed errors...
2015-01-26 17:58:09 +02:00
Chris Rebert
c015fec325 Merge pull request #15660 from twbs/bump-dev-deps
update devDependencies
2015-01-23 16:14:11 -08:00
Chris Rebert
6a84b5a090 update shrinkwrap 2015-01-23 16:03:23 -08:00
Chris Rebert
50a3e579ae update devDependencies
upgrade grunt-contrib-jshint to ~0.11.0
upgrade load-grunt-tasks to ~3.0.0
2015-01-23 15:59:37 -08:00
Chris Rebert
972a361e98 Merge pull request #15651 from sebnow/bower-woff2
Add woff2 font file to bower main files
2015-01-23 08:06:55 -08:00
Sebastian Nowicki
767f3c87bc Add woff2 font file to bower main files
If Bootstrap is installed through bower, the woff2 font file may not be
copied over as it's not in the "main" files. The LESS files still
reference the font file which results in errors.
2015-01-23 14:24:27 +01:00
Mark Otto
efd7792488 Merge branch 'master' of github.com:twbs/bootstrap 2015-01-21 21:06:28 -08:00
Mark Otto
c08bf4ba8b keep the base64 2015-01-21 21:06:11 -08:00
Mark Otto
a3890a72cf Merge branch 'master' into move-inline-css
Conflicts:
	docs/assets/css/docs.min.css
2015-01-21 20:16:08 -08:00
Mark Otto
8ec708870c Merge pull request #15299 from SpectrumPixel/patch-2
Remove "Separated link" in example where it's not
2015-01-21 19:58:03 -08:00
Mark Otto
c64c863637 Merge branch 'master' of github.com:twbs/bootstrap 2015-01-21 19:20:59 -08:00
Mark Otto
af9c7151b3 Merge branch 'docs-anchors' 2015-01-21 19:20:21 -08:00
Mark Otto
84e41378e6 style changes 2015-01-21 19:20:16 -08:00
Bootstrap's Grunt bot
5e26ad4921 automatic grunt dist 2015-01-22 03:01:38 +00:00
Mark Otto
2641ba6f0f Merge pull request #15628 from kkirsche/patch-1
[Fix Issue #15561] Fix badges not being resized inside .btn-group-xs if .btn-xs is not applied
2015-01-21 18:50:33 -08:00
Kevin Kirsche
4c5d1faa35 Fix having multiple selectors on a single line. 2015-01-21 16:38:58 -05:00
Bootstrap's Grunt bot
c8be2a063a automatic grunt dist 2015-01-21 21:20:51 +00:00
Chris Rebert
22a4d96e9a Merge pull request #15620 from twbs/iso-4217
Add .glyphicon-* aliases for other ISO 4217-ish currency codes
2015-01-21 13:16:57 -08:00
Kevin Kirsche
848701a1b3 Fix issue twbs/bootstrap#15561
Fix issue twbs/bootstrap#15561 regarding badges not shrinking to fit inside of .btn-group-xs
2015-01-21 12:01:25 -05:00
Chris Rebert
1ce502dc4d Merge pull request #15621 from twbs/fix-12832
Document sticky :hover on mobile browsers
2015-01-21 00:02:09 -08:00
XhmikosR
53d2abff92 Carousel example: move the Base64 images outside of the HTML.
Use a simple blank.gif and change the background color instead of duplicating stuff.
2015-01-21 09:51:12 +02:00
XhmikosR
a6f3bdb71f Move inline CSS to docs.css. 2015-01-21 09:51:12 +02:00
XhmikosR
3f512c927b Add AnchorJS for docs anchors. 2015-01-21 09:50:51 +02:00
Chris Rebert
d5a2b27e16 Merge pull request #15503 from twbs/qunit
Update QUnit to v1.17.0.
2015-01-20 20:23:34 -08:00
Chris Rebert
1652efc3f6 tweak 'close reopened modal' unit test to work under new QUnit API 2015-01-20 20:18:33 -08:00
Chris Rebert
df73535a2d fix bug in tab show/shown relatedTarget unit test 2015-01-20 20:16:42 -08:00
Chris Rebert
b56d97f210 update JS unit tests to future-proof QUnit 1.16.0 API
[skip validator]
2015-01-20 19:57:51 -08:00
Chris Rebert
2e20e67dc1 Document sticky :hover on mobile browsers; fixes #12832 2015-01-20 19:22:20 -08:00
Chris Rebert
07a3ea5f54 Add .glyphicon-* aliases for other ISO 4217-ish currency codes
Fixes #15617.
2015-01-20 16:24:48 -08:00
Chris Rebert
d9f437f4ec Merge pull request #15619 from twbs/markdown
Change markdown library
2015-01-20 13:25:24 -08:00
Chris Rebert
92b267f357 update shrinkwrap 2015-01-20 13:05:58 -08:00
Chris Rebert
30b74105dd remarkable -> markdown-it 2015-01-20 13:04:55 -08:00
Chris Rebert
136058b562 Merge pull request #15618 from twbs/update-sauce
update grunt-saucelabs to ~8.5.0
2015-01-20 13:04:17 -08:00
Chris Rebert
0b7f6b941a update shrinkwrap 2015-01-20 12:49:46 -08:00
Chris Rebert
429809c9cc update grunt-saucelabs to ~8.5.0 2015-01-20 12:49:08 -08:00
Bootstrap's Grunt bot
c643a3d331 automatic grunt dist 2015-01-19 23:20:54 +00:00
Mark Otto
b6c0007f21 Merge pull request #15606 from tagliala/trim-whitespaces
Trim whitespaces
2015-01-19 15:13:16 -08:00
Geremia Taglialatela
e90f98dd0c Trim whitespaces 2015-01-19 21:26:01 +01:00
XhmikosR
a8139a0392 Update QUnit to v1.17.0. 2015-01-19 20:10:34 +02:00
XhmikosR
4fd01b7ac1 Merge pull request #15605 from twbs/deps
Update devDependencies.
2015-01-19 19:54:43 +02:00
XhmikosR
fbc220defd Update devDependencies. 2015-01-19 19:20:13 +02:00
Mark Otto
24aad4fe3a customizer typo 2015-01-19 09:19:09 -08:00
Mark Otto
bcf7dd38b5 Merge pull request #15604 from twbs/ship_v3.3.2
Ship v3.3.2
2015-01-19 09:03:09 -08:00
Mark Otto
fa47de717e grunt 2015-01-19 08:33:33 -08:00