Skip to content

Commit 4be5ef6

Browse files
committed
Mainframe: Removed css data-mf tags
1 parent 2a7f080 commit 4be5ef6

20 files changed

+29
-402
lines changed

exampleSite/content/test-product/_index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ hasCustomContent: true
1717
Examples for codeblock shortcode
1818
{{</ card >}}
1919
{{</ card-section >}}
20-
2120
# Other Products on ExampleSite
2221
{{< card-section title="NGINX" showAsCards="true" >}}
2322
{{< card title="NGINX Plus" titleUrl="/nginx/" >}}

layouts/_default/_markup/render-codeblock.html

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{{ $isSingleLine := eq (len $lines) 1 }}
55

66
{{- if $isSingleLine -}}
7-
<div class="code-block" data-mf="true" style="display: none;">
7+
<div class="code-block">
88
<div class="code-container chroma">
99
<button onclick="copyToClipBoard(this, {{ $codeBlockId }})" class="code-copy-button" type="button">Copy</button>
1010
<div class="highlight-v2 single-line" id="{{ $codeBlockId }}">
@@ -13,7 +13,7 @@
1313
</div>
1414
</div>
1515
{{- else -}}
16-
<div class="code-block" data-mf="true" style="display: none;">
16+
<div class="code-block">
1717
{{- if and (ne .Type "") (ne .Type "none") -}}
1818
<span class="code-type chroma">{{ .Type }}</span>
1919
{{- end -}}
@@ -24,7 +24,4 @@
2424
</div>
2525
</div>
2626
</div>
27-
{{- end -}}
28-
<div id="code-block-v1" data-mf="false">
29-
{{ $result.Wrapped }}
30-
</div>
27+
{{- end -}}

layouts/_default/_markup/render-heading.html

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
<h{{ .Level }}
22
id="{{ .Anchor | safeURL }}">
3-
<div data-mf="false">
4-
{{ .Text | safeHTML }}
5-
<a class="headerlink float-right" href="#{{ .Anchor | safeURL }}" title="{{ .Text | safeHTML }}">
6-
<i class="fas fa-link fa-xs"></i>
7-
</a>
8-
</div>
9-
10-
<div data-mf="true">
3+
<div>
114
<a class="headerlink float-right" href="#{{ .Anchor | safeURL }}" title="{{ .Text | safeHTML }}">
125
{{ .Text | safeHTML }}
136
</a>

layouts/_default/baseof.html

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,26 +47,12 @@
4747
</header>
4848

4949
<section class="base-layout" data-testid="base-layout">
50-
<section id="breadcrumb-v1">
51-
{{ if not .IsHome }}
52-
{{ if not (in .Params.display_breadcrumb "false" ) }}
53-
{{ partial "breadcrumb" .}}
54-
{{ end }}
55-
{{ end }}
56-
</section>
57-
5850
<div class="main container-fluid min-page-height" data-menu-id="{{.RelPermalink}}">
5951
{{ block "main" . }}{{ end }}
6052
</div>
6153
</section>
6254

63-
<footer id="footer">
64-
{{ block "footer" . }}
65-
{{ partial "footer.html" . }}
66-
{{ end }}
67-
</footer>
68-
69-
<footer data-mf="true" id="footer-v2" style="display:none;">
55+
<footer id="footer-v2">
7056
{{ block "footer-v2" . }}
7157
{{ partial "footer-v2.html" . }}
7258
{{ end }}

layouts/_default/docs.html

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{{ define "main" }}
22
<div class="docs-container row override-sidebar-collapse">
33
<div class="docs-container row override-sidebar-collapse">
4-
<nav id="sidebar" class="sidenav overflow-auto col-md-3 d-none d-xl-block d-print-none align-top">
5-
{{ partial "sidebar.html" . }}
6-
</nav>
7-
84
<!-- Replace icons -->
95
{{ $content := partial "icon-replacement.html" (dict "content" .Content) }}
106

@@ -18,15 +14,15 @@
1814

1915
<section class="main-layout">
2016
<div class="sidebar-layout" id="sidebar-layout">
21-
<button class="sidebar__mobile__toggle" aria-expanded="false" data-mf="true">{{ partial "lucide" (dict "context" . "icon" "x")}}Close</button>
22-
<nav data-mf="true" id="sidebar-v2" class="sidebar">
17+
<button class="sidebar__mobile__toggle" aria-expanded="false">{{ partial "lucide" (dict "context" . "icon" "x")}}Close</button>
18+
<nav id="sidebar-v2" class="sidebar">
2319
{{ partial "sidebar-v2.html" . }}
2420
</nav>
2521
</div>
2622

2723
<section id="maincontent" class="content-layout">
2824
<div data-cms-edit="content" class="text-content">
29-
<section class="breadcrumb-layout wide" data-mf="true" style="display: none;">
25+
<section class="breadcrumb-layout wide">
3026
{{ if not .IsHome }}
3127
{{ if not (in .Params.display_breadcrumb "false" ) }}
3228
{{ partial "breadcrumb" .}}

layouts/_default/list.html

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,15 @@
11
{{ define "main" }}
2-
<div class="row flex-xl-nowrap" id="list-v1">
3-
<nav class="sidenav overflow-auto col-md-3 d-none d-xl-block d-print-none">
4-
{{ partial "sidebar.html" . }}
5-
</nav>
6-
<main class="content col-xl-9 d-block" role="main">
7-
{{ partial "list-main" . }}
8-
</main>
9-
</div>
10-
112
{{/* mf list page */}}
12-
13-
<main class="content col d-block align-top content-has-toc" role="main" data-mf="true" style="display: none">
3+
<main class="content col d-block align-top content-has-toc" role="main">
144
<section class="main-layout">
155
<div class="sidebar-layout" id="sidebar-layout">
16-
<button class="sidebar__mobile__toggle" aria-expanded="false" data-mf="true">{{ partial "lucide" (dict "context" . "icon" "x")}}Close</button>
17-
<nav data-mf="true" id="sidebar-v2" class="sidebar" style="display:none;">
6+
<button class="sidebar__mobile__toggle" aria-expanded="false">{{ partial "lucide" (dict "context" . "icon" "x")}}Close</button>
7+
<nav id="sidebar-v2" class="sidebar">
188
{{ partial "sidebar-v2.html" . }}
199
</nav>
2010
</div>
2111

22-
<section id="maincontent" class="content-layout" data-mf="true" style="display: none">
12+
<section id="maincontent" class="content-layout">
2313
<div data-cms-edit="content" class="text-content list-page">
2414
<section class="breadcrumb-layout wide">
2515
{{ if not .IsHome }}
@@ -58,9 +48,6 @@ <h2>
5848
</div>
5949
</section>
6050
</section>
61-
62-
63-
6451
</section>
6552
</main>
6653
{{ end }}

layouts/partials/breadcrumb.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<nav aria-label="breadcrumb" class="breadcrumb navbar">
22
<div class="nav flex-md-row">
33
<ol class="breadcrumb">
4-
<button class="sidebar__mobile__toggle" aria-expanded="false" data-mf="true">{{ partial "lucide" (dict "context" . "icon" "align-justify") }}</button>
4+
<button class="sidebar__mobile__toggle" aria-expanded="false">{{ partial "lucide" (dict "context" . "icon" "align-justify") }}</button>
55
<li><a href="/" alt="NGINX Docs Home">Home</a></li>
66
{{- define "breadcrumb" -}}
77
{{- with .Parent -}}

layouts/partials/callout.html

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,6 @@
1919
{{ $class = printf "%s %s" $class $inlineOption }}
2020
{{ end }}
2121

22-
23-
24-
{{/* Old frame callout */}}
25-
<blockquote class="{{ $class }}" data-mf="false">
26-
<div>
27-
{{- with $icon -}}
28-
<i class="{{ . }}"></i>
29-
{{- end -}}
30-
<strong>{{ $title }}</strong>
31-
{{ .content | markdownify }}
32-
</div>
33-
</blockquote>
34-
35-
3622
{{/* Render a different block, if "loud" callouts are used */}}
3723
{{ $specialTitles := slice "Caution" "Warning" "Deprecated" "Important" }}
3824
{{ $specialTitleIcons := dict
@@ -47,7 +33,7 @@
4733
{{ if $isSpecialTitle }}
4834
{{/* Loud callouts */}}
4935
<div>
50-
<blockquote class="{{ $class }}" data-mf="true" style="display: none;">
36+
<blockquote class="{{ $class }}">
5137
<div>
5238
<div class="call-out-type">
5339
{{ partial "feather" (dict "context" . "icon" $icon) .}}
@@ -66,7 +52,7 @@
6652

6753
{{ $cleanTitle := strings.TrimSuffix ":" $title}}
6854

69-
<blockquote class="{{ $class }} note" data-mf="true" style="display: none;" data-title="{{ $cleanTitle }}">
55+
<blockquote class="{{ $class }} note" data-title="{{ $cleanTitle }}">
7056
<div class="callout-content">
7157
{{- with $icon -}}
7258
<i class="{{ . }}"></i>
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<atomic-search-interface id="search-standalone-header" data-mf="true" style="display:none;">
2-
<atomic-search-box redirection-url="/search.html">
1+
{{ $redirectionUrl := .redirectionUrl | default "/search.html" }}
2+
<atomic-search-interface id="search-standalone-header">
3+
<atomic-search-box redirection-url={{ $redirectionUrl }}>
34
</atomic-search-box>
45
</atomic-search-interface>

layouts/partials/custom-landing-page.html

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,8 @@
33
{{ $class := "card-grid wide"}}
44

55
<div class="{{ if eq $showAsCards "true" }}{{ $class }}{{ end }}">
6-
<!-- Old frame -->
7-
<section data-mf="false">
8-
<div class="row">
9-
<div class="card-deck">
10-
{{ range .Pages.GroupBy "Section" }}
11-
{{ range .Pages.ByWeight }}
12-
{{ $title := .Title }}
13-
<div class="col-md-5 card">
14-
<div class="card-body">
15-
<h3 class="card-title" style="display: flex; align-items: center; gap: 5px;">
16-
<i class="fas fa-{{if eq .Kind "page"}}file-alt{{else}}book{{end}} fa-lg card-img-top"></i>
17-
<a href="{{ if .Params.url}}{{ .Params.url}}{{else}}{{ .Permalink }}{{end}}">{{ .Title }}</a>
18-
</h3>
19-
{{ range $cards }}
20-
{{ if eq .title $title }}
21-
<p>{{ .content }}</p>
22-
{{ end }}
23-
{{ end }}
24-
</div>
25-
</div>
26-
{{ end }}
27-
{{ end }}
28-
</div>
29-
</div>
30-
</section>
31-
326
<!-- Mainframe -->
33-
<div data-mf="true" style="display: none;">
7+
<div>
348
{{ range .Pages.ByWeight }}
359
{{ $title := .Title }}
3610
<div class="card-container">

layouts/partials/header.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
{{ if ( not ( in .Site.Params.buildtype "package" ) ) }}
88
<div class="navbar navbar-nav">
99
<!-- Standalone search box. -->
10-
{{ partial "coveo-legacy-search.html" . }}
11-
{{ partial "coveo-atomic-search.html" . }}
10+
{{ partial "coveo-atomic-search.html" }}
1211
</div>
1312
{{ end }}
1413
{{ if ( in .Site.Params.buildtype "package" ) }}

layouts/partials/list-main.html

Lines changed: 0 additions & 42 deletions
This file was deleted.

layouts/partials/lucide.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{- /* Usage: */ -}}
22
{{- /* (dict "context" . "icon" "circle") */ -}}
33
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" aria-hidden="true" class="lucide"
4-
style="{{ .style | safeCSS }}" data-mf="true" style="display: none">
4+
style="{{ .style | safeCSS }}">
55
<use href="/images/lucide-sprite.svg#{{ .icon }}"></use>
66
</svg>

0 commit comments

Comments
 (0)