From 66fd4be4d7f1635368c4386f432daa7a22363d58 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Tue, 21 May 2019 11:22:21 -0700 Subject: [PATCH] Accessibility (#10247) Template Accessibility --- .../UI/src/wwwroot/V4/Identity/css/site.css | 19 +++++++++++++++++-- .../Pages/_Host.cshtml | 2 +- .../Pages/Shared/_Layout.cshtml | 2 +- .../RazorPagesWeb-CSharp/wwwroot/css/site.css | 12 ++++++++++++ .../Views/Shared/_Layout.cshtml | 2 +- .../StarterWeb-CSharp/wwwroot/css/site.css | 12 ++++++++++++ .../StarterWeb-FSharp/wwwroot/css/site.css | 13 +++++++++++++ .../Angular-CSharp/ClientApp/src/styles.css | 15 +++++++++++++++ .../React-CSharp/ClientApp/scss/custom.scss | 0 .../content/React-CSharp/ClientApp/src/App.js | 2 ++ .../React-CSharp/ClientApp/src/custom.css | 14 ++++++++++++++ .../scripts/Test-Template.ps1 | 8 +++++++- .../test/template-baselines.json | 2 +- 13 files changed, 96 insertions(+), 7 deletions(-) delete mode 100644 src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/scss/custom.scss create mode 100644 src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/src/custom.css diff --git a/src/Identity/UI/src/wwwroot/V4/Identity/css/site.css b/src/Identity/UI/src/wwwroot/V4/Identity/css/site.css index e1ca50bc9f..52889ec4d5 100644 --- a/src/Identity/UI/src/wwwroot/V4/Identity/css/site.css +++ b/src/Identity/UI/src/wwwroot/V4/Identity/css/site.css @@ -7,6 +7,23 @@ a.navbar-brand { 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 { @@ -59,7 +76,5 @@ body { width: 100%; overflow: scroll; white-space: nowrap; - /* Set the fixed height of the footer here */ - height: 60px; line-height: 60px; /* Vertically center the text there */ } diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Pages/_Host.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Pages/_Host.cshtml index fc23391b1d..66a7aa0628 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Pages/_Host.cshtml +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Pages/_Host.cshtml @@ -3,7 +3,7 @@ @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers - + diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml index 0706f9911b..5506d943d3 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/Pages/Shared/_Layout.cshtml @@ -1,5 +1,5 @@  - + diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/css/site.css b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/css/site.css index e60e0d5caf..e679a8ea7f 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/css/site.css +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/wwwroot/css/site.css @@ -12,6 +12,18 @@ 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 { 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 fb908db5ec..b370df12dd 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 @@ -1,5 +1,5 @@  - + 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 e60e0d5caf..e679a8ea7f 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 @@ -12,6 +12,18 @@ 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 { 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 631a0eba10..e679a8ea7f 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 @@ -7,10 +7,23 @@ a.navbar-brand { 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 { diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/styles.css b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/styles.css index 90d4ee0072..3ebae31331 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/styles.css +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/src/styles.css @@ -1 +1,16 @@ /* You can add global styles to this file, and also import other style files */ + +/* Provide sufficient contrast against white background */ +a { + color: #0366d6; +} + +code { + color: #E01A76; +} + +.btn-primary { + color: #fff; + background-color: #1b6ec2; + border-color: #1861ac; +} diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/scss/custom.scss b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/scss/custom.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/src/App.js b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/src/App.js index b55d0317fe..f0bcaf3200 100644 --- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/src/App.js +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/src/App.js @@ -10,6 +10,8 @@ import ApiAuthorizationRoutes from './components/api-authorization/ApiAuthorizat import { ApplicationPaths } from './components/api-authorization/ApiAuthorizationConstants'; ////#endif +import './custom.css' + export default class App extends Component { static displayName = App.name; diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/src/custom.css b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/src/custom.css new file mode 100644 index 0000000000..5fdfd061c3 --- /dev/null +++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/src/custom.css @@ -0,0 +1,14 @@ +/* Provide sufficient contrast against white background */ +a { + color: #0366d6; +} + +code { + color: #E01A76; +} + +.btn-primary { + color: #fff; + background-color: #1b6ec2; + border-color: #1861ac; +} diff --git a/src/ProjectTemplates/scripts/Test-Template.ps1 b/src/ProjectTemplates/scripts/Test-Template.ps1 index 36bdefa1da..af199993f8 100644 --- a/src/ProjectTemplates/scripts/Test-Template.ps1 +++ b/src/ProjectTemplates/scripts/Test-Template.ps1 @@ -7,7 +7,13 @@ $ErrorActionPreference = 'Stop' function Test-Template($templateName, $templateArgs, $templateNupkg, $isSPA) { $tmpDir = "$PSScriptRoot/$templateName" Remove-Item -Path $tmpDir -Recurse -ErrorAction Ignore - dotnet pack + Push-Location .. + try { + dotnet pack + } + finally { + Pop-Location + } Run-DotnetNew "--install", "$PSScriptRoot/../../../artifacts/packages/Debug/Shipping/$templateNupkg" diff --git a/src/ProjectTemplates/test/template-baselines.json b/src/ProjectTemplates/test/template-baselines.json index 92935f791d..e9a93ffe8a 100644 --- a/src/ProjectTemplates/test/template-baselines.json +++ b/src/ProjectTemplates/test/template-baselines.json @@ -1005,13 +1005,13 @@ "ClientApp/public/favicon.ico", "ClientApp/public/index.html", "ClientApp/public/manifest.json", - "ClientApp/scss/custom.scss", "ClientApp/src/components/Counter.js", "ClientApp/src/components/FetchData.js", "ClientApp/src/components/Home.js", "ClientApp/src/components/Layout.js", "ClientApp/src/components/NavMenu.css", "ClientApp/src/components/NavMenu.js", + "ClientApp/src/custom.css", "ClientApp/src/App.js", "ClientApp/src/App.test.js", "ClientApp/src/index.js",