Skip to content

Commit b4a3115

Browse files
committed
update: forgot to commit bootstrap 4.0.0-alpha.6
1 parent f530c2d commit b4a3115

File tree

171 files changed

+18220
-17706
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+18220
-17706
lines changed

bower_components/bootstrap/.bower.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"framework",
1212
"web"
1313
],
14-
"homepage": "http://getbootstrap.com",
14+
"homepage": "https://getbootstrap.com",
1515
"license": "MIT",
1616
"moduleType": "globals",
1717
"main": [
@@ -29,16 +29,17 @@
2929
"test-infra"
3030
],
3131
"dependencies": {
32-
"jquery": "1.9.1 - 2"
32+
"jquery": ">=1.9.1",
33+
"tether": "^1.4.0"
3334
},
34-
"version": "4.0.0-alpha.2",
35-
"_release": "4.0.0-alpha.2",
35+
"version": "4.0.0-alpha.6",
36+
"_release": "4.0.0-alpha.6",
3637
"_resolution": {
3738
"type": "version",
38-
"tag": "v4.0.0-alpha.2",
39-
"commit": "48938155eb24b4ccdde09426066869504c6dab3c"
39+
"tag": "v4.0.0-alpha.6",
40+
"commit": "65ffb1c3b6e94440812a2e228cb8e8be512652ec"
4041
},
41-
"_source": "git://github.com/twbs/bootstrap.git",
42-
"_target": "4.0.0-alpha.2",
42+
"_source": "https://github.com/twbs/bootstrap.git",
43+
"_target": "4.0.0-alpha.6",
4344
"_originalSource": "bootstrap"
4445
}

bower_components/bootstrap/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ Bootstrap uses [GitHub's Releases feature](https://github.com/blog/1547-release-
22

33
See [the Releases section of our GitHub project](https://github.com/twbs/bootstrap/releases) for changelogs for each release version of Bootstrap.
44

5-
Release announcement posts on [the official Bootstrap blog](http://blog.getbootstrap.com) contain summaries of the most noteworthy changes made in each release.
5+
Release announcement posts on [the official Bootstrap blog](https://blog.getbootstrap.com) contain summaries of the most noteworthy changes made in each release.

bower_components/bootstrap/Gemfile

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
# Ruby Gems for building and testing Bootstrap
2-
# Run `grunt update-gemfile-lock` to update to the latest compatible versions
3-
41
source 'https://rubygems.org'
52

63
group :development, :test do
7-
gem 'jekyll', '~> 3.0.1'
8-
gem 'jekyll-redirect-from', '~> 0.9.0'
9-
gem 'jekyll-sitemap', '~> 0.9.0'
10-
gem 'sass', '~> 3.4.19'
11-
gem 'scss_lint', '~> 0.43'
4+
gem 'jekyll', '~> 3.3.1'
5+
gem 'jekyll-redirect-from', '~> 0.12.0'
6+
gem 'jekyll-sitemap', '~> 0.12.0'
7+
gem 'scss_lint', '~> 0.51.0'
128
end
Lines changed: 38 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,58 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
colorator (0.1)
5-
ffi (1.9.10)
6-
ffi (1.9.10-x64-mingw32)
7-
jekyll (3.0.1)
8-
colorator (~> 0.1)
4+
addressable (2.5.0)
5+
public_suffix (~> 2.0, >= 2.0.2)
6+
colorator (1.1.0)
7+
ffi (1.9.14)
8+
forwardable-extended (2.6.0)
9+
jekyll (3.3.1)
10+
addressable (~> 2.4)
11+
colorator (~> 1.0)
912
jekyll-sass-converter (~> 1.0)
1013
jekyll-watch (~> 1.1)
1114
kramdown (~> 1.3)
1215
liquid (~> 3.0)
1316
mercenary (~> 0.3.3)
17+
pathutil (~> 0.9)
1418
rouge (~> 1.7)
1519
safe_yaml (~> 1.0)
16-
jekyll-redirect-from (0.9.0)
17-
jekyll (>= 2.0)
18-
jekyll-sass-converter (1.3.0)
19-
sass (~> 3.2)
20-
jekyll-sitemap (0.9.0)
21-
jekyll-watch (1.3.0)
22-
listen (~> 3.0)
23-
kramdown (1.9.0)
20+
jekyll-redirect-from (0.12.0)
21+
jekyll (~> 3.3)
22+
jekyll-sass-converter (1.5.0)
23+
sass (~> 3.4)
24+
jekyll-sitemap (0.12.0)
25+
jekyll (~> 3.3)
26+
jekyll-watch (1.5.0)
27+
listen (~> 3.0, < 3.1)
28+
kramdown (1.13.1)
2429
liquid (3.0.6)
25-
listen (3.0.5)
26-
rb-fsevent (>= 0.9.3)
27-
rb-inotify (>= 0.9)
28-
mercenary (0.3.5)
29-
rainbow (2.0.0)
30-
rb-fsevent (0.9.6)
31-
rb-inotify (0.9.5)
30+
listen (3.0.8)
31+
rb-fsevent (~> 0.9, >= 0.9.4)
32+
rb-inotify (~> 0.9, >= 0.9.7)
33+
mercenary (0.3.6)
34+
pathutil (0.14.0)
35+
forwardable-extended (~> 2.6)
36+
public_suffix (2.0.5)
37+
rake (12.0.0)
38+
rb-fsevent (0.9.8)
39+
rb-inotify (0.9.7)
3240
ffi (>= 0.5.0)
33-
rouge (1.10.1)
41+
rouge (1.11.1)
3442
safe_yaml (1.0.4)
35-
sass (3.4.19)
36-
scss_lint (0.43.2)
37-
rainbow (~> 2.0)
38-
sass (~> 3.4.15)
43+
sass (3.4.23)
44+
scss_lint (0.51.0)
45+
rake (>= 0.9, < 13)
46+
sass (~> 3.4.20)
3947

4048
PLATFORMS
4149
ruby
42-
x64-mingw32
4350

4451
DEPENDENCIES
45-
jekyll (~> 3.0.1)
46-
jekyll-redirect-from (~> 0.9.0)
47-
jekyll-sitemap (~> 0.9.0)
48-
sass (~> 3.4.19)
49-
scss_lint (~> 0.43)
52+
jekyll (~> 3.3.1)
53+
jekyll-redirect-from (~> 0.12.0)
54+
jekyll-sitemap (~> 0.12.0)
55+
scss_lint (~> 0.51.0)
5056

5157
BUNDLED WITH
52-
1.10.6
58+
1.13.6

0 commit comments

Comments
 (0)