Skip to content

Commit 00e20af

Browse files
authored
Merge pull request #26278 from notchairmk/fix_search_nav
Fix search input overlapping site nav
2 parents b19fbb6 + 9adf2c1 commit 00e20af

File tree

2 files changed

+39
-33
lines changed

2 files changed

+39
-33
lines changed

assets/scss/_base.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -810,6 +810,13 @@ section#cncf {
810810
}
811811
}
812812

813+
.td-search {
814+
header > .header-filler {
815+
height: $hero-padding-top;
816+
background-color: black;
817+
}
818+
}
819+
813820
// Docs specific
814821

815822
#editPageButton {

layouts/_default/search.html

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
<head>
44
{{ partial "head.html" . }}
55
</head>
6-
<body class="td-{{ .Kind }}{{- if ne .Params.cid "" -}}{{- printf " cid-%s" (lower .Params.cid) -}}{{- end -}}">
6+
<body class="td-search {{- if ne .Params.cid "" -}}{{- printf " cid-%s" (lower .Params.cid) -}}{{- end -}}">
77
<header>
88
{{ partial "navbar.html" . }}
9+
<div class="header-filler"></div>
910
</header>
1011
{{ block "announcement" . }}
1112
{{ if .IsHome }}
@@ -16,38 +17,36 @@
1617
{{ end }}
1718
<div class="td-outer">
1819
<main role="main" class="td-main">
19-
<section class="row td-search-result">
20-
<div class="col-12 col-md-4 offset-md-2">
21-
<form class="td-sidebar__search d-flex align-items-center">
22-
{{ partial "search-input.html" . }}
23-
<button class="btn btn-link td-sidebar__toggle d-md-none p-0 ml-3 fas fa-bars" type="button" data-toggle="collapse" data-target="#td-section-nav" aria-controls="td-docs-nav" aria-expanded="false" aria-label="Toggle section navigation">
24-
</button>
25-
</form>
26-
</div>
27-
<div class="col-12 col-md-8 offset-md-2">
28-
<h2 class="ml-4">{{ .Title }}</h2>
29-
{{ if .Site.Params.gcs_engine_id }}
30-
<script>
31-
(function() {
32-
var cx = '{{ . }}';
33-
var gcse = document.createElement('script');
34-
gcse.type = 'text/javascript';
35-
gcse.async = true;
36-
gcse.src = 'https://cse.google.com/cse.js?cx=' + cx;
37-
var s = document.getElementsByTagName('script')[0];
38-
s.parentNode.insertBefore(gcse, s);
39-
})();
40-
</script>
41-
<gcse:searchresults-only></gcse:searchresults-only>
42-
{{ else if .Site.Params.k8s_search }}
43-
<script src="{{ "js/search.js" | relURL }}"></script>
44-
<gcse:searchresults-only linktarget="_parent">
45-
<div id="bing-results-container">{{ T "layouts_docs_search_fetching" }}</div>
46-
<div id="bing-pagination-container"></div>
47-
</gcse:searchresults-only>
48-
{{ end }}
49-
</div>
50-
</section>
20+
<section class="row td-search-result">
21+
<div class="col-12 col-md-4 offset-md-2">
22+
<form class="td-sidebar__search d-flex align-items-center">
23+
{{ partial "search-input.html" . }}
24+
</form>
25+
</div>
26+
<div class="col-12 col-md-8 offset-md-2">
27+
<h2 class="ml-4">{{ .Title }}</h2>
28+
{{ if .Site.Params.gcs_engine_id }}
29+
<script>
30+
(function() {
31+
var cx = '{{ . }}';
32+
var gcse = document.createElement('script');
33+
gcse.type = 'text/javascript';
34+
gcse.async = true;
35+
gcse.src = 'https://cse.google.com/cse.js?cx=' + cx;
36+
var s = document.getElementsByTagName('script')[0];
37+
s.parentNode.insertBefore(gcse, s);
38+
})();
39+
</script>
40+
<gcse:searchresults-only></gcse:searchresults-only>
41+
{{ else if .Site.Params.k8s_search }}
42+
<script src="{{ "js/search.js" | relURL }}"></script>
43+
<gcse:searchresults-only linktarget="_parent">
44+
<div id="bing-results-container">{{ T "layouts_docs_search_fetching" }}</div>
45+
<div id="bing-pagination-container"></div>
46+
</gcse:searchresults-only>
47+
{{ end }}
48+
</div>
49+
</section>
5150
</main>
5251
{{ partial "footer.html" . }}
5352
</div>

0 commit comments

Comments
 (0)