Fix generated CSS scopes in layout views and update templates (#31257)

* Fix generated CSS scopes in layout views and update templates * Update template baselines * Enabled scoped CSS for MVC template tests * Bring back static CSS file
dotnet · Mar 30, 2021 · f45fc3e · f45fc3e
1 parent f32b525
commit f45fc3e
Show file tree

Hide file tree

Showing 12 changed files with 307 additions and 137 deletions.
diff --git a/...ojectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml b/...ojectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml
@@ -6,6 +6,7 @@
     <title>@ViewData["Title"] - Company.WebApplication1</title>
     <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
     <link rel="stylesheet" href="~/css/site.css" />
+    <link rel="stylesheet" href="~/Company.WebApplication1.styles.css" />
 </head>
 <body>
     <header>

diff --git a/...tTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml.css b/...tTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml.css
@@ -0,0 +1,51 @@
+/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification
+for details on configuring this project to bundle and minify static web assets. */
+
+a.navbar-brand {
+  white-space: normal;
+  text-align: center;
+  word-break: break-all;
+}
+
+/* Provide sufficient contrast against white background */
+a {
+  color: #0366d6;
+}
+
+.btn-primary {
+  color: #fff;
+  background-color: #1b6ec2;
+  border-color: #1861ac;
+}
+
+.nav-pills .nav-link.active, .nav-pills .show > .nav-link {
+  color: #fff;
+  background-color: #1b6ec2;
+  border-color: #1861ac;
+}
+
+.border-top {
+  border-top: 1px solid #e5e5e5;
+}
+.border-bottom {
+  border-bottom: 1px solid #e5e5e5;
+}
+
+.box-shadow {
+  box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05);
+}
+
+button.accept-policy {
+  font-size: 1rem;
+  line-height: inherit;
+}
+
+/* Sticky footer styles
+-------------------------------------------------- */
+.footer {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  white-space: nowrap;
+  line-height: 60px; /* Vertically center the text there */
+}
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/css/site.css b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/wwwroot/css/site.css
@@ -1,71 +1,21 @@
-/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification
-for details on configuring this project to bundle and minify static web assets. */
-
-a.navbar-brand {
-  white-space: normal;
-  text-align: center;
-  word-break: break-all;
-}
-
-/* Provide sufficient contrast against white background */
-a {
-  color: #0366d6;
-}
-
-.btn-primary {
-  color: #fff;
-  background-color: #1b6ec2;
-  border-color: #1861ac;
-}
-
-.nav-pills .nav-link.active, .nav-pills .show > .nav-link {
-  color: #fff;
-  background-color: #1b6ec2;
-  border-color: #1861ac;
-}
-
-/* Sticky footer styles
--------------------------------------------------- */
 html {
-  font-size: 14px;
-}
-@media (min-width: 768px) {
+    font-size: 14px;
+  }
+  @media (min-width: 768px) {
+    html {
+      font-size: 16px;
+    }
+  }
+
+  /* Sticky footer styles
+  -------------------------------------------------- */
   html {
-    font-size: 16px;
+    position: relative;
+    min-height: 100%;
   }
-}
-
-.border-top {
-  border-top: 1px solid #e5e5e5;
-}
-.border-bottom {
-  border-bottom: 1px solid #e5e5e5;
-}
-
-.box-shadow {
-  box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05);
-}
-
-button.accept-policy {
-  font-size: 1rem;
-  line-height: inherit;
-}
-
-/* Sticky footer styles
--------------------------------------------------- */
-html {
-  position: relative;
-  min-height: 100%;
-}
-
-body {
-  /* Margin bottom by footer height */
-  margin-bottom: 60px;
-}
-.footer {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  white-space: nowrap;
-  line-height: 60px; /* Vertically center the text there */
-}
+
+  body {
+    /* Margin bottom by footer height */
+    margin-bottom: 60px;
+  }
+
diff --git a/...ojectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_Layout.cshtml b/...ojectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_Layout.cshtml
@@ -7,6 +7,7 @@
 
     <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
     <link rel="stylesheet" href="~/css/site.css" />
+    <link rel="stylesheet" href="~/Company.WebApplication1.css" />
 </head>
 <body>
     <header>

diff --git a/...tTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_Layout.cshtml.css b/...tTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_Layout.cshtml.css
@@ -0,0 +1,52 @@
+/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification
+for details on configuring this project to bundle and minify static web assets. */
+
+a.navbar-brand {
+    white-space: normal;
+    text-align: center;
+    word-break: break-all;
+  }
+
+  /* Provide sufficient contrast against white background */
+  a {
+    color: #0366d6;
+  }
+
+  .btn-primary {
+    color: #fff;
+    background-color: #1b6ec2;
+    border-color: #1861ac;
+  }
+
+  .nav-pills .nav-link.active, .nav-pills .show > .nav-link {
+    color: #fff;
+    background-color: #1b6ec2;
+    border-color: #1861ac;
+  }
+
+  .border-top {
+    border-top: 1px solid #e5e5e5;
+  }
+  .border-bottom {
+    border-bottom: 1px solid #e5e5e5;
+  }
+
+  .box-shadow {
+    box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05);
+  }
+
+  button.accept-policy {
+    font-size: 1rem;
+    line-height: inherit;
+  }
+
+  /* Sticky footer styles
+  -------------------------------------------------- */
+  .footer {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    white-space: nowrap;
+    line-height: 60px; /* Vertically center the text there */
+  }
+
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/css/site.css b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/wwwroot/css/site.css
@@ -1,71 +1,21 @@
-/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification
-for details on configuring this project to bundle and minify static web assets. */
-
-a.navbar-brand {
-  white-space: normal;
-  text-align: center;
-  word-break: break-all;
-}
-
-/* Provide sufficient contrast against white background */
-a {
-  color: #0366d6;
-}
-
-.btn-primary {
-  color: #fff;
-  background-color: #1b6ec2;
-  border-color: #1861ac;
-}
-
-.nav-pills .nav-link.active, .nav-pills .show > .nav-link {
-  color: #fff;
-  background-color: #1b6ec2;
-  border-color: #1861ac;
-}
-
-/* Sticky footer styles
--------------------------------------------------- */
 html {
-  font-size: 14px;
-}
-@media (min-width: 768px) {
+    font-size: 14px;
+  }
+  @media (min-width: 768px) {
+    html {
+      font-size: 16px;
+    }
+  }
+
+  /* Sticky footer styles
+  -------------------------------------------------- */
   html {
-    font-size: 16px;
+    position: relative;
+    min-height: 100%;
   }
-}
-
-.border-top {
-  border-top: 1px solid #e5e5e5;
-}
-.border-bottom {
-  border-bottom: 1px solid #e5e5e5;
-}
-
-.box-shadow {
-  box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05);
-}
-
-button.accept-policy {
-  font-size: 1rem;
-  line-height: inherit;
-}
-
-/* Sticky footer styles
--------------------------------------------------- */
-html {
-  position: relative;
-  min-height: 100%;
-}
-
-body {
-  /* Margin bottom by footer height */
-  margin-bottom: 60px;
-}
-.footer {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  white-space: nowrap;
-  line-height: 60px; /* Vertically center the text there */
-}
+
+  body {
+    /* Margin bottom by footer height */
+    margin-bottom: 60px;
+  }
+
diff --git a/src/ProjectTemplates/test/MvcTemplateTest.cs b/src/ProjectTemplates/test/MvcTemplateTest.cs
@@ -45,6 +45,9 @@ public ITestOutputHelper Output
 
         private async Task MvcTemplateCore(string languageOverride)
         {
+            // Additional arguments are needed. See: https://github.com/dotnet/aspnetcore/issues/24278
+            Environment.SetEnvironmentVariable("EnableDefaultScopedCssItems", "true");
+
             var project = await ProjectFactory.GetOrCreateProject("mvcnoauth" + (languageOverride == "F#" ? "fsharp" : "csharp"), Output);
 
             var createResult = await project.RunDotNetNewAsync("mvc", language: languageOverride);
@@ -121,6 +124,9 @@ private async Task MvcTemplateCore(string languageOverride)
         [SkipOnHelix("Cert failure, https://github.com/dotnet/aspnetcore/issues/28090", Queues = "All.OSX;" + HelixConstants.Windows10Arm64 + HelixConstants.DebianArm64)]
         public async Task MvcTemplate_IndividualAuth(bool useLocalDB)
         {
+            // Additional arguments are needed. See: https://github.com/dotnet/aspnetcore/issues/24278
+            Environment.SetEnvironmentVariable("EnableDefaultScopedCssItems", "true");
+
             var project = await ProjectFactory.GetOrCreateProject("mvcindividual" + (useLocalDB ? "uld" : ""), Output);
 
             var createResult = await project.RunDotNetNewAsync("mvc", auth: "Individual", useLocalDB: useLocalDB);

diff --git a/src/ProjectTemplates/test/template-baselines.json b/src/ProjectTemplates/test/template-baselines.json
@@ -484,6 +484,7 @@
         "Views/Home/Privacy.cshtml",
         "Views/Shared/Error.cshtml",
         "Views/Shared/_Layout.cshtml",
+        "Views/Shared/_Layout.cshtml.css",
         "Views/Shared/_LoginPartial.cshtml",
         "Views/Shared/_ValidationScriptsPartial.cshtml",
         "wwwroot/favicon.ico",
@@ -542,6 +543,7 @@
         "Views/Home/Privacy.cshtml",
         "Views/Shared/Error.cshtml",
         "Views/Shared/_Layout.cshtml",
+        "Views/Shared/_Layout.cshtml.css",
         "Views/Shared/_ValidationScriptsPartial.cshtml",
         "wwwroot/favicon.ico",
         "wwwroot/css/site.css",
@@ -599,6 +601,7 @@
         "Views/Home/Privacy.cshtml",
         "Views/Shared/Error.cshtml",
         "Views/Shared/_Layout.cshtml",
+        "Views/Shared/_Layout.cshtml.css",
         "Views/Shared/_LoginPartial.cshtml",
         "Views/Shared/_ValidationScriptsPartial.cshtml",
         "wwwroot/favicon.ico",
@@ -657,6 +660,7 @@
         "Views/Home/Privacy.cshtml",
         "Views/Shared/Error.cshtml",
         "Views/Shared/_Layout.cshtml",
+        "Views/Shared/_Layout.cshtml.css",
         "Views/Shared/_LoginPartial.cshtml",
         "Views/Shared/_ValidationScriptsPartial.cshtml",
         "wwwroot/favicon.ico",
@@ -715,6 +719,7 @@
         "Views/Home/Privacy.cshtml",
         "Views/Shared/Error.cshtml",
         "Views/Shared/_Layout.cshtml",
+        "Views/Shared/_Layout.cshtml.css",
         "Views/Shared/_ValidationScriptsPartial.cshtml",
         "wwwroot/favicon.ico",
         "wwwroot/css/site.css",
@@ -772,6 +777,7 @@
         "Views/Home/Privacy.cshtml",
         "Views/Shared/Error.cshtml",
         "Views/Shared/_Layout.cshtml",
+        "Views/Shared/_Layout.cshtml.css",
         "Views/Shared/_LoginPartial.cshtml",
         "Views/Shared/_ValidationScriptsPartial.cshtml",
         "wwwroot/favicon.ico",
@@ -830,6 +836,7 @@
         "Views/Home/Privacy.cshtml",
         "Views/Shared/Error.cshtml",
         "Views/Shared/_Layout.cshtml",
+        "Views/Shared/_Layout.cshtml.css",
         "Views/Shared/_ValidationScriptsPartial.cshtml",
         "wwwroot/favicon.ico",
         "wwwroot/css/site.css",