From e3571d52aca6a178885f54f6114066aa31724d2f Mon Sep 17 00:00:00 2001 From: brookee Date: Thu, 29 Feb 2024 19:29:42 -0500 Subject: [PATCH] formatting --- .prettierrc | 11 ++ README.md | 4 + themes/agnes-hugo-theme/layouts/404.html | 11 +- .../layouts/_default/baseof.html | 24 ++- themes/agnes-hugo-theme/layouts/index.html | 165 ++++++++++-------- .../layouts/partials/footer.html | 80 +++++---- .../layouts/partials/head.html | 24 +-- .../layouts/partials/header.html | 67 ++++--- .../layouts/partials/nav.html | 20 +-- .../layouts/partials/script.html | 2 +- .../layouts/partials/social.html | 73 ++++---- 11 files changed, 281 insertions(+), 200 deletions(-) create mode 100644 .prettierrc diff --git a/.prettierrc b/.prettierrc new file mode 100644 index 0000000..3f6fe47 --- /dev/null +++ b/.prettierrc @@ -0,0 +1,11 @@ +{ + "plugins": ["prettier-plugin-go-template"], + "overrides": [ + { + "files": ["*.html"], + "options": { + "parser": "go-template", + }, + }, + ], + } \ No newline at end of file diff --git a/README.md b/README.md index 9317b8f..2e4fb09 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,9 @@ # bellaskeys.com agnes +It's recommended to install and use prettier when making contributions, prettier doesn't handle go templates well so if you would like to use prettier then refer to this project: https://github.com/NiklasPor/prettier-plugin-go-template. + + + ## Thanks To https://cruip.com/ for providing the original theme licensed under GPLv3 https://github.com/dchucks for providing the hugo theme template converted from the raw HTML diff --git a/themes/agnes-hugo-theme/layouts/404.html b/themes/agnes-hugo-theme/layouts/404.html index eabf4cd..4cfe180 100644 --- a/themes/agnes-hugo-theme/layouts/404.html +++ b/themes/agnes-hugo-theme/layouts/404.html @@ -1,7 +1,12 @@ {{ define "main" }}
-
-

Sorry we could not find what you were looking for.
Click here for the home page

+
+

+ Sorry we could not find what you were looking for.
Click here for the home page +

-{{ end }} \ No newline at end of file +{{ end }} diff --git a/themes/agnes-hugo-theme/layouts/_default/baseof.html b/themes/agnes-hugo-theme/layouts/_default/baseof.html index b92d8c4..5b09a70 100644 --- a/themes/agnes-hugo-theme/layouts/_default/baseof.html +++ b/themes/agnes-hugo-theme/layouts/_default/baseof.html @@ -1,14 +1,12 @@ - + - {{ partial "head.html" . }} - -
- {{ partial "header.html" . }} -
- {{ block "main" . }}{{ end }} -
- {{ partial "footer.html" . }} -
- {{ partial "script.html" . }} - - \ No newline at end of file + {{ partial "head.html" . }} + +
+ {{ partial "header.html" . }} +
{{ block "main" . }}{{ end }}
+ {{ partial "footer.html" . }} +
+ {{ partial "script.html" . }} + + diff --git a/themes/agnes-hugo-theme/layouts/index.html b/themes/agnes-hugo-theme/layouts/index.html index 26f9ba1..4184534 100644 --- a/themes/agnes-hugo-theme/layouts/index.html +++ b/themes/agnes-hugo-theme/layouts/index.html @@ -1,76 +1,99 @@ {{ define "main" }} -
+
-
-
-

{{ .Site.Params.Content.LeadTitle | markdownify }} -

-

{{ .Site.Params.Content.LeadDescription | markdownify }}

-

{{ .Site.Params.Content.ButtonCaption | markdownify - }}

-
+
+
+

+ {{ .Site.Params.Content.LeadTitle | markdownify }} +

+

+ {{ .Site.Params.Content.LeadDescription | markdownify }} +

+

+ {{ .Site.Params.Content.ButtonCaption | markdownify }} +

+
-
-{{ with .Site.Params.quote }} -
- {{ range . }} -
-

{{ .quoteText }}

-

- {{ .quoteBy }}

-
- {{ end }} -
+
+ {{ with .Site.Params.quote }} +
+ {{ range . }} +
+

{{ .quoteText }}

+

- {{ .quoteBy }}

+
+ {{ end }} +
+ {{ end }} +
+
+
+
+ {{ range site.Params.feature }} +
+ +
+

{{ .FeatureTitle }}

+

{{ .FeatureDescription }}

+
+
+ {{ end }} +
+
+
+
+
+
+
+

Pricing

+ {{ with index site.Params.pricing 0 }} +
+
+
+ {{ .PricingTitle }} +
+
+
+ {{ .PricingDesc }} +
+ {{ .ButtonText }} +
+
+
    + {{ range .Features }} +
  • + + + + + + {{ .Description }} +
    • + {{ end }} +
+
+ {{ end }} +
+
+
{{ end }} -
-
-
-
- {{ range site.Params.feature }} -
- -
-

{{ .FeatureTitle }}

-

{{ .FeatureDescription }}

-
-
- {{ end }} -
-
-
-
-
-
-
-

Pricing

- {{ with index site.Params.pricing 0 }} -
-
-
{{ .PricingTitle }}
-
-
{{.PricingDesc}} -
- {{ .ButtonText }} -
-
-
    - {{ range .Features }} -
  • - - - - - - {{ .Description }} -
    • - {{ end }} -
-
- {{ end }} -
-
-
-{{ end }} \ No newline at end of file diff --git a/themes/agnes-hugo-theme/layouts/partials/footer.html b/themes/agnes-hugo-theme/layouts/partials/footer.html index 8037de1..e5dd378 100644 --- a/themes/agnes-hugo-theme/layouts/partials/footer.html +++ b/themes/agnes-hugo-theme/layouts/partials/footer.html @@ -1,30 +1,50 @@ - \ No newline at end of file + diff --git a/themes/agnes-hugo-theme/layouts/partials/head.html b/themes/agnes-hugo-theme/layouts/partials/head.html index 533b517..de659e0 100644 --- a/themes/agnes-hugo-theme/layouts/partials/head.html +++ b/themes/agnes-hugo-theme/layouts/partials/head.html @@ -1,12 +1,12 @@ - - - - - {{ with .Site.Params}} - {{ end }} - {{ $title := print .Site.Title " | " .Title }} - {{ if .IsHome }}{{ $title = .Site.Title }}{{ end }} - {{ $title }} - - - \ No newline at end of file + + + + + {{ with .Site.Params }} + {{ end }} + {{ $title := print .Site.Title " | " .Title }} + {{ if .IsHome }}{{ $title = .Site.Title }}{{ end }} + {{ $title }} + + + diff --git a/themes/agnes-hugo-theme/layouts/partials/header.html b/themes/agnes-hugo-theme/layouts/partials/header.html index b479b11..77d11f4 100644 --- a/themes/agnes-hugo-theme/layouts/partials/header.html +++ b/themes/agnes-hugo-theme/layouts/partials/header.html @@ -1,29 +1,40 @@
-
-
-
-

- - - {{ .Site.Title }} - - - - - - - - - - - - - - - - -

-
-
-
-
\ No newline at end of file +
+
+
+

+ + + {{ .Site.Title }} + + + + + + + + + + + + + + + + +

+
+
+
+ diff --git a/themes/agnes-hugo-theme/layouts/partials/nav.html b/themes/agnes-hugo-theme/layouts/partials/nav.html index 05ea8ca..acc70e3 100644 --- a/themes/agnes-hugo-theme/layouts/partials/nav.html +++ b/themes/agnes-hugo-theme/layouts/partials/nav.html @@ -1,10 +1,10 @@ - \ No newline at end of file + diff --git a/themes/agnes-hugo-theme/layouts/partials/script.html b/themes/agnes-hugo-theme/layouts/partials/script.html index 259794e..90a481c 100644 --- a/themes/agnes-hugo-theme/layouts/partials/script.html +++ b/themes/agnes-hugo-theme/layouts/partials/script.html @@ -1 +1 @@ - \ No newline at end of file + diff --git a/themes/agnes-hugo-theme/layouts/partials/social.html b/themes/agnes-hugo-theme/layouts/partials/social.html index 256cd1e..fcfceb1 100644 --- a/themes/agnes-hugo-theme/layouts/partials/social.html +++ b/themes/agnes-hugo-theme/layouts/partials/social.html @@ -1,32 +1,41 @@ - +