diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml index 79f34bc21167..560ffb88ce24 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml @@ -6,7 +6,6 @@ @ViewData["Title"] - Company.WebApplication1 -
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml.css b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml.css deleted file mode 100644 index 557867a54f99..000000000000 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/_Layout.cshtml.css +++ /dev/null @@ -1,51 +0,0 @@ -/* 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 */ -} \ No newline at end of file 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 index 3b1e20a04d53..e679a8ea7fb5 100644 --- 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,21 +1,71 @@ +/* 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) { - html { - font-size: 16px; - } - } - - /* Sticky footer styles - -------------------------------------------------- */ + font-size: 14px; +} +@media (min-width: 768px) { html { - position: relative; - min-height: 100%; + font-size: 16px; } - - body { - /* Margin bottom by footer height */ - margin-bottom: 60px; - } - \ No newline at end of file +} + +.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 */ +} diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_Layout.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_Layout.cshtml index 00e46209a640..b326cdff079a 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_Layout.cshtml +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_Layout.cshtml @@ -7,7 +7,6 @@ -
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_Layout.cshtml.css b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_Layout.cshtml.css deleted file mode 100644 index 08f5018416a9..000000000000 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/Views/Shared/_Layout.cshtml.css +++ /dev/null @@ -1,52 +0,0 @@ -/* 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 */ - } - \ No newline at end of file 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 index 3b1e20a04d53..e679a8ea7fb5 100644 --- 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,21 +1,71 @@ +/* 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) { - html { - font-size: 16px; - } - } - - /* Sticky footer styles - -------------------------------------------------- */ + font-size: 14px; +} +@media (min-width: 768px) { html { - position: relative; - min-height: 100%; + font-size: 16px; } - - body { - /* Margin bottom by footer height */ - margin-bottom: 60px; - } - \ No newline at end of file +} + +.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 */ +} diff --git a/src/ProjectTemplates/test/MvcTemplateTest.cs b/src/ProjectTemplates/test/MvcTemplateTest.cs index a10f67180af7..1718059effa9 100644 --- a/src/ProjectTemplates/test/MvcTemplateTest.cs +++ b/src/ProjectTemplates/test/MvcTemplateTest.cs @@ -45,9 +45,6 @@ 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); @@ -124,9 +121,6 @@ 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 index 100b5a1f6be4..9e36b3eed22e 100644 --- a/src/ProjectTemplates/test/template-baselines.json +++ b/src/ProjectTemplates/test/template-baselines.json @@ -484,7 +484,6 @@ "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", @@ -543,7 +542,6 @@ "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", @@ -601,7 +599,6 @@ "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", @@ -660,7 +657,6 @@ "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", @@ -719,7 +715,6 @@ "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", @@ -777,7 +772,6 @@ "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", @@ -836,7 +830,6 @@ "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",