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

10734 Commits

Author SHA1 Message Date
Chris Rebert
96e108f2b2 Revert "remove Glyphicons docs autogeneration from Grunt"
This reverts commit 36b5308926.
This reverts PR #14065.

Turns out Glyphicons is more active than we'd thought.
2014-12-29 16:54:29 -08:00
Chris Rebert
ad138ed885 Disable .glyphicon-door & .glyphicon-key for the time being
Closes #15419
Refs #10106
2014-12-29 16:44:33 -08:00
Chris Rebert
9dc3cf7f19 Merge pull request #15425 from twbs/regression-test-14244
Add regression test for #14244.
2014-12-29 16:22:37 -08:00
Chris Rebert
27bfef5b35 Add regression test for #14244.
Special thanks to @programcsharp

[skip validator]
2014-12-29 16:09:37 -08:00
Chris Rebert
e4c7a92c76 Merge pull request #15462 from twbs/bump-jscs
bump grunt-jscs to ~1.1.0
2014-12-29 12:11:51 -08:00
Chris Rebert
2ae4c0b03f JSCS: enable requireSpaceBetweenArguments
New rule added in JSCS v1.9.0
Our JS already complies with this.
2014-12-29 12:02:33 -08:00
Chris Rebert
9e66526766 update shrinkwrap 2014-12-29 12:00:47 -08:00
Chris Rebert
995c768330 bump grunt-jscs to ~1.1.0 2014-12-29 11:57:56 -08:00
Chris Rebert
c14ff80f01 update shrinkwrap
[skip sauce]
[skip validator]
2014-12-28 20:29:42 -08:00
Chris Rebert
f91071bc1b Bump grunt-contrib-cssmin to ~0.11.0 2014-12-28 19:58:29 -08:00
Chris Rebert
f149e4309a Merge pull request #15455 from twbs/bump-uglify
bump grunt-contrib-uglify to ~0.7.0
2014-12-28 19:53:35 -08:00
Chris Rebert
d6ab6731e6 update shrinkwrap
[skip sauce]
[skip validator]
2014-12-28 19:49:12 -08:00
Chris Rebert
139226157e bump grunt-contrib-uglify to ~0.7.0 2014-12-28 19:47:46 -08:00
Chris Rebert
ac78d16e41 Merge pull request #15454 from twbs/bump-compress
bump grunt-contrib-compress to ~0.13.0
2014-12-28 19:46:23 -08:00
Chris Rebert
a462676075 update shrinkwrap
[skip sauce]
[skip validator]
2014-12-28 19:37:16 -08:00
Chris Rebert
f5dad0fa39 bump grunt-contrib-compress to ~0.13.0 2014-12-28 18:59:49 -08:00
Chris Rebert
120b1f164b Merge pull request #15453 from twbs/bump-jade
bump grunt-contrib-jade to ~0.14.0
2014-12-28 18:58:36 -08:00
Chris Rebert
109e4c7c16 update shrinkwrap
[skip sauce]
2014-12-28 18:55:50 -08:00
Chris Rebert
b282e8a01f bump grunt-contrib-jade to ~0.14.0 2014-12-28 18:53:55 -08:00
Chris Rebert
4484700d10 Merge pull request #15452 from twbs/bump-load-grunt-tasks
bump load-grunt-tasks to ~2.0.0
2014-12-28 18:50:51 -08:00
Chris Rebert
6099bfdea8 update shrinkwrap
[skip sauce]
[skip validator]
2014-12-28 18:45:56 -08:00
Chris Rebert
93cd02cd29 bump load-grunt-tasks to ~2.0.0 2014-12-28 18:43:47 -08:00
Chris Rebert
688780eb07 Merge pull request #15451 from twbs/bump-remarkable
bump remarkable to ~1.6.0
2014-12-28 18:40:44 -08:00
Chris Rebert
952f7e9a4e update shrinkwrap 2014-12-28 18:32:02 -08:00
Chris Rebert
2879049163 bump remarkable to ~1.6.0 2014-12-28 18:25:49 -08:00
Mark Otto
977646d7a0 grunt 2014-12-22 19:48:48 -08:00
Mark Otto
b615bd938b Merge branch 'master' of https://github.com/twbs/bootstrap
Conflicts:
	dist/css/bootstrap.css.map
2014-12-22 19:30:51 -08:00
Mark Otto
c41970c579 Fixes #15422: Alternate fix for temporal input sizing in input groups 2014-12-22 19:28:29 -08:00
Bootstrap's Grunt bot
3668bde098 automatic grunt dist 2014-12-23 03:20:44 +00:00
Mark Otto
c4a23cc040 grunt 2014-12-22 19:18:26 -08:00
Chris Rebert
5e8dd7d438 Merge pull request #15428 from twbs/browser-bugs
add/update/summarize browser bug refs in Less comments
2014-12-22 19:10:23 -08:00
Mark Otto
fa08c932cd Merge pull request #15426 from twbs/hide-holder
Remove holder.js references from syntax-highlighted example HTML
2014-12-22 19:03:28 -08:00
Chris Rebert
75ec7393ec Add summary of #11526 to explanatory Less comment
[skip sauce]
[skip validator]
2014-12-22 17:24:37 -08:00
Chris Rebert
d84f726da4 IE11 & current Firefox are still affected.
Refs #11623
2014-12-22 17:24:26 -08:00
Chris Rebert
15c9c3aef7 add more refs to browser-related bugs in Less comments 2014-12-22 17:24:26 -08:00
Bootstrap's Grunt bot
b61e4dd671 automatic grunt dist 2014-12-22 23:10:45 +00:00
Chris Rebert
e5051e76fe Reference iOS Safari temporal input bug in explanatory Less comment
Refs #11266, #13098, #15415

[skip sauce]
[skip validator]
2014-12-22 15:03:48 -08:00
Chris Rebert
f2a0a78b17 Merge pull request #15427 from twbs/defunct-bug-1969
Remove reference to old fixed WebKit bug in Less comment.
2014-12-22 14:59:35 -08:00
Chris Rebert
c275850982 Remove reference to old fixed WebKit bug in Less comment.
Per https://github.com/twbs/bootstrap/issues/1969#issuecomment-36971094

[skip sauce]
[skip validator]
2014-12-22 14:58:44 -08:00
Chris Rebert
3406a5c97a Remove holder.js references from syntax-highlighted example HTML
Our use of Holder.js in the docs is a mere implementation detail.
Don't want to confuse people into thinking Holder.js
is somehow required by the Thumbnail component.

[skip sauce]
2014-12-22 14:55:41 -08:00
Chris Rebert
bb9118f03a Merge pull request #15424 from twbs/chrome-438064-fixed
Remove #14972's entry from Wall of Browser bugs
2014-12-22 12:28:26 -08:00
Chris Rebert
dc7ab34cc9 http://crbug.com/438064 has been fixed
Refs #14972

[skip sauce]
[skip validator]
2014-12-22 12:15:44 -08:00
Mark Otto
28d847a1e0 grunt 2014-12-20 23:05:23 -08:00
Bootstrap's Grunt bot
9c526bf519 automatic grunt dist 2014-12-21 06:20:46 +00:00
Mark Otto
4d2f68c437 Merge pull request #15391 from stubbornella/master
Fixes #14990: Media bodies take up full width
2014-12-20 22:15:15 -08:00
Mark Otto
8777803acf Merge pull request #15307 from vsn4ik/part_of_15148
Fix part of #15148.
2014-12-20 22:12:47 -08:00
Bootstrap's Grunt bot
acef81d900 automatic grunt dist 2014-12-20 02:20:44 +00:00
Chris Rebert
b8844f639f fix "propertes" typos in comments 2014-12-19 18:19:18 -08:00
Chris Rebert
cde3093351 Merge pull request #15415 from twbs/webkit-bug-139848
Add Wall of Browser Bugs entry for #11266, #13098
2014-12-19 17:16:17 -08:00
Chris Rebert
43b3c9d0a8 Add Wall of Browser Bugs entry for #11266, #13098
[skip sauce]
2014-12-19 17:15:14 -08:00