sharpetronics/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-11-04 00:03:15 -05:00
Code Issues Projects Releases Wiki Activity
13,456 Commits 125 Branches 94 Tags
Commit Graph

13456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Chris Rebert
17d15959d5 Merge pull request #18383 from twbs/sauce-ms-edge 
Add MS Edge to Sauce browser tests
 2015-11-30 00:07:43 -08:00
Chris Rebert
6bfd7081ac Bump iOS to v8 in Autoprefixer settings 
The latest iOS version is 9.1
Our prefixing policy dictates that we prefix 1 version back from the latest version.
9.1 - 1_major_version = 8.0

[skip validator]
 2015-11-29 23:54:36 -08:00
Chris Rebert
fcec8c9512 Add MS Edge to Sauce browser tests 
[skip validator]
 2015-11-29 23:51:11 -08:00
Chris Rebert
74ddd041b5 Merge pull request #18377 from twbs/sauce-ios-9.1 
SauceLabs tests: Bump iOS to v9.1
 2015-11-29 23:47:44 -08:00
Chris Rebert
ac0c2c2aa0 SauceLabs tests: Bump iOS to v9.1 
[skip validator]
 2015-11-29 23:21:57 -08:00
Chris Rebert
acdf317674 Merge pull request #18376 from twbs/travis-disable-caching 
Travis CI: Temporarily disable caching
 2015-11-29 23:20:57 -08:00
Chris Rebert
548834e87f Merge pull request #18340 from twbs/responsive-pulls 
Add responsive float classes
 2015-11-29 21:47:49 -08:00
Mark Otto
23d7b7fe42 Merge pull request #18381 from twbs/file-input-width-var 
Use $input-border-width for custom file input borders
 2015-11-29 21:18:52 -08:00
Mark Otto
b7e3e92d6b Merge pull request #18380 from twbs/card-border-var 
Use $card-border-width for .card-inverse's header/footer border-bottom override
 2015-11-29 21:18:40 -08:00
Chris Rebert
12d0f98507 Use $input-border-width for custom file input borders 
Fixes part of #18150

[skip sauce]
[skip validator]
 2015-11-29 21:13:19 -08:00
Chris Rebert
3f2943424f Remove reference to defunct Customizer from v3 
[ci skip]
 2015-11-29 20:54:45 -08:00
Chris Rebert
0b01c360fc Use $card-border-width for .card-inverse's header/footer border-bottom override 
Refs #18150

[skip sauce]
[skip validator]
 2015-11-29 20:48:33 -08:00
Chris Rebert
7ae7149f3f navs.md: Fix typo 
[ci skip]
 2015-11-29 20:24:33 -08:00
Mark Otto
543580eafe Merge pull request #18256 from twbs/print-border-widths 
Use $border-width in misc border print styles
 2015-11-29 20:03:02 -08:00
Mark Otto
c1b79347b4 Merge pull request #18264 from twbs/input-group-btns-both-sides 
Add input group example with btns on both sides for completeness+testing
 2015-11-29 20:02:47 -08:00
Mark Otto
f16ad22530 fixes #18188 2015-11-29 19:56:17 -08:00
Mark Otto
4005b316c6 rearrange comment lines for clarity 2015-11-29 19:55:51 -08:00
Mark Otto
0fa2c7c486 Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev 2015-11-29 19:54:20 -08:00
Mark Otto
c68019e5d0 Merge pull request #18257 from twbs/border-width-vars 
Add more border width variables
 2015-11-29 19:52:22 -08:00