Skip to content

Commit faa16cd

Browse files
captainsafiacaptainsafia
authored
Undo template change that induced flakiness (#31417)
1 parent 2a8d385 commit faa16cd

File tree

8 files changed

+136
-154
lines changed

8 files changed

+136
-154
lines changed

‎src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
<title>@ViewData["Title"] - Company.WebApplication1</title>
77
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
88
<link rel="stylesheet" href="~/css/site.css" />
9-
<link rel="stylesheet" href="~/Company.WebApplication1.styles.css" />
109
</head>
1110
<body>
1211
<header>

‎src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml.css

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/css/site.css

Lines changed: 68 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,71 @@
1+
/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification
2+
for details on configuring this project to bundle and minify static web assets. */
3+
4+
a.navbar-brand {
5+
white-space: normal;
6+
text-align: center;
7+
word-break: break-all;
8+
}
9+
10+
/* Provide sufficient contrast against white background */
11+
a {
12+
color: #0366d6;
13+
}
14+
15+
.btn-primary {
16+
color: #fff;
17+
background-color: #1b6ec2;
18+
border-color: #1861ac;
19+
}
20+
21+
.nav-pills .nav-link.active, .nav-pills .show > .nav-link {
22+
color: #fff;
23+
background-color: #1b6ec2;
24+
border-color: #1861ac;
25+
}
26+
27+
/* Sticky footer styles
28+
-------------------------------------------------- */
129
html {
2-
font-size: 14px;
3-
}
4-
@media (min-width: 768px) {
5-
html {
6-
font-size: 16px;
7-
}
8-
}
9-
10-
/* Sticky footer styles
11-
-------------------------------------------------- */
30+
font-size: 14px;
31+
}
32+
@media (min-width: 768px) {
1233
html {
13-
position: relative;
14-
min-height: 100%;
34+
font-size: 16px;
1535
}
16-
17-
body {
18-
/* Margin bottom by footer height */
19-
margin-bottom: 60px;
20-
}
21-
36+
}
37+
38+
.border-top {
39+
border-top: 1px solid #e5e5e5;
40+
}
41+
.border-bottom {
42+
border-bottom: 1px solid #e5e5e5;
43+
}
44+
45+
.box-shadow {
46+
box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05);
47+
}
48+
49+
button.accept-policy {
50+
font-size: 1rem;
51+
line-height: inherit;
52+
}
53+
54+
/* Sticky footer styles
55+
-------------------------------------------------- */
56+
html {
57+
position: relative;
58+
min-height: 100%;
59+
}
60+
61+
body {
62+
/* Margin bottom by footer height */
63+
margin-bottom: 60px;
64+
}
65+
.footer {
66+
position: absolute;
67+
bottom: 0;
68+
width: 100%;
69+
white-space: nowrap;
70+
line-height: 60px; /* Vertically center the text there */
71+
}

‎src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_Layout.cshtml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
99
<link rel="stylesheet" href="~/css/site.css" />
10-
<link rel="stylesheet" href="~/Company.WebApplication1.css" />
1110
</head>
1211
<body>
1312
<header>

‎src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_Layout.cshtml.css

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/css/site.css

Lines changed: 68 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,71 @@
1+
/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification
2+
for details on configuring this project to bundle and minify static web assets. */
3+
4+
a.navbar-brand {
5+
white-space: normal;
6+
text-align: center;
7+
word-break: break-all;
8+
}
9+
10+
/* Provide sufficient contrast against white background */
11+
a {
12+
color: #0366d6;
13+
}
14+
15+
.btn-primary {
16+
color: #fff;
17+
background-color: #1b6ec2;
18+
border-color: #1861ac;
19+
}
20+
21+
.nav-pills .nav-link.active, .nav-pills .show > .nav-link {
22+
color: #fff;
23+
background-color: #1b6ec2;
24+
border-color: #1861ac;
25+
}
26+
27+
/* Sticky footer styles
28+
-------------------------------------------------- */
129
html {
2-
font-size: 14px;
3-
}
4-
@media (min-width: 768px) {
5-
html {
6-
font-size: 16px;
7-
}
8-
}
9-
10-
/* Sticky footer styles
11-
-------------------------------------------------- */
30+
font-size: 14px;
31+
}
32+
@media (min-width: 768px) {
1233
html {
13-
position: relative;
14-
min-height: 100%;
34+
font-size: 16px;
1535
}
16-
17-
body {
18-
/* Margin bottom by footer height */
19-
margin-bottom: 60px;
20-
}
21-
36+
}
37+
38+
.border-top {
39+
border-top: 1px solid #e5e5e5;
40+
}
41+
.border-bottom {
42+
border-bottom: 1px solid #e5e5e5;
43+
}
44+
45+
.box-shadow {
46+
box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05);
47+
}
48+
49+
button.accept-policy {
50+
font-size: 1rem;
51+
line-height: inherit;
52+
}
53+
54+
/* Sticky footer styles
55+
-------------------------------------------------- */
56+
html {
57+
position: relative;
58+
min-height: 100%;
59+
}
60+
61+
body {
62+
/* Margin bottom by footer height */
63+
margin-bottom: 60px;
64+
}
65+
.footer {
66+
position: absolute;
67+
bottom: 0;
68+
width: 100%;
69+
white-space: nowrap;
70+
line-height: 60px; /* Vertically center the text there */
71+
}

‎src/ProjectTemplates/test/MvcTemplateTest.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ public ITestOutputHelper Output
4545

4646
private async Task MvcTemplateCore(string languageOverride)
4747
{
48-
// Additional arguments are needed. See: https://github.com/dotnet/aspnetcore/issues/24278
49-
Environment.SetEnvironmentVariable("EnableDefaultScopedCssItems", "true");
50-
5148
var project = await ProjectFactory.GetOrCreateProject("mvcnoauth" + (languageOverride == "F#" ? "fsharp" : "csharp"), Output);
5249

5350
var createResult = await project.RunDotNetNewAsync("mvc", language: languageOverride);
@@ -124,9 +121,6 @@ private async Task MvcTemplateCore(string languageOverride)
124121
[SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
125122
public async Task MvcTemplate_IndividualAuth(bool useLocalDB)
126123
{
127-
// Additional arguments are needed. See: https://github.com/dotnet/aspnetcore/issues/24278
128-
Environment.SetEnvironmentVariable("EnableDefaultScopedCssItems", "true");
129-
130124
var project = await ProjectFactory.GetOrCreateProject("mvcindividual" + (useLocalDB ? "uld" : ""), Output);
131125

132126
var createResult = await project.RunDotNetNewAsync("mvc", auth: "Individual", useLocalDB: useLocalDB);

‎src/ProjectTemplates/test/template-baselines.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,6 @@
484484
"Views/Home/Privacy.cshtml",
485485
"Views/Shared/Error.cshtml",
486486
"Views/Shared/_Layout.cshtml",
487-
"Views/Shared/_Layout.cshtml.css",
488487
"Views/Shared/_LoginPartial.cshtml",
489488
"Views/Shared/_ValidationScriptsPartial.cshtml",
490489
"wwwroot/favicon.ico",
@@ -543,7 +542,6 @@
543542
"Views/Home/Privacy.cshtml",
544543
"Views/Shared/Error.cshtml",
545544
"Views/Shared/_Layout.cshtml",
546-
"Views/Shared/_Layout.cshtml.css",
547545
"Views/Shared/_ValidationScriptsPartial.cshtml",
548546
"wwwroot/favicon.ico",
549547
"wwwroot/css/site.css",
@@ -601,7 +599,6 @@
601599
"Views/Home/Privacy.cshtml",
602600
"Views/Shared/Error.cshtml",
603601
"Views/Shared/_Layout.cshtml",
604-
"Views/Shared/_Layout.cshtml.css",
605602
"Views/Shared/_LoginPartial.cshtml",
606603
"Views/Shared/_ValidationScriptsPartial.cshtml",
607604
"wwwroot/favicon.ico",
@@ -660,7 +657,6 @@
660657
"Views/Home/Privacy.cshtml",
661658
"Views/Shared/Error.cshtml",
662659
"Views/Shared/_Layout.cshtml",
663-
"Views/Shared/_Layout.cshtml.css",
664660
"Views/Shared/_LoginPartial.cshtml",
665661
"Views/Shared/_ValidationScriptsPartial.cshtml",
666662
"wwwroot/favicon.ico",
@@ -719,7 +715,6 @@
719715
"Views/Home/Privacy.cshtml",
720716
"Views/Shared/Error.cshtml",
721717
"Views/Shared/_Layout.cshtml",
722-
"Views/Shared/_Layout.cshtml.css",
723718
"Views/Shared/_ValidationScriptsPartial.cshtml",
724719
"wwwroot/favicon.ico",
725720
"wwwroot/css/site.css",
@@ -777,7 +772,6 @@
777772
"Views/Home/Privacy.cshtml",
778773
"Views/Shared/Error.cshtml",
779774
"Views/Shared/_Layout.cshtml",
780-
"Views/Shared/_Layout.cshtml.css",
781775
"Views/Shared/_LoginPartial.cshtml",
782776
"Views/Shared/_ValidationScriptsPartial.cshtml",
783777
"wwwroot/favicon.ico",
@@ -836,7 +830,6 @@
836830
"Views/Home/Privacy.cshtml",
837831
"Views/Shared/Error.cshtml",
838832
"Views/Shared/_Layout.cshtml",
839-
"Views/Shared/_Layout.cshtml.css",
840833
"Views/Shared/_ValidationScriptsPartial.cshtml",
841834
"wwwroot/favicon.ico",
842835
"wwwroot/css/site.css",

0 commit comments

Comments
 (0)