diff --git a/.gitignore b/.gitignore index 623a515..fd24942 100644 --- a/.gitignore +++ b/.gitignore @@ -24,5 +24,3 @@ _gen *.njsproj *.sln *.sw? - -.hugo_build.lock diff --git a/LICENCE b/LICENCE deleted file mode 100644 index 12cc60a..0000000 --- a/LICENCE +++ /dev/null @@ -1,22 +0,0 @@ -Copyright 2021-2026 SR2 Communications Limited. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this list - of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, this - list of conditions and the following disclaimer in the documentation and/or other - materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND ANY -EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT -SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index 277f8f7..0000000 --- a/README.md +++ /dev/null @@ -1,31 +0,0 @@ -SR2's Hugo Theme -================ - - -[![Translation status](https://hosted.weblate.org/widget/sr2/hugo-sr2/svg-badge.svg)](https://hosted.weblate.org/engage/sr2/) -[![License](https://img.shields.io/badge/License-BSD_2--Clause-orange.svg)](https://opensource.org/licenses/BSD-2-Clause) - -A Hugo theme created for SR2, with some simple page and blog layouts. - -Examples --------- - - * [SR2 Communications](https://www.sr2.uk/) ([Source Code](https://guardianproject.dev/sr2/www.sr2.uk/)) - * [SR2 Professional Services](https://www.sr2pro.uk/) ([Source Code](https://guardianproject.dev/sr2/www.sr2pro.uk/)) - * [499-501 Union Street (Management) Limited](https://www.499501.com/) ([Source Code](https://guardianproject.dev/sr2/www.499501.com/)) - * [Dynamic5 AB](https://dynamic5.com/) - -Translations ------------- - -The theme is created to support multiple languages. -Translations of strings in the themes are managed on Weblate. - - -Translation status - - -Licence & Copyright -------------------- - -© SR2 Communications Limited. See [LICENCE](./LICENCE) for details of the BSD 2 clause licence. \ No newline at end of file diff --git a/assets/css/contact.scss b/assets/css/contact.scss index b192cdb..7e1e631 100644 --- a/assets/css/contact.scss +++ b/assets/css/contact.scss @@ -51,10 +51,6 @@ align-items: center; flex-direction: column; padding: 0 20px; - - @media (max-width: v.$bp_mobile) { - padding: 0; - } } .contact-method__name { diff --git a/assets/css/datapage.scss b/assets/css/datapage.scss deleted file mode 100644 index 8083528..0000000 --- a/assets/css/datapage.scss +++ /dev/null @@ -1,47 +0,0 @@ -@use "hugo:vars" as v; - - -@media(min-width: v.$bp_mobile) { - .datapage { - display: flex; - flex-direction: row; - gap: 1rem; - } - - .datapage__content { - order: 1; - } - - .datapage__data { - order: 2; - min-width: 350px; - } - - .datapage__datacard { - background-color: white; - box-shadow: 0 1.5rem 4rem rgba(22,28,45,0.05) !important; - padding: 1.5rem; - } -} - -.datapage__datacard { - address { - white-space: preserve-breaks; - font-style: normal; - } - - h3 { - font-weight: 600; - } - - h4 { - color: v.$color_tertiary; - font-variant: small-caps; - } -} - -.datapage__content { - img { - max-width: 100%; - } -} \ No newline at end of file diff --git a/assets/css/flex-section.scss b/assets/css/flex-section.scss index 906da23..7ab60c4 100644 --- a/assets/css/flex-section.scss +++ b/assets/css/flex-section.scss @@ -2,11 +2,6 @@ .flex-section { margin: 48px 95px; - - @media (max-width: v.$bp_mobile) { - margin-left: 0; - margin-right: 0; - } } .flex-section__title { diff --git a/assets/css/footer.scss b/assets/css/footer.scss index e2d1c30..76bf64e 100644 --- a/assets/css/footer.scss +++ b/assets/css/footer.scss @@ -33,9 +33,6 @@ footer { justify-items: end; a { display: block; - img { - margin-left: auto; - } } } diff --git a/assets/css/full-section.scss b/assets/css/full-section.scss index 168d0ba..7e248c2 100644 --- a/assets/css/full-section.scss +++ b/assets/css/full-section.scss @@ -10,10 +10,6 @@ box-sizing: border-box; max-width: v.$max_content_width; } - - @media (max-width: v.$bp_mobile) { - padding: 10px 20px; - } } .full-section__content { diff --git a/assets/css/half-section.scss b/assets/css/half-section.scss index 79ce08b..b8db7e3 100644 --- a/assets/css/half-section.scss +++ b/assets/css/half-section.scss @@ -5,16 +5,11 @@ display: flex; justify-content: center; - & > div { + &>div { + flex: 0 0 50%; box-sizing: border-box; max-width: calc(v.$max_content_width / 2); } - - @media (min-width: v.$bp_mobile) { - & > div { - flex: 0 0 50%; - } - } } .half-section__content { diff --git a/assets/css/main.scss b/assets/css/main.scss index 1783172..0421b8c 100644 --- a/assets/css/main.scss +++ b/assets/css/main.scss @@ -122,52 +122,4 @@ main { padding: .75rem; text-align: center; font-weight: bold; -} - -figure { - max-width: 100%; - background-color: v.$color_hr; - border: 1px solid v.$color_tertiary; - padding: 4px; - text-align: center; -} - -figure img { - max-width: 100%; - border: 1px solid v.$color_tertiary; -} - -figcaption p { - margin: 4px 0; - text-align: center; -} - -table { - margin: 0 auto; - min-width: 25%; - max-width: 100%; - border-collapse: collapse; - background-color: v.$color_hr; -} - -th, td { - border: 1px solid v.$color_tertiary; - padding: 3px; -} - -table caption { - font-weight: bold; -} - -.tag { - display: inline-block; - padding: 0.25em 0.75em; - border-radius: 9999px; - font-size: 0.875rem; - font-weight: 500; - text-decoration: none; - text-transform: lowercase; - margin: 0 0.1em; - background-color: v.$color_tertiary; - color: #ffffff; -} +} \ No newline at end of file diff --git a/assets/css/team.scss b/assets/css/team.scss index ee5d4b9..02c6565 100644 --- a/assets/css/team.scss +++ b/assets/css/team.scss @@ -9,10 +9,6 @@ flex-direction: column; padding: 0 20px; margin-bottom: 2rem; - - @media (max-width: v.$bp_mobile) { - padding: 0; - } } .team-member__photo { diff --git a/example/content/_index.md b/content/_index.md similarity index 100% rename from example/content/_index.md rename to content/_index.md diff --git a/example/content/posts/_index.md b/content/posts/_index.md similarity index 100% rename from example/content/posts/_index.md rename to content/posts/_index.md diff --git a/example/content/posts/post-1.md b/content/posts/post-1.md similarity index 100% rename from example/content/posts/post-1.md rename to content/posts/post-1.md diff --git a/example/content/posts/post-2.md b/content/posts/post-2.md similarity index 100% rename from example/content/posts/post-2.md rename to content/posts/post-2.md diff --git a/example/content/posts/post-3/bryce-canyon.jpg b/content/posts/post-3/bryce-canyon.jpg similarity index 100% rename from example/content/posts/post-3/bryce-canyon.jpg rename to content/posts/post-3/bryce-canyon.jpg diff --git a/example/content/posts/post-3/index.md b/content/posts/post-3/index.md similarity index 100% rename from example/content/posts/post-3/index.md rename to content/posts/post-3/index.md diff --git a/i18n/en.toml b/i18n/en.toml index 1198bab..59bb26c 100644 --- a/i18n/en.toml +++ b/i18n/en.toml @@ -1,10 +1,3 @@ Published = 'Published' -Updated = 'Updated' By = 'By %s' -'Show larger map' = 'Show larger map' -Telephone = 'Telephone' -Email = 'Email' -Fax = 'Fax' -'Address' = 'Address' -'Our Team' = 'Our Team' -'Contact Us' = 'Contact Us' +'Show larger map' = 'Show larger map' \ No newline at end of file diff --git a/i18n/ro.toml b/i18n/ro.toml deleted file mode 100644 index d840775..0000000 --- a/i18n/ro.toml +++ /dev/null @@ -1,10 +0,0 @@ -Published = "" -Updated = "" -By = "" -'Show larger map' = "" -Telephone = "" -Email = "" -Fax = "" -'Address' = "" -'Our Team' = "" -'Contact Us' = "" diff --git a/i18n/se.toml b/i18n/se.toml new file mode 100644 index 0000000..a6b3859 --- /dev/null +++ b/i18n/se.toml @@ -0,0 +1,3 @@ +Published = 'Publicerad' +By = 'Av %s' +'Show larger map' = 'Visa större karta' \ No newline at end of file diff --git a/i18n/sv.toml b/i18n/sv.toml deleted file mode 100644 index 5280cbf..0000000 --- a/i18n/sv.toml +++ /dev/null @@ -1,10 +0,0 @@ -Published = 'Publicerad' -Updated = 'Ändrad' -By = 'Av %s' -'Show larger map' = 'Visa större karta' -Telephone = 'Telefon' -Email = 'Epost' -Fax = 'Fax' -'Our Team' = 'Vårt Team' -'Contact Us' = "Kontakta Oss" -Address = "Adress" diff --git a/i18n/tok.toml b/i18n/tok.toml deleted file mode 100644 index 048259c..0000000 --- a/i18n/tok.toml +++ /dev/null @@ -1,10 +0,0 @@ -Published = "tenpo toki" -By = "tan %s" -'Show larger map' = "o suli e sitelen ma" -Updated = "tenpo ante" -Telephone = "nanpa pi toki weka" -Email = "sitelen kon" -Fax = "nanpa pi sitelen weka" -Address = "nimi ma" -"Our Team" = "kulupu pali mi" -"Contact Us" = "o toki e mi" diff --git a/layouts/_partials/footer.html b/layouts/_partials/footer.html index af29a03..e098ee9 100644 --- a/layouts/_partials/footer.html +++ b/layouts/_partials/footer.html @@ -31,11 +31,8 @@ {{ if .icon }} {{ end }} - {{ .text }} - {{ if .status }} - - {{ end }} - + {{ .text }} {{ else if .caption }} {{ else if .logo }} @@ -71,11 +68,8 @@ {{ if .icon }} {{ end }} - {{ .text }} - {{ if .status }} - - {{ end }} - + {{ .text }} {{ else if .caption }} {{ else if .logo }} diff --git a/layouts/_partials/head.html b/layouts/_partials/head.html index 00df7ed..9b5bf1b 100644 --- a/layouts/_partials/head.html +++ b/layouts/_partials/head.html @@ -9,27 +9,31 @@ {{ partialCached "head/css.html" . }} {{ partialCached "head/js.html" . }} -{{ partial "head/scripts.html" . }} - - -{{- if .Description }} - +{{ if not .IsHome }} + + -{{- end }} -{{- if .Params.MetaKeywords }} - -{{- end }} -{{- if .Params.MetaAuthor }} - -{{- end }} - - - - - - + +{{ end }} +{{ if eq .Name "Contact" }} + + + +{{ end }} diff --git a/layouts/_partials/head/scripts.html b/layouts/_partials/head/scripts.html deleted file mode 100644 index 10b7d59..0000000 --- a/layouts/_partials/head/scripts.html +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/layouts/_partials/page-tags.html b/layouts/_partials/page-tags.html index 49124fa..62a7f14 100644 --- a/layouts/_partials/page-tags.html +++ b/layouts/_partials/page-tags.html @@ -15,7 +15,7 @@ For a given taxonomy, renders a list of terms assigned to the page.
{{ $label }}: {{- range . }} - {{ .LinkTitle }} + {{ .LinkTitle }} {{- end }}
{{- end }} diff --git a/layouts/gln.html b/layouts/gln.html deleted file mode 100644 index 1f72f2b..0000000 --- a/layouts/gln.html +++ /dev/null @@ -1,39 +0,0 @@ -{{ define "main" }} - -

{{ .Title }}

- - {{ $dateMachine := .Lastmod | time.Format "2006-01-02T15:04:05-07:00" }} - {{ $dateHuman := .Lastmod | time.Format ":date_long" }} -
- {{ T "Updated" }} - -
-
-
-
-

{{ T "Location Details" }}

-

{{ T "Address" }}

-
{{ .Params.address }}
-

- {{ T "Telephone" }} -

-

- {{ .Params.telephone }} -

-

- GLN -

-

- {{ with resources.Get (printf "/images/gln/%s.png" .Params.gln) }} - {{ .Params.gln }} - {{ end }} -

-
-
-
- - {{ .Content }} - {{ partial "terms.html" (dict "taxonomy" "tags" "page" .) }} -
-
-{{ end }} diff --git a/layouts/posts/section.html b/layouts/posts/section.html index 9acad97..91f6100 100644 --- a/layouts/posts/section.html +++ b/layouts/posts/section.html @@ -2,11 +2,9 @@

{{ .Title }}

{{ .Content }} {{ range .Pages }} - {{ $dateMachineP := .PublishDate | time.Format "2006-01-02T15:04:05-07:00" }} - {{ $dateHumanP := .PublishDate | time.Format ":date_long" }}

{{ .LinkTitle }}

-

+

{{ .PublishDate }}

{{ .Summary }}
{{ end }} diff --git a/layouts/section.html b/layouts/section.html index bfc5202..748f2f5 100644 --- a/layouts/section.html +++ b/layouts/section.html @@ -1,13 +1,10 @@ {{ define "main" }} -

{{ .Title }}

-{{ .Content }} -{{ range .Pages }} -{{ $dateMachineP := .PublishDate | time.Format "2006-01-02T15:04:05-07:00" }} -{{ $dateHumanP := .PublishDate | time.Format ":date_long" }} -
-

{{ .LinkTitle }}

-

- {{ .Summary }} -
-{{ end }} +

{{ .Title }}

+ {{ .Content }} + {{ range .Pages }} +
+

{{ .LinkTitle }}

+ {{ .Summary }} +
+ {{ end }} {{ end }} diff --git a/layouts/term.html b/layouts/term.html index bfc5202..c2e7875 100644 --- a/layouts/term.html +++ b/layouts/term.html @@ -1,13 +1,7 @@ {{ define "main" }} -

{{ .Title }}

-{{ .Content }} -{{ range .Pages }} -{{ $dateMachineP := .PublishDate | time.Format "2006-01-02T15:04:05-07:00" }} -{{ $dateHumanP := .PublishDate | time.Format ":date_long" }} -
-

{{ .LinkTitle }}

-

- {{ .Summary }} -
-{{ end }} +

{{ .Title }}

+ {{ .Content }} + {{ range .Pages }} +

{{ .LinkTitle }}

+ {{ end }} {{ end }}