From 6a4238aa718e3f3fb466821bfcd8fbe55c6fb572 Mon Sep 17 00:00:00 2001 From: Chaitanya Date: Sun, 27 Oct 2019 17:13:24 +0530 Subject: [PATCH] Accessibility updates - main landmark roles (#17106) * Removed multiple main tags from home page Signed-off-by: chaitanyakaranam * Removed multiple occurances of main in case-studies page Signed-off-by: chaitanyakaranam * Replaced css for main tag with .main-section class Signed-off-by: ChaitanyaKaranam * Added main landmark role for all the pages Signed-off-by: ChaitanyaKaranam * Force checks. request-checks: true --- assets/sass/_base.sass | 16 +++---- assets/sass/_desktop.sass | 8 ++-- assets/sass/_size.sass | 4 +- assets/sass/_tablet.sass | 2 +- content/en/partners/_index.html | 2 +- layouts/_default/baseof.html | 14 ++++--- layouts/blog/baseof.html | 42 ++++++++++--------- layouts/case-studies/list.html | 12 +++--- layouts/docs/baseof.html | 22 +++++----- layouts/index.html | 8 ++-- layouts/partials/footer.html | 4 +- layouts/partials/header.html | 42 +++++++++---------- layouts/shortcodes/blocks/case-studies.html | 4 +- layouts/shortcodes/blocks/feature.html | 4 +- .../blocks/kubernetes-features.html | 4 +- static/css/gridpage.css | 24 +++++------ 16 files changed, 109 insertions(+), 103 deletions(-) diff --git a/assets/sass/_base.sass b/assets/sass/_base.sass index 1ccd4feae3..2a0d6a2696 100644 --- a/assets/sass/_base.sass +++ b/assets/sass/_base.sass @@ -70,7 +70,7 @@ section background-color: white section, header, footer - main + .main-section position: relative margin: auto @@ -249,7 +249,7 @@ header color: $blue font-weight: normal - main + .main-section white-space: nowrap overflow: hidden clear: both @@ -439,7 +439,7 @@ footer background-image: url(/images/texture.png) background-color: $dark-grey - main + .main-section padding: 20px 0 nav @@ -1121,7 +1121,7 @@ $feature-box-div-margin-bottom: 40px margin-bottom: 0 padding-bottom: 1px - main + .main-section padding: 0 10px margin-bottom: 30px @@ -1147,7 +1147,7 @@ $feature-box-div-margin-bottom: 40px a color: $blue - main + .main-section margin-bottom: $ocean-nodes-padding-Y min-height: 160px @@ -1160,7 +1160,7 @@ $feature-box-div-margin-bottom: 40px width: 100% max-width: 160px - main:first-child + .main-section:first-child .image-wrapper max-width: 100% @@ -1356,7 +1356,7 @@ $feature-box-div-margin-bottom: 40px #mainContent padding: 20px 0 - main + .main-section max-width: none a @@ -1775,7 +1775,7 @@ $feature-box-div-margin-bottom: 40px #home #talkToUs - main + .main-section padding: 30px 0 h5 diff --git a/assets/sass/_desktop.sass b/assets/sass/_desktop.sass index b1c292557b..c8f7f44f84 100644 --- a/assets/sass/_desktop.sass +++ b/assets/sass/_desktop.sass @@ -95,7 +95,7 @@ $video-section-height: 550px right: -25px section, header, footer - main + .main-section max-width: $main-max-width header, #vendorStrip, #encyclopedia, #hero h1, #hero h5, #docs #hero h1, #docs #hero h5, @@ -108,11 +108,11 @@ $video-section-height: 550px #home section, header, footer - main + .main-section max-width: 1000px #oceanNodes - main + .main-section position: relative max-width: 830px @@ -172,7 +172,7 @@ $video-section-height: 550px background-image: url(../images/texture.png) background-color: $dark-grey - main + .main-section padding: 20px 0 nav diff --git a/assets/sass/_size.sass b/assets/sass/_size.sass index 76a2771fa7..470a2f5765 100644 --- a/assets/sass/_size.sass +++ b/assets/sass/_size.sass @@ -26,7 +26,7 @@ section, header, #vendorStrip padding-left: $full-width-paddingX padding-right: $full-width-paddingX - main + .main-section width: $main-width max-width: $main-max-width @@ -59,7 +59,7 @@ header .nav-box + .nav-box margin-left: $nav-box-sibling-margin-left - main + main + .main-secton + .main-section margin-top: $main-nav-main-sibling-margin-top .left .button diff --git a/assets/sass/_tablet.sass b/assets/sass/_tablet.sass index 4434ed5b82..96b24322a2 100644 --- a/assets/sass/_tablet.sass +++ b/assets/sass/_tablet.sass @@ -116,7 +116,7 @@ $feature-box-div-width: 45% text-align: left margin-bottom: 18px - main + main, .main-section position: relative clear: both display: table diff --git a/content/en/partners/_index.html b/content/en/partners/_index.html index a3da8daa57..3e76bffbc6 100644 --- a/content/en/partners/_index.html +++ b/content/en/partners/_index.html @@ -7,7 +7,7 @@ cid: partners ---
-
+
Kubernetes works with partners to create a strong, vibrant codebase that supports a spectrum of complementary platforms.
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 440655af41..d23a1141a3 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -8,20 +8,22 @@ {{ block "hero" . }}
-
+

{{ block "hero-title" . }}{{ .Params.bigheader | default .Title }}{{ end }}

{{ .Params.abstract }}
{{ block "hero-more" . }}{{ end }} -
+
{{ block "post-hero" . }}{{ end }} {{ end }} - -
- {{ block "main" . }}{{ end }} -
+ +
+
+ {{ block "main" . }}{{ end }} +
+
{{ partialCached "footer.html" . }} {{ partialCached "footer-scripts.html" . }} diff --git a/layouts/blog/baseof.html b/layouts/blog/baseof.html index 85095f152c..c774f688f6 100644 --- a/layouts/blog/baseof.html +++ b/layouts/blog/baseof.html @@ -11,29 +11,31 @@

{{ .Title }}

-
-
-
- {{ block "main" . }}{{ end }} -
-
-
- {{ with site.Home.OutputFormats.Get "rss" -}} - -
RSS Feed
 - {{ end -}} -
Submit a Post
 -
@Kubernetesio
 -
on GitHub
-
#kubernetes-users
-
Overflow
 -
Forum
-
Kubernetes
 +
+
+
+
+ {{ block "main" . }}{{ end }} +
+
+
+ {{ with site.Home.OutputFormats.Get "rss" -}} + +
RSS Feed
 + {{ end -}} +
Submit a Post
 +
@Kubernetesio
 +
on GitHub
+
#kubernetes-users
+
Overflow
 +
Forum
+
Kubernetes
 +
+ {{ partialCached "blog/archive.html" . }}
- {{ partialCached "blog/archive.html" . }}
-
+ {{ partialCached "footer.html" . }} {{ partialCached "footer-scripts.html" . }} diff --git a/layouts/case-studies/list.html b/layouts/case-studies/list.html index 1dbd6351a4..f8e723c819 100644 --- a/layouts/case-studies/list.html +++ b/layouts/case-studies/list.html @@ -10,7 +10,7 @@ {{ end }} {{ $featured := (where $pages "Params.featured" true).ByWeight | first 4 }}
-
+
{{ range $featured }} @@ -18,13 +18,13 @@ {{ end }}
-
+
{{ $featuredVideos := where .Pages ".Params.video" "!=" nil }} {{ with $featuredVideos }} {{ with index $featuredVideos 0 }}
-
+

"{{ .Params.quote | html }}"

{{ $img := .Resources.GetMatch "video.png" }} @@ -32,7 +32,7 @@ {{ with $small }}{{ .Title }}{{ end }}
-
+
@@ -41,7 +41,7 @@ {{ end }} {{ end }}
-
+

{{ .Title }}

{{ range $pages.ByTitle }} @@ -60,7 +60,7 @@ {{ end }} {{ T
-
+
{{ .Content }} {{ end }} diff --git a/layouts/docs/baseof.html b/layouts/docs/baseof.html index 11342585f1..cb3071f5f5 100644 --- a/layouts/docs/baseof.html +++ b/layouts/docs/baseof.html @@ -13,16 +13,18 @@ {{ end }} {{ block "announcement" . }}{{ partial "announcement.html" . }}{{ end }} {{ block "deprecation" . }}{{ partial "deprecation-warning.html" . }}{{ end }} -
- {{ block "side-menu" . }}{{ end }} -
- {{ block "content" . }}{{ end }} - - {{ partial "feedback.html" . }} - - {{ partial "git-info.html" . }} -
-
+
+
+ {{ block "side-menu" . }}{{ end }} +
+ {{ block "content" . }}{{ end }} + + {{ partial "feedback.html" . }} + + {{ partial "git-info.html" . }} +
+
+
{{ partialCached "footer.html" . }} {{ partialCached "footer-scripts.html" . }}