Skip to content

move pages to baseof #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pftg merged 2 commits into from
Sep 9, 2024
Merged

move pages to baseof #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0009d20
move pages to baseof
AucT Sep 9, 2024
95b0be3
move header and footer to baseof
AucT Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
416 changes: 124 additions & 292 deletions themes/beaver/layouts/404.html
View file
Open in desktop

Large diffs are not rendered by default.

381 changes: 379 additions & 2 deletions themes/beaver/layouts/_default/baseof.html
View file
Open in desktop

Large diffs are not rendered by default.

50 changes: 41 additions & 9 deletions themes/beaver/layouts/_default/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,37 @@
{{ define "header" }}
{{- $CSS := slice
(resources.Get "assets/css/586.css")
(resources.Get "assets/css/style.css")
(resources.Get "assets/css/base-4.min.css")
(resources.Get "assets/css/3114-layout.css")
(resources.Get "/assets/css/bf72bba397177a0376baed325bffdc75-layout-bundle.css")
(resources.Get "assets/css/skin-65eda28877e04.css")
(resources.Get "assets/css/single-post.css")
| resources.Concat "assets/css/blog.css" | css.PostCSS | minify | fingerprint | resources.PostProcess}}

<link rel="stylesheet" href="{{ $CSS.RelPermalink }}" media='all' />



{{ if eq .Type "tags" }}
{{ $blogIndex := .Site.GetPage "blog" }} <!-- Get the blog index page -->
{{ with $blogIndex.Resources.GetMatch $blogIndex.Params.metatags.image }}
<meta property="og:image" content="{{ .Permalink }}" />
<meta property="og:image:width" content="{{ .Width }}" />
<meta property="og:image:height" content="{{ .Height }}" />
<meta name="twitter:card" content="summary_large_image" />
<meta name="twitter:image" content="{{ .Permalink }}" />

{{ end }}
{{ end }}


{{ $url := .RelPermalink }}
{{ if or (eq $url "/blog/") (strings.HasPrefix $url "/blog/page/") }}
<meta name="robots" content="NOODP">
{{ end }}
{{ end }}

{{ define "main" }}
<div id="fl-main-content" class="fl-page-content" itemprop="mainContentOfPage" role="main">
<div class="fl-builder-content fl-builder-content-741 fl-builder-global-templates-locked" data-post-id="741">
Expand All @@ -17,19 +51,16 @@ <h1 class="fl-heading" style="margin: 0!important;padding: 0!important">Blog</h1

{{ range (.Paginate (.Pages.ByParam "created_at").Reverse).Pages }}
<a class="link" href="{{ .Permalink }}">


<div class="blog-post">
<div class="post-image">
{{ $cdnPrefix := "https://imagecdn.app/v1/images/" }}
{{ $src := "" }}
{{ with .Params.cover_image }}
{{ $encodedSrc := printf "%s%s" $cdnPrefix (urlquery .) }}
{{ $src = printf "%s?width=150&height=150" $encodedSrc }}
{{ $image := .Resources.GetMatch (printf "*%s*" .Params.metatags.image) }}
{{ if $image }}
<img src="{{ $image.Permalink }}" alt="{{ .Title }}">
{{ else }}
{{ $src = "/assets/img/no-image.png" }}
<img src="/assets/img/no-image.png" alt="Placeholder Image">
{{ end }}

<img src="{{ $src }}" alt="Placeholder Image" loading="lazy" decoding="async">

</div>
<div class="post-content">
<h2 class="post-title">{{ .Title }}</h2>
Expand All @@ -41,6 +72,7 @@ <h2 class="post-title">{{ .Title }}</h2>
</div>
</div>
</div>

</a>
{{ end }}

Expand Down
59 changes: 45 additions & 14 deletions themes/beaver/layouts/_default/single.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,45 @@
{{ partial "header.html" . }}

<article>
<header>
<h1><a href="{{ .Permalink }}">{{ .Title }}</a></h1>
{{ if eq .Section "posts" }}
<p>Updated: {{ .Date.Format "2th January 2006" }}
<br>Tags: {{ range .Params.tags }}<a href="/blog/tags/{{ . | urlize }}/">{{ . }}</a> {{ end }}</p>
{{ end }}
</header>
{{ .Content }}
</article>

{{ partial "footer.html" . }}
{{ define "header" }}
{{- $CSS := slice
(resources.Get "assets/css/586.css")
(resources.Get "assets/css/style.css")
(resources.Get "assets/css/base-4.min.css")
(resources.Get "assets/css/3114-layout.css")
(resources.Get "/assets/css/bf72bba397177a0376baed325bffdc75-layout-bundle.css")
(resources.Get "assets/css/skin-65eda28877e04.css")
(resources.Get "assets/css/single-post.css")
| resources.Concat "assets/css/blog.css" | css.PostCSS | minify | fingerprint | resources.PostProcess}}

<link rel="stylesheet" href="{{ $CSS.RelPermalink }}" media='all' />

{{ with .Params.created_at }}
<meta property="article:published_time" content="{{ . | time.Format "2006-01-02T15:04:05Z07:00" }}" />
{{ end }}
<meta property="article:modified_time" content="{{ .Lastmod | time.Format "2006-01-02T15:04:05Z07:00" }}" />

{{ end }}
{{ define "main" }}

<div id="fl-main-content" class="blog" itemprop="mainContentOfPage" role="main">
<div class="fl-row-content fl-row-fixed-width fl-node-content">

<article class="single-content" style="max-width: 960px; margin:0 auto; padding-left:18px;padding-right:18px"
itemscope="itemscope" itemtype="https://schema.org/CreativeWork">

<h1 class="heading">{{ .Title }}</h1>
<div class="post-tags" style="margin-bottom: 1rem;">{{ range .Params.tags }}<a href="/blog/tags/{{ . | urlize }}/">#{{ . }}</a> {{ end }}</div>

<div class="fl-rich-text" style="max-width: 43rem;">
{{ .Content }}
</div>
</article>

<div class="single-content single-post-wrapper">
{{ partial "blog/share.html" . }}

{{ partial "blog/related-posts.html" . }}
</div>

</div>
</div>

{{ end }}
67 changes: 0 additions & 67 deletions themes/beaver/layouts/blog/list.html
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions themes/beaver/layouts/blog/single.html
View file
Open in desktop

This file was deleted.

15 changes: 11 additions & 4 deletions themes/beaver/layouts/careers/single.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
{{ partial "page/header.html" . }}
{{ define "header" }}
{{ partial "header/critical/single/careers.html" . }}

{{- $CSS := slice (resources.Get "assets/css/3114-layout.css") (resources.Get "assets/css/e966db44b09892b8d7d492247c67e86c-layout-bundle.css") (resources.Get "assets/css/586.css") (resources.Get "assets/css/homepage.css") (resources.Get "assets/css/animate.min.css") (resources.Get "assets/css/base-4.min.css") (resources.Get "assets/css/style.css") (resources.Get "assets/css/skin-65eda28877e04.css") | resources.Concat "assets/css/single/careers.css" | css.PostCSS | minify | fingerprint | resources.PostProcess}}
<link rel="stylesheet" href="{{ $CSS.RelPermalink }}" media='all' />
{{ end }}
{{ define "main" }}
<div id="fl-main-content" class="fl-page-content" itemprop="mainContentOfPage" role="main">
<div class="fl-builder-content fl-builder-content-3050 fl-builder-global-templates-locked" data-post-id="3050">
<div class="fl-row fl-row-full-width fl-row-bg-photo fl-node-3debxjmt89f4 fl-row-default-height fl-row-align-center" data-node="3debxjmt89f4">
Expand Down Expand Up @@ -179,6 +185,7 @@ <h2 class="gform_title">Career</h2>
</div>
</div>
</div>

<!-- .fl-page-content -->
{{ partial "page/footer.html" . }}
</div>
</div>
</div>
{{ end }}
14 changes: 12 additions & 2 deletions themes/beaver/layouts/clients/single.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
{{ partial "page/header.html" . }}
{{ define "header" }}
{{ partial "header/critical/single/clients.html" . }}

{{- $CSS := slice (resources.Get "assets/css/3114-layout.css") (resources.Get "assets/css/fb2624e43f3c4277448abe268cde571e-layout-bundle.css") (resources.Get "assets/css/586.css") (resources.Get "assets/css/animate.min.css") (resources.Get "assets/css/base-4.min.css") (resources.Get "assets/css/style.css") (resources.Get "assets/css/skin-65eda28877e04.css") | resources.Concat "assets/css/single/clients.css" | css.PostCSS | minify | fingerprint | resources.PostProcess}}
<link rel="stylesheet" href="{{ $CSS.RelPermalink }}" media='all' />
{{ end }}

{{ define "main" }}
<div id="fl-main-content" class="fl-page-content" itemprop="mainContentOfPage" role="main">
<div class="fl-builder-content fl-builder-content-2998 fl-builder-global-templates-locked" data-post-id="2998">
<div class="fl-row fl-row-full-width fl-row-bg-photo fl-node-pljy58ha90t6 fl-row-default-height fl-row-align-center fl-row-has-layers" data-node="pljy58ha90t6">
Expand Down Expand Up @@ -401,4 +408,7 @@ <h2 class="fl-heading">
</div>
</div>
</div>
{{ partial "page/footer.html" . }}
</div>
</div>
</div>
{{ end }}
Loading