Skip to content

Commit 941b661

Browse files
oshliaeroshliaer
authored
Merge pull request #1 from oshliaer/update
Update to upstream #13e04b3694ea2d20a68cfbfaea42a8c565079809
2 parents af0dc2e + 13e04b3 commit 941b661

29 files changed

+6403
-3046
lines changed

‎.github/workflows/ci-test.yml

+11-7
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ jobs:
1616
strategy:
1717
matrix:
1818
node:
19-
- '14.x'
19+
- '20.x'
2020

2121
steps:
22-
- uses: actions/checkout@v3
23-
- uses: actions/setup-node@v3
22+
- uses: actions/checkout@v4
23+
- uses: actions/setup-node@v4
2424
with:
2525
node-version: ${{ matrix.node }}
2626

@@ -35,23 +35,25 @@ jobs:
3535
strategy:
3636
matrix:
3737
hugo:
38-
- '0.48' # min version
38+
- '0.54.0' # min version
3939
- '0.58.2' # https://github.com/gohugoio/hugoThemes/issues/682
4040
- '0.59.1' # last major version without goldmark renderer
4141
- '0.60.1' # first major version with goldmark renderer
4242
- '0.76.5' # https://github.com/gohugoio/hugo/issues/7822
4343
# - '0.80.0' # https://github.com/gohugoio/hugo/issues/8340
4444
- '0.86.1' # https://github.com/gohugoio/hugo/issues/9150
4545
- '0.93.3' # https://github.com/gohugoio/hugo/commit/837fdfdf45014e3d5ef3b00b01548b68a4489c5f
46+
- '0.123.8' # https://github.com/gohugoio/hugo/issues/12080
47+
- '0.132.2' # .Site.IsServer deprecation ERROR
4648
- 'latest'
4749
fail-fast: true
4850

4951
steps:
50-
- uses: actions/checkout@v3
52+
- uses: actions/checkout@v4
5153

5254
# https://github.com/peaceiris/actions-hugo (community action)
5355
- name: Run Hugo ${{ matrix.hugo }}
54-
uses: peaceiris/actions-hugo@v2
56+
uses: peaceiris/actions-hugo@v3
5557
with:
5658
hugo-version: ${{ matrix.hugo }}
5759
# extended: true
@@ -63,4 +65,6 @@ jobs:
6365
HUGO_VERSION=$(hugo version | grep -Eo '[0-9]+\.[0-9]+((\.[0-9]+)?)')
6466
# The option changed in 0.93.0: https://github.com/gohugoio/hugo/releases/tag/v0.93.0
6567
I18N_OPT=$([ $(ver $HUGO_VERSION) -lt $(ver 0.93.0) ] && echo "--i18n-warnings" || echo "--printI18nWarnings")
66-
HUGO_THEME="Mainroad" hugo --themesDir ../.. $I18N_OPT -v
68+
# The option deprecated in v0.114.0 (WARNs >= 0.120.0): https://github.com/gohugoio/hugo/releases/tag/v0.114.0
69+
LOG_OPT=$([ $(ver $HUGO_VERSION) -lt $(ver 0.114.0) ] && echo "--verbose" || echo "--logLevel info")
70+
HUGO_THEME="Mainroad" hugo --themesDir ../.. $I18N_OPT $LOG_OPT

‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ to those feedback, otherwise the PR will be closed after 2-4 weeks of inactivity
100100
### Pull Request Contribution Prerequisites
101101

102102
* You have Node & npm installed
103-
* You have Hugo installed at v0.48.0+
103+
* You have Hugo installed at v0.54.0+
104104
* You are familiar with Git
105105

106106
### Pull Request Process

‎README.md

+7-2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,13 @@ title = "Mainroad"
5656
languageCode = "en-us"
5757
paginate = "10" # Number of posts per page
5858
theme = "mainroad"
59-
disqusShortname = "" # Enable Disqus comments by entering your Disqus shortname
60-
googleAnalytics = "" # Enable Google Analytics by entering your tracking id
59+
disqusShortname = "" # DEPRECATED! Use .Services.Disqus.Shortname
60+
googleAnalytics = "" # DEPRECATED! Use .Services.googleAnalytics.ID
61+
62+
[services.disqus]
63+
shortname = "" # Enable Disqus by entering your Disqus shortname
64+
[services.googleAnalytics]
65+
ID = "" # Enable Google Analytics by entering your tracking ID
6166

6267
[Author] # Used in authorbox
6368
name = "John Doe"

‎assets/css/style.css

+6-11
Original file line numberDiff line numberDiff line change
@@ -1093,27 +1093,21 @@ textarea {
10931093

10941094
/* Search widget */
10951095
.widget-search__form {
1096-
display: block;
1097-
padding: 5%;
1098-
margin: 0 auto;
1096+
padding: 16px 24px;
10991097
background: #f5f5f5;
11001098
}
11011099

1102-
.widget-search__form .widget-search__submit {
1100+
.widget-search__submit[type=submit] {
11031101
display: none;
11041102
}
11051103

11061104
.widget-search__field {
1107-
position: relative;
1108-
display: block;
1109-
width: 90%;
1110-
padding: 8px;
1111-
margin: 0 auto;
1112-
font-size: 11px;
1105+
width: 100%;
1106+
padding: 6px 8px;
1107+
font-size: 13px;
11131108
cursor: pointer;
11141109
background: #fff;
11151110
border: 1px solid #ebebeb;
1116-
border-radius: 0;
11171111
outline-offset: -2px;
11181112
transition: none;
11191113
-webkit-appearance: none;
@@ -1122,6 +1116,7 @@ textarea {
11221116
.widget-search__field:active,
11231117
.widget-search__field:focus {
11241118
cursor: text;
1119+
outline: 2px solid #005fcc;
11251120
}
11261121

11271122
/* Social widget */

‎exampleSite/content/docs/getting-started.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ with the [Hugo](https://gohugo.io/) static site generator.
2222
## Installation
2323

2424
Before installing the **Mainroad** theme, make sure that you've
25-
[installed **Hugo** (version 0.48 or later)](https://gohugo.io/getting-started/quick-start/#step-1-install-hugo) and
25+
[installed **Hugo** (version 0.54.0 or later)](https://gohugo.io/getting-started/quick-start/#step-1-install-hugo) and
2626
[created a new site](https://gohugo.io/getting-started/quick-start/#step-2-create-a-new-site). To learn how to install
2727
Hugo, visit [Hugo Documentation](https://gohugo.io/getting-started/installing/).
2828

‎i18n/bg.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
# Search widget
4141
- id: search_placeholder
42-
translation: "ТЪРСЕНЕ…"
42+
translation: "Търсене…"
4343

4444
# Languages widget
4545
- id: languages_title

‎i18n/en.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
# Search widget
4141
- id: search_placeholder
42-
translation: "SEARCH…"
42+
translation: "Search…"
4343

4444
# Languages widget
4545
- id: languages_title

‎i18n/fi.yaml

+94
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
# General
2+
- id: read_more
3+
translation: "Lue enemmän…"
4+
5+
- id: menu_label
6+
translation: "Valikko"
7+
8+
- id: sidemenu_title
9+
translation: "Valikko"
10+
11+
# Post meta
12+
- id: meta_lastmod
13+
translation: "Viimeksi muutettu"
14+
15+
- id: meta_translations
16+
translation: "Käännökset"
17+
18+
# Table of Contents
19+
- id: toc_title
20+
translation: "Sisältöluettelo"
21+
22+
# Post nav
23+
- id: post_nav_prev
24+
translation: "Edellinen"
25+
26+
- id: post_nav_next
27+
translation: "Seuraava"
28+
29+
# Authorbox
30+
- id: authorbox_name
31+
translation: "Kirjoittaja {{ .Name }}"
32+
33+
# Sidebar
34+
- id: sidebar_warning
35+
translation: "VAROITUS"
36+
37+
- id: sidebar_recommendation
38+
translation: "Ystävällisesti aktivoi ainakin yksi sidebar widget."
39+
40+
# Search widget
41+
- id: search_placeholder
42+
translation: "Etsi…"
43+
44+
# Languages widget
45+
- id: languages_title
46+
translation: "Kieli"
47+
48+
# Categories widget
49+
- id: categories_title
50+
translation: "Kategoriat"
51+
52+
# Recent Posts widget
53+
- id: recent_title
54+
translation: "Viimeisimmät kirjoitukset"
55+
56+
# Social widget
57+
- id: social_title
58+
translation: "Sosiaalinen media"
59+
60+
# Tags List widget
61+
- id: tags_title
62+
translation: "Tagit"
63+
64+
# Footer
65+
- id: footer_credits
66+
translation:
67+
"Generoitu <a href=\"https://gohugo.io/\" rel=\"nofollow noopener\" target=\"_blank\">Hugo</a> och \
68+
<a href=\"https://github.com/Vimux/Mainroad/\" rel=\"nofollow noopener\" target=\"_blank\">Mainroad</a> teemalla."
69+
70+
# 404
71+
- id: 404_title
72+
translation: "404. Sivua ei löytynyt"
73+
74+
- id: 404_text
75+
translation:
76+
"Etsimäsi sivu näyttää olevan siirretty, poistettu tai sitä ei ole olemassa. Käytä hakua tai mene osoitteeseen"
77+
78+
- id: 404_linktext
79+
translation: "etusivulle"
80+
81+
# No posts empty state
82+
- id: noposts_warning_title
83+
translation: "Sinulla ei ole kirjoituksia vielä"
84+
85+
- id: noposts_warning_description
86+
translation:
87+
"Kun julkistat jotain mihin tahansa hakemistoon (sektio) <b>content</b> hakemiston alle niin se näkyy täällä. Vain yksi \
88+
sektio (eniten kirjoituksia) näkyy pääsivulle vakiona."
89+
90+
- id: noposts_warning_tip
91+
translation:
92+
"<b>Vihje:</b> Voit näyttää niin monta sektiota kuin haluat \
93+
<b><a href=\"https://gohugo.io/functions/where/#mainsections\" rel=\"nofollow noopener\" target=\"_blank\">mainSections</a></b> \
94+
konfiguraatioparametrilla."

‎i18n/hu.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
# Search widget
4141
- id: search_placeholder
42-
translation: "KERES…"
42+
translation: "Keres…"
4343

4444
# Languages widget
4545
- id: languages_title

‎i18n/id.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
# Search widget
4141
- id: search_placeholder
42-
translation: "CARI…"
42+
translation: "Cari…"
4343

4444
# Languages widget
4545
- id: languages_title

‎i18n/it.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
# Search widget
4141
- id: search_placeholder
42-
translation: "CERCA…"
42+
translation: "Cerca…"
4343

4444
# Languages widget
4545
- id: languages_title

‎i18n/nl.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
# Search widget
4141
- id: search_placeholder
42-
translation: "ZOEKEN…"
42+
translation: "Zoeken…"
4343

4444
# Languages widget
4545
- id: languages_title

‎i18n/pt-br.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
# Search widget
4141
- id: search_placeholder
42-
translation: "BUSCAR…"
42+
translation: "Buscar…"
4343

4444
# Languages widget
4545
- id: languages_title

‎i18n/pt.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
# Search widget
4141
- id: search_placeholder
42-
translation: "BUSCAR…"
42+
translation: "Buscar…"
4343

4444
# Languages widget
4545
- id: languages_title

‎i18n/ru.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
# Search widget
4141
- id: search_placeholder
42-
translation: "ПОИСК…"
42+
translation: "Поиск…"
4343

4444
# Languages widget
4545
- id: languages_title

‎i18n/sv.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
# Search widget
4141
- id: search_placeholder
42-
translation: "SÖK…"
42+
translation: "Sök…"
4343

4444
# Languages widget
4545
- id: languages_title

‎i18n/vi.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
# Search widget
4141
- id: search_placeholder
42-
translation: "TÌM KIẾM…"
42+
translation: "Tìm kiếm…"
4343

4444
# Languages widget
4545
- id: languages_title

‎layouts/_default/baseof.html

+7-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<head>
44
<meta charset="UTF-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1">
6-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
76
<title>{{ block "title" . }}{{ if not .IsHome }}{{ .Title }} - {{ end }}{{ .Site.Title }}{{ end }}</title>
87
<script>(function(d,e){d[e]=d[e].replace("no-js","js");})(document.documentElement,"className");</script>
98
<meta name="description" content="{{ if .IsHome }}{{ .Site.Params.description }}{{ else }}{{ .Params.Description }}{{ end }}">
@@ -36,12 +35,14 @@
3635
{{- end }}
3736

3837
<link rel="shortcut icon" href="{{ "favicon.ico" | relURL }}">
39-
{{- if not .Site.IsServer }}
40-
{{- if hasPrefix .Site.GoogleAnalytics "G-" }}
38+
{{- $server := "" }}
39+
{{- if gt (int (index (split hugo.Version ".") 1)) "120" }}
40+
{{ $server = hugo.IsServer }}
41+
{{- else }}
42+
{{ $server = .Site.IsServer }}
43+
{{- end -}}
44+
{{- if not $server }}
4145
{{ template "_internal/google_analytics.html" . }}
42-
{{- else }}
43-
{{ template "_internal/google_analytics_async.html" . }}
44-
{{- end }}
4546
{{- end }}
4647
</head>
4748
<body class="body">

‎layouts/partials/comments.html

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1-
{{ if and .Site.DisqusShortname (index .Params "comments" | default "true") (not .Site.IsServer) }}
1+
{{- $server := "" }}
2+
{{- if ge (int (index (split hugo.Version ".") 1)) "120" }}
3+
{{- $server = hugo.IsServer }}
4+
{{- else }}
5+
{{- $server = .Site.IsServer }}
6+
{{- end }}
7+
{{- if and .Site.Config.Services.Disqus.Shortname (index .Params "comments" | default "true") (not $server) }}
28
<section class="comments">
39
{{ template "_internal/disqus.html" . }}
410
</section>
5-
{{ end }}
11+
{{- end }}

‎layouts/partials/svg/author.svg

+1-1
Loading

‎layouts/partials/svg/category.svg

+1-1
Loading

‎layouts/partials/svg/email.svg

+1-1
Loading

‎layouts/partials/svg/files.svg

+1-1
Loading

‎layouts/partials/svg/tag.svg

+1-1
Loading

‎layouts/partials/svg/time.svg

+1-1
Loading

0 commit comments

Comments
 (0)