Skip to content

Commit ca4fb14

Browse files
Merge pull request dotnet-architecture#218 from SychevIgor/bootstrapversionfix
bootstrap version consolidated across all ui based apps. latest stabl…
2 parents 6af0bd0 + 1a8c0f2 commit ca4fb14

21 files changed

Lines changed: 98 additions & 9262 deletions

src/Services/Identity/Identity.API/Views/Shared/_Layout.cshtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<link rel="icon" type="image/x-icon" href="~/favicon.ico" />
88
<link rel="shortcut icon" type="image/x-icon" href="~/favicon.ico" />
99
<environment names="Development">
10-
<link rel="stylesheet" href="~/lib/bootstrap/css/bootstrap.css" />
10+
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
1111
<link rel="stylesheet" href="~/css/site.css" />
1212
</environment>
1313
<environment names="Staging,Production">
14-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.5/css/bootstrap.min.css"
14+
<link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/css/bootstrap.min.css"
1515
asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
1616
asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" />
1717
<link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" />
@@ -49,7 +49,7 @@
4949

5050

5151
<script src="~/lib/jquery/jquery.js"></script>
52-
<script src="~/lib/bootstrap/js/bootstrap.js"></script>
52+
<script src="~/lib/bootstrap/dist/js/bootstrap.js"></script>
5353
@RenderSection("scripts", required: false)
5454
</body>
5555
</html>

src/Services/Identity/Identity.API/bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "asp.net",
33
"private": true,
44
"dependencies": {
5-
"bootstrap": "3.3.6",
5+
"bootstrap": "v3.3.7",
66
"jquery": "2.2.0",
77
"jquery-validation": "1.14.0",
88
"jquery-validation-unobtrusive": "3.2.6"

src/Services/Identity/Identity.API/wwwroot/lib/bootstrap/.bower.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,17 @@
2929
"test-infra"
3030
],
3131
"dependencies": {
32-
"jquery": "1.9.1 - 2"
32+
"jquery": "1.9.1 - 3"
3333
},
34-
"version": "3.3.6",
35-
"_release": "3.3.6",
34+
"version": "3.3.7",
35+
"_release": "3.3.7",
3636
"_resolution": {
3737
"type": "version",
38-
"tag": "v3.3.6",
39-
"commit": "81df608a40bf0629a1dc08e584849bb1e43e0b7a"
38+
"tag": "v3.3.7",
39+
"commit": "0b9c4a4007c44201dce9a6cc1a38407005c26c86"
4040
},
41-
"_source": "git://github.com/twbs/bootstrap.git",
42-
"_target": "3.3.6",
43-
"_originalSource": "bootstrap"
41+
"_source": "https://github.com/twbs/bootstrap.git",
42+
"_target": "v3.3.7",
43+
"_originalSource": "bootstrap",
44+
"_direct": true
4445
}

src/Services/Identity/Identity.API/wwwroot/lib/bootstrap/LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2011-2015 Twitter, Inc
3+
Copyright (c) 2011-2016 Twitter, Inc.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)