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

13534 Commits

Author SHA1 Message Date
Mark Otto
873a9409a3 Merge pull request #18450 from twbs/more-font-weight-vars
Add 3 more font-weight variables
2015-12-06 16:24:31 -08:00
Chris Rebert
0759d76bd2 Add 3 more font-weight variables
Refs #14368

[skip sauce]
[skip validator]
2015-12-06 12:32:49 -08:00
Chris Rebert
451265bb76 Grunt: Factor out new docs-github task
Ports #18445 to v4.

[skip sauce]
[skip validator]
2015-12-06 12:11:10 -08:00
Chris Rebert
193b8306f0 Fix grammar in "Custom forms" docs
[ci skip]
2015-12-06 12:08:01 -08:00
Chris Rebert
23a7c6b1a6 Docs: Fix flavor text in input group example that got borked at some point
[skip sauce]
2015-12-06 12:02:54 -08:00
Chris Rebert
1ac1cf5952 Merge pull request #18448 from twbs/bugzilla-1139853
Add Wall of Browser Bugs entry for #15990
2015-12-06 03:08:27 -08:00
Chris Rebert
4120663c4b Add Wall of Browser Bugs entry for #15990
https://bugzilla.mozilla.org/show_bug.cgi?id=1139853
[skip sauce]
2015-12-06 03:02:40 -08:00
Chris Rebert
e4cd726ad9 Merge pull request #18447 from twbs/moz-meta-bug
Mention Mozilla Firefox meta-bug on Wall of Browser Bugs
2015-12-06 02:27:03 -08:00
Chris Rebert
2268fda99c Mention Mozilla Firefox meta-bug on Wall of Browser Bugs
https://bugzilla.mozilla.org/show_bug.cgi?id=1230801

[skip sauce]
2015-12-06 02:07:29 -08:00
Chris Rebert
b1acdd69cb Merge pull request #18442 from vsn4ik/v4-dev-form-icon-default
Use !default on $form-icon-* variables
2015-12-05 17:50:08 -08:00
vsn4ik
ad698d124a v4 - Add default param for form-icon variables 2015-12-05 21:32:25 +03:00
XhmikosR
b7b448a0e7 Run grunt.
[ci skip]
2015-12-05 12:59:13 +02:00
Chris Rebert
75c39f9138 Fix version numbers is JS files; fixes #18435
[skip sauce]
[skip validator]
2015-12-05 02:19:46 -08:00
XhmikosR
3cd8bd58e3 package.json: fix duplicate scripts property.
[skip sauce]
[skip validator]
2015-12-05 12:07:40 +02:00
XhmikosR
26af030b6c Merge pull request #18431 from twbs/v4-dev-xmr-docs-library-updates
V4 dev docs library updates
2015-12-05 11:44:19 +02:00
XhmikosR
34a0ce571e Run grunt.
[ci skip]
2015-12-05 11:43:23 +02:00
XhmikosR
4191288873 Update clipboard.js to v1.5.5.
[ci skip]
2015-12-05 11:41:34 +02:00
XhmikosR
58717fa2d8 Update anchor.js to v2.0.0.
[ci skip]
2015-12-05 11:41:34 +02:00
Chris Rebert
96562e3750 Merge pull request #18434 from twbs/update-shrinkwrap
Update shrinkwrap
2015-12-05 01:36:59 -08:00
XhmikosR
e7a9a88c3c Merge pull request #18432 from twbs/v4-dev-xmr-jekyll-search
Fix docs/search.json.
2015-12-05 11:32:49 +02:00
XhmikosR
3afdbe426f Fix docs/search.json.
* only loop through `html_pages`
* skip pages without a title
* stop double escaping the title; use Jekyll's `jsonify` filter to output valid JSON
* remove `date` since we don't use it

[skip sauce]
2015-12-05 11:30:27 +02:00
Chris Rebert
e5266a8058 Update shrinkwrap 2015-12-05 01:28:33 -08:00
Chris Rebert
c7ea145df6 Merge pull request #18402 from twbs/fix-18338
s/grunt-sed/npm script/
2015-12-05 01:11:09 -08:00
XhmikosR
1f8a17ff36 Merge pull request #18378 from twbs/prefix-safari-8
Bump Safari to v8 in Autoprefixer settings
2015-12-05 11:05:33 +02:00
Chris Rebert
7d211536bb Bump Safari to v8 in Autoprefixer settings
The latest OS X Safari version is 9.0.1
Our prefixing policy dictates that we prefix 1 version back from the latest version.
9.0.1 - 1_major_version = 8.0

[skip validator]
2015-12-05 11:04:55 +02:00
Chris Rebert
e95ab5c36e s/grunt-sed/npm script/ ; fixes #18338
[skip sauce]
[skip validator]
2015-12-05 01:03:52 -08:00
XhmikosR
458899dacb Merge pull request #18379 from twbs/prefix-ios-8
Bump iOS to v8 in Autoprefixer settings
2015-12-05 10:38:29 +02:00
XhmikosR
92d0a71fb6 Merge pull request #18391 from twbs/double-bitwise-not-comment
util.js: Add comment explaining ~~ trick
2015-12-05 10:37:27 +02:00
XhmikosR
e94891fe24 Merge pull request #18395 from twbs/scsslint-pseudo-elems
SCSS Lint: explicitly enable PseudoElement check
2015-12-05 10:29:18 +02:00
XhmikosR
4e7c7f4b9d Update jekyll-search.min.js to v1.0.9.
Fixes the IE 9 error.

[ci skip]
2015-12-04 19:28:41 +02:00
XhmikosR
14772943a6 Rename jekyll-search.js to reflect that it's minified.
[ci skip]
2015-12-04 19:28:41 +02:00
Chris Rebert
8df2e850e6 Merge pull request #18427 from twbs/btn-group-18425
Use $border-width for .btn-group margins that make borders overlap
2015-12-04 02:12:51 -08:00
Chris Rebert
e8dcb2f917 Add $list-inline-padding variable
[skip sauce]
[skip validator]
2015-12-04 01:56:49 -08:00
Chris Rebert
191c82dc38 Fix grammar of comment for <label> in Reboot 2015-12-04 01:46:45 -08:00
Chris Rebert
2fcb2e099f Use $border-width for .btn-group margins that make borders overlap
Fixes half of #18425
[skip sauce]
[skip validator]
2015-12-04 01:42:51 -08:00
Chris Rebert
f6b9e0beb4 Merge pull request #18423 from twbs/unmin-local-docs
Use non-minified CSS when running docs locally
2015-12-04 01:18:57 -08:00
Chris Rebert
211ca58657 Use non-minified CSS when running docs locally
For easier debugging.
Just like we already do for the JS.

[skip sauce]
2015-12-04 00:45:37 -08:00
XhmikosR
8a1685fdee Run grunt.
[ci skip]
2015-12-03 08:51:57 +02:00
XhmikosR
28d85ab809 Update grunt-jscs. 2015-12-03 08:51:44 +02:00
XhmikosR
79a4273891 Tweak ESLint rules. 2015-12-03 08:41:46 +02:00
XhmikosR
e55fcbcdfe tests: bump QUnit to v1.20.0.
[skip validator]
2015-12-03 08:41:46 +02:00
XhmikosR
713e53f105 Add back grunt-contrib-compress.
Should automate the release process.

[ci skip]
2015-12-03 08:41:44 +02:00
Patrick H. Lauke
78eafb8d06 Merge pull request #18401 from tpoulos/patch-1
Proposed better phrasing in the "images" section
2015-12-02 01:25:49 +00:00
Taylor Poulos
0021e7e5b4 Proposed better phrasing in the "images" section
Previously, this read "Bootstrap doesn’t apply this automatically as it causes complications to other image formats." 

In this sentence, the number of the subject and the verb don't agree, and the word "this" is unclear.
2015-12-01 19:21:12 -05:00
Chris Rebert
c15e9fb9ad SCSS Lint: enable PseudoElement check 2015-12-01 02:05:37 -08:00
Chris Rebert
a887a1207c util.js: Add comment explaining ~~ trick
[skip sauce]
[skip validator]
2015-11-30 23:47:56 -08:00
XhmikosR
e458c7b0e6 Bump scss_lint to v0.43.2. 2015-12-01 08:49:01 +02:00
XhmikosR
607c398f4c Bump gems.
[skip sauce]
2015-12-01 08:49:01 +02:00
Chris Rebert
79c3dfec7a Merge pull request #18388 from vsn4ik/v4-dev-fix-responsive-classes-migration
Fix classes for responsive floats in migration
2015-11-30 16:06:23 -08:00
vsn4ik
81e0295098 Fix classes for responsive floats in migration
See a8dc4812a49d8467e8642abb510b523a9a51cd48#commitcomment-14677726

[skip sauce]
2015-12-01 01:01:02 +03:00