Merge pull request #48431 from sftim/20241019_align_deprecation_warnings_docsy

Tweak deprecation warnings to align with Docsy
pull/49626/merge
Kubernetes Prow Robot 2025-02-20 05:14:27 -08:00 committed by GitHub
commit d79daa2eac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 49 additions and 43 deletions

View File

@ -1183,38 +1183,27 @@ body.cid-community #cncf-code-of-conduct h2:after {
} }
} }
#caseStudies body > #deprecation-warning, body.cid-casestudies > #deprecation-warning, body.cid-community > #deprecation-warning { body.cid-casestudies, body.cid-community, body.cid-partners {
display: inline-block; section#deprecation-warning {
vertical-align: top;
position: relative;
background-color: $primary;
color: #fff;
padding: 0; padding: 0;
margin: 0; margin: 0;
width: 100%; width: 100%;
border-top: solid 1em $primary;
border-bottom: solid 1em $primary;
// Center the pageinfo
padding-left: calc(max(1rem, (100vw - 60rem) / 2));
padding-right: calc(max(1rem, (100vw - 60rem) / 2));
}
/* Ensure color overrides */
section#deprecation-warning, section#deprecation-warning > .pageinfo.deprecation-warning {
background-color: $primary;
color: #fff;
}
} }
#caseStudies body > #deprecation-warning, body.cid-casestudies > #deprecation-warning {
padding-top: 32px;
}
body.cid-partners { body.cid-partners {
> #deprecation-warning {
padding: 0;
margin-right: 0;
margin-left: 0;
margin-top: 0;
width: 100vw;
> .content {
width: 100%;
max-width: initial;
margin-right: 0;
margin-left: 0;
margin-top: 0;
padding-left: 5vw;
padding-right: 5vw;
padding-top: 2rem;
padding-bottom: 2rem;
}
}
/* SECTIONS */ /* SECTIONS */
.section { .section {
clear: both; clear: both;

View File

@ -450,6 +450,9 @@ other = "Options"
[outdated_blog__message] [outdated_blog__message]
other = "This article is more than one year old. Older articles may contain outdated content. Check that the information in the page has not become incorrect since its publication." other = "This article is more than one year old. Older articles may contain outdated content. Check that the information in the page has not become incorrect since its publication."
[page_deprecated]
other = "(stale page)"
[patch_release] [patch_release]
other = "Patch Release" other = "Patch Release"

View File

@ -25,15 +25,15 @@
</section> </section>
{{ block "post-hero" . }} {{ block "post-hero" . }}
</header> </header>
{{ block "deprecated" . }}
{{ if or .IsHome ( eq .Params.cid "partners" ) ( eq .Params.cid "community" ) }}
{{ partial "deprecation-warning.html" . }}
{{ end }}
{{ end }}
{{ end }} {{ end }}
{{ end }} {{ end }}
<div class="td-outer"> <div class="td-outer">
<main role="main" class="td-main" {{ if (or (ne .FirstSection "case-studies") (not .IsSection) ) }}data-pagefind-body{{ end }}> <main role="main" class="td-main" {{ if (or (ne .FirstSection "case-studies") (not .IsSection) ) }}data-pagefind-body{{ end }}>
{{ block "deprecation_warning" . }}
{{ if or .IsHome ( eq .Params.cid "partners" ) ( eq .Params.cid "community" ) }}
{{ partial "deprecation-warning.html" . }}
{{ end }}
{{ end }}
{{ block "main" . }}{{ end }} {{ block "main" . }}{{ end }}
</main> </main>
</div> </div>

View File

@ -37,6 +37,9 @@
RSS <i class="fa-solid fa-rss ml-2 "></i> RSS <i class="fa-solid fa-rss ml-2 "></i>
</a> </a>
{{ end -}} {{ end -}}
{{ block "deprecation_warning" . }}
{{ partial "deprecation-warning.html" . }}
{{ end }}
{{ block "main" . }}{{ end }} {{ block "main" . }}{{ end }}
</main> </main>
<div class="d-none d-xl-block col-xl-2 td-toc d-print-none"> <div class="d-none d-xl-block col-xl-2 td-toc d-print-none">

View File

@ -12,7 +12,6 @@ have blog posts -->
{{ $pageGroups := $pag.PageGroups}} {{ $pageGroups := $pag.PageGroups}}
{{ if eq $pag.PageNumber 1 }} {{ if eq $pag.PageNumber 1 }}
{{ end }} {{ end }}
{{ partial "deprecation-warning.html" . }}
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
{{ range $pageGroups }} {{ range $pageGroups }}

View File

@ -1,4 +0,0 @@
{{ define "main" }}
{{ partial "deprecation-warning.html" . }}
{{ .Render "content" }}
{{ end }}

View File

@ -9,7 +9,6 @@
{{ end }} {{ end }}
{{ end }} {{ end }}
{{ $featured := (where $pages "Params.featured" true).ByWeight | first 4 }} {{ $featured := (where $pages "Params.featured" true).ByWeight | first 4 }}
{{ partial "deprecation-warning.html" . }}
<section id="case-studies"> <section id="case-studies">
<h2>{{ .Title }}</h2> <h2>{{ .Title }}</h2>
<div class="case-studies"> <div class="case-studies">

View File

@ -0,0 +1,18 @@
<!DOCTYPE html>
<html id="{{ .Params.cid }}" lang="{{ .Language }}" class="{{ .Params.class }}">
<head>
{{ partial "head.html" . }}
</head>
<body{{ with .Page.Params.body_class }} class="{{ . }}"{{ end }}>
{{ partial "navbar.html" . }}
{{ block "deprecation_warning.html" . }}
{{ partial "deprecation-warning.html" . }}
{{ end }}
<div data-pagefind-body>
{{ block "main" . }}{{ end }}
</div>
{{ partialCached "footer.html" . }}
{{ partialCached "scripts.html" . }}
</body>
</html>

View File

@ -24,6 +24,9 @@
<!--main class="col-12 col-md-9 col-xl-8 pl-md-5" role="main"--> <!--main class="col-12 col-md-9 col-xl-8 pl-md-5" role="main"-->
<main role="main" class="col-xl-8" {{ if ne .Params.cid "docsHome" }}data-pagefind-body{{ end }}{{ if (and .IsPage .Params.description ) }} data-pagefind-meta="description:{{ .Params.description }}"{{ end }}> <main role="main" class="col-xl-8" {{ if ne .Params.cid "docsHome" }}data-pagefind-body{{ end }}{{ if (and .IsPage .Params.description ) }} data-pagefind-meta="description:{{ .Params.description }}"{{ end }}>
{{ if not .Site.Params.ui.breadcrumb_disable }}{{ partial "breadcrumb.html" . }}{{ end }} {{ if not .Site.Params.ui.breadcrumb_disable }}{{ partial "breadcrumb.html" . }}{{ end }}
{{ block "deprecation_warning" . }}
{{ partial "deprecation-warning.html" . }}
{{ end }}
{{ block "outdated_content" . }} {{ block "outdated_content" . }}
{{ partial "docs/outdated_content.html" . }} {{ partial "docs/outdated_content.html" . }}
{{ end }} {{ end }}

View File

@ -3,7 +3,6 @@
{{ end }} {{ end }}
{{ define "main" }} {{ define "main" }}
{{ partial "deprecation-warning.html" . }}
<h1>{{ .Title }}</h1> <h1>{{ .Title }}</h1>
<p>{{ T "layouts_docs_glossary_description" }}</p> <p>{{ T "layouts_docs_glossary_description" }}</p>
<div id="tag-container"> <div id="tag-container">

View File

@ -6,7 +6,6 @@
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
<div class="td-content"> <div class="td-content">
{{- partial "deprecation-warning.html" . -}}
{{ $hasContent := false }} {{ $hasContent := false }}
{{ with .File }} {{ with .File }}
{{ if ne .Filename "" }} {{ if ne .Filename "" }}

View File

@ -2,12 +2,11 @@
{{ if not .Site.Params.deprecated }} {{ if not .Site.Params.deprecated }}
{{ .Content }} {{ .Content }}
{{ else }} {{ else }}
{{ partial "deprecation-warning.html" . }}
<div class="section-index"> <div class="section-index">
{{ range where .Site.Pages "Section" "releases" }} {{ range where .Site.Pages "Section" "releases" }}
{{ if not .IsNode }} {{ if not .IsNode }}
<div class="entry"> <div class="entry">
<h5><a href="{{ .RelPermalink }}">{{ .Title }}</a></h5> <h5><a href="{{ .RelPermalink }}">{{ .Title }}</a> {{ T "page_deprecated" }}</h5>
</div> </div>
{{ end }} {{ end }}
{{ end }} {{ end }}

View File

@ -1,5 +1,4 @@
{{ define "main" }} {{ define "main" }}
{{ partial "deprecation-warning.html" . }}
<div class="td-content"> <div class="td-content">
{{- if .HasShortcode "kat-button" -}} {{- if .HasShortcode "kat-button" -}}
<div class="pageinfo pageinfo-secondary"> <div class="pageinfo pageinfo-secondary">