Commit Graph

10607 Commits

Author SHA1 Message Date
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
Chris Rebert 46e059e9d7 Merge pull request #15407 from twbs/close-15205
Add Wall of Browser Bugs entry for #15205
2014-12-18 18:30:08 -08:00
Chris Rebert e1484cc65d Add Wall of Browser Bugs entry for #15205
Closes #15205
2014-12-18 18:28:15 -08:00
Chris Rebert caed2c0303 group Safari browser bugs by OS 2014-12-18 18:24:02 -08:00
Chris Rebert 6fe9cd9fef Merge pull request #15395 from twbs/firefox-customizer-warning
Add warning to Customizer about Firefox bug
2014-12-17 13:14:14 -08:00
Chris Rebert f73b341639 Add warning to Customizer about Firefox bug; refs #15016
[skip sauce]
2014-12-17 13:13:23 -08:00
Nicole Sullivan 7551723054 Fixes #14990: Media bodies take up full width
Signed-off-by: Beatrice Peng <bpeng@pivotal.io>
2014-12-17 11:19:06 -05:00
Chris Rebert 8deda6116f Port c66e3029df over from hosted docs 2014-12-15 16:25:43 -08:00
Chris Rebert e41127efe4 Merge pull request #15373 from twbs/doc-15340
Add docs for #15340
2014-12-15 13:19:35 -08:00
Mark Otto d6a95b72a0 Merge branch 'master' of https://github.com/twbs/bootstrap 2014-12-15 12:44:04 -08:00
Chris Rebert e674ea553d Add docs for #15340
border-radius CSS property doesn't affect <select>s in some browsers.
Hence, @input-border-radius doesn't affect <select class="form-control"> in some browsers.
Closes #15340.

[skip sauce]
[skip validator]
2014-12-15 11:58:55 -08:00
Chris Rebert 35bced0308 Merge pull request #15369 from bastienmoulia/woff2
Add woff2 font in readme.md
2014-12-15 08:35:21 -08:00
Bastien 9e5697a14f Add woff2 font in readme.md 2014-12-15 10:00:19 +01:00
Mark Otto 4945e370f0 fixes #15340: mention in docs that most selects can't change border-radius 2014-12-14 16:59:47 -08:00
Bootstrap's Grunt bot 181f4aebea automatic grunt dist 2014-12-15 00:30:39 +00:00
Mark Otto b7be72c86c Merge pull request #15348 from bastienmoulia/master
Correction in the documentation, add the brand-primary true color in comment and woff2 glyphicons
2014-12-14 16:28:53 -08:00
Patrick H. Lauke c187f77e65 Merge pull request #15363 from patrickhlauke/docs-nicer-skip-link
Make skip link look less "bare bones"
2014-12-14 23:30:37 +00:00
Patrick H. Lauke 2d41894ce5 Expand/clarify advice about skip links 2014-12-14 21:27:58 +00:00
Patrick H. Lauke d5647e1f62 Make skip link look less "bare bones"
Additional markup for the skip link (to ensure it has the same effective
width as the main content, and to provide an outline around just the
link text) plus some basic styles...make it look a bit more in keeping
with the overall look and feel of the docs.
2014-12-14 21:27:58 +00:00
Chris Rebert f11a3a31f1 Merge pull request #15357 from twbs/update-saucelabs
bump grunt-saucelabs to ~8.4.0
2014-12-12 14:31:30 -08:00
Chris Rebert 8be858aac4 update shrinkwrap
[skip validator]
2014-12-12 14:19:42 -08:00
Chris Rebert 33cbf2142b bump grunt-saucelabs to ~8.4.0
[skip validator]
2014-12-12 14:18:25 -08:00
Chris Rebert ae579b4b75 Merge pull request #15356 from twbs/remarkable
bump remarkable to ~1.5.0
2014-12-12 14:16:55 -08:00
Chris Rebert 0d413c5c08 update shrinkwrap
[skip sauce]
[skip validator]
2014-12-12 14:08:03 -08:00
Chris Rebert 74df3175b9 bump remarkable to ~1.5.0 2014-12-12 13:42:43 -08:00
Chris Rebert 79af63aac9 Merge pull request #15355 from twbs/fix-15279
use npm-shrinkwrap ^200.0.0
2014-12-12 13:39:04 -08:00
Chris Rebert 5f41801083 update shrinkwrap 2014-12-12 13:22:09 -08:00