0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-30 12:24:19 +01:00
Commit Graph

10803 Commits

Author SHA1 Message Date
Chris Rebert
45f5841785 Merge pull request #15464 from twbs/address-15419
Address #15419
2014-12-31 16:11:04 -08:00
Bootstrap's Grunt bot
6c383c5102 automatic grunt dist 2015-01-01 00:02:16 +00:00
XhmikosR
1b8f00b389 Merge pull request #15292 from twbs/customize-icon
Use a glyphicon instead of the unicode character.
2014-12-31 19:17:46 +02:00
Mark Otto
b4ac87c901 Merge pull request #15474 from NateEag/patch-1
Remove extra word from disabling-responsiveness.html
2014-12-31 09:15:36 -08:00
Nate Eagleson
1b375420fa Remove extra word from disabling-responsiveness.html 2014-12-30 21:48:34 -05:00
Chris Rebert
4f1000d772 Document that Autoprefixer is required
Closes #14937
[skip sauce]
2014-12-30 18:34:48 -08:00
Chris Rebert
511f37dc04 Document that responsive tables use overflow-y: hidden
Closes #15288

[skip sauce]
2014-12-30 18:17:09 -08:00
Chris Rebert
714cd6b608 Merge pull request #15470 from twbs/document-version
Document the VERSION property of the jQuery plugins;
2014-12-30 13:32:44 -08:00
Chris Rebert
5ccfd98c31 Document the VERSION property of the jQuery plugins; fixes #15202
[skip sauce]
2014-12-30 13:32:28 -08:00
Heinrich Fenkart
c3e6111eef Switch to shields.io for badges in README
Closes #15380
[ci skip]
2014-12-30 11:48:08 -08:00
Bootstrap's Grunt bot
5a35555a72 automatic grunt dist 2014-12-30 12:31:08 +00:00
Chris Rebert
2166f238d7 Merge pull request #15456 from twbs/bump-clean-css
Bump grunt-contrib-cssmin to ~0.11.0
2014-12-30 00:12:38 -08:00
XhmikosR
13d7cc7d4c Use a glyphicon instead of the unicode character. 2014-12-30 09:56:24 +02:00
Chris Rebert
b0437f8ea9 Merge pull request #15466 from twbs/revert-14189
Revert #14189 to fix #15168
2014-12-29 20:43:13 -08:00
Chris Rebert
adaabab81b Revert "Allow multiple delegated tooltip selectors on a node"
This reverts commit 1b3237629a.
This reverts PR #14189 because it caused major regressions.

Fixes #15168.

We'll try to revisit #14167's feature request in Bootstrap v4.

[skip validator]
2014-12-29 20:08:22 -08:00
Chris Rebert
32cb071594 Remove semicolons from #15425 because fat 2014-12-29 18:34:35 -08:00
Chris Rebert
35073fc128 grunt build-glyphicons-data 2014-12-29 17:01:05 -08:00
Chris Rebert
57a64be749 Minor fix to Glyphicons data generator 2014-12-29 17:00:44 -08:00
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