Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 29 additions & 5 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
changelog:
exclude:
labels:
Expand All @@ -23,20 +24,43 @@ changelog:
labels:
- "type: fix"

- title: ":nail_care: Style, UI, UX"
- title: ":nail_care: Style"
labels:
- "type: style"

- title: ":book: Documentation"
labels:
- "type: docs"

- title: ":hammer: Build/Test Dependency Upgrades"
- title: ":test_tube: Test Dependency Upgrades"
labels:
- "type: dependencies"
- "dependencies"
- "type: test"

- title: ":dependabot: :link: Library Updates"
labels:
- "go"

- title: ":dependabot: :octocat: [Dev] GitHub Actions Dependency Upgrades"
labels:
- "github_actions"

- title: " :dependabot: :whale: [Dev] Docker Dependency Upgrades"
labels:
- "docker"

- title: ":dependabot: :clown_face: [Dev] Javascript Dependency Upgrades"
labels:
- "npm"

- title: ":dependabot: :snake: [Dev] Python Dependency Upgrades"
labels:
- "python"

- title: ":robot: [Dev] CI/Build Dependency Upgrades"
labels:
- "type: ci"
- "type: build"
- "type: chore"

- title: ":broom: General Housekeeping"
labels:
- "type: task"
2 changes: 1 addition & 1 deletion .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ permissions:

jobs:
label-pr:
uses: esacteksab/.github/.github/workflows/labeler.yml@a8c115bb45c00eb2afacce789b66672b5011b092 # v0.80.9
uses: esacteksab/.github/.github/workflows/labeler.yml@54c4917edc3b129da69d95127d0a73c296b9f344 # v0.80.11
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ permissions:

jobs:
precommit-reusable:
uses: esacteksab/.github/.github/workflows/pre-commit.yml@a8c115bb45c00eb2afacce789b66672b5011b092 # v0.80.9
uses: esacteksab/.github/.github/workflows/pre-commit.yml@54c4917edc3b129da69d95127d0a73c296b9f344 # v0.80.11
2 changes: 1 addition & 1 deletion .github/workflows/spelling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ concurrency:

jobs:
typos-reusable:
uses: esacteksab/.github/.github/workflows/spelling.yml@a8c115bb45c00eb2afacce789b66672b5011b092 # v0.80.9
uses: esacteksab/.github/.github/workflows/spelling.yml@54c4917edc3b129da69d95127d0a73c296b9f344 # v0.80.11
4 changes: 2 additions & 2 deletions .mise.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
path = ".venv"

[tools]
pnpm = "latest"
hugo-extended = "v0.156.0"
pnpm = "latest"
hugo-extended = "v0.159.1"
4 changes: 1 addition & 3 deletions .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"parser": "go-template",
"goTemplateBracketSpacing": true,
"bracketSameLine": true,
"embeddedLanguageFormatting": "off",
"htmlWhitespaceSensitivity": "css"
}
},
Expand All @@ -33,8 +32,7 @@
}
}
],
"tailwindStylesheet": "./assets/css/*.css",
"tailwindConfig": "./tailwind.config.js",
"tailwindStylesheet": "./assets/css/prettier-tailwind.css",
"tailwindFunctions": ["tw"],
"cssDeclarationSorterOrder": "smacss"
}
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,16 @@ Not a unique name I know.
- There has been some attention paid to a11y, but it may still fall short while I work through things.
- Early attempts at i18n.

### Prettier and Stylesheets

This repo configures Tailwind-aware formatting through `.prettierrc` using `tailwindStylesheet`, which points to `assets/css/prettier-tailwind.css`.

This is editor/build-tool metadata for formatting only. It is not part of the Hugo runtime stylesheet pipeline and is not shipped to browsers.

That file currently imports both `assets/css/main.css` and `assets/css/syntax.css`.

When adding additional stylesheets under `assets/css/`, update `assets/css/prettier-tailwind.css` to include them. If the location or filename of the combined stylesheet changes, also update the `tailwindStylesheet` value in `.prettierrc`.

## Installation

```bash
Expand Down
2 changes: 2 additions & 0 deletions assets/css/prettier-tailwind.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@import "./main.css";
@import "./syntax.css";
2 changes: 1 addition & 1 deletion config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ title = "My New Hugo Site"

[module.hugoVersion]
extended = true
min = "0.140.0"
min = "0.159.0"
43 changes: 30 additions & 13 deletions hugo_stats.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,52 +6,52 @@
"div",
"footer",
"h1",
"h2",
"h3",
"head",
"header",
"html",
"i",
"input",
"label",
"li",
"link",
"main",
"meta",
"nav",
"p",
"path",
"script",
"span",
"svg",
"title",
"ul"
],
"classes": [
"@container",
"active",
"bg-neutral-100",
"bg-neutral-50",
"bg-white",
"border-1",
"border-orange-500",
"bottom-8",
"close-menu",
"dark:bg-neutral-900",
"dark:bg-zinc-800",
"dark:border-amber-500",
"dark:text-neutral-50",
"fa-bars",
"fa-inverse",
"fa-square",
"fa-stack",
"fa-stack-1x",
"fa-stack-2x",
"fa-heart",
"fas",
"fixed",
"flex",
"flex-1",
"flex-col",
"flex-row",
"flex-row-reverse",
"flex-wrap",
"footer-links",
"h-6",
"hamburger",
"header-title",
"hidden",
"inline-flex",
"invisible",
"items-baseline",
"items-center",
"lg:mx-32",
Expand All @@ -60,6 +60,7 @@
"m-0",
"main",
"max-sm:mb-0",
"mb-1",
"mb-2",
"md:contents",
"md:flex",
Expand All @@ -69,22 +70,38 @@
"md:pr-4",
"md:pt-4",
"md:px-8",
"md:text-base",
"md:visible",
"menu-",
"menu-content",
"min-h-screen",
"mobile-menu",
"mt-2",
"mt-auto",
"nav-links",
"no-underline",
"overflow-x-hidden",
"p-0",
"p-2",
"pager",
"powered-by",
"pr-4",
"pt-8",
"px-2",
"relative",
"rounded",
"text-neutral-900",
"text-sm",
"text-sm/6"
"text-xs",
"tight",
"title_cursor",
"w-6",
"w-full",
"z-20"
],
"ids": [
"menu"
"body",
"mobile-menu"
]
}
}
15 changes: 9 additions & 6 deletions layouts/partials/footer.html
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
<ul class="list-inline footer-links inline-flex mt-2 mb-1">
{{- range .Site.Data.social.social_icons }}
{{- if isset $.Site.Params.Author .id }}
{{- with $.Site.Params.Author }}
{{- $author := . }}
{{- range $icon := hugo.Data.social.social_icons }}
{{- with index $author $icon.id }}
<li>
<a
{{ if .rel }}rel="{{ .rel }}" {{- end -}}
href="{{ printf .url (index $.Site.Params.Author .id) }}"
title="{{ .title }}"
{{ if $icon.rel }}rel="{{ $icon.rel }}" {{- end -}}
href="{{ printf $icon.url . }}"
title="{{ $icon.title }}"
target="_blank">
<span class="fa-stack md:fa-lg">
<i class="fas fa-square fa-stack-2x"></i>
<i class="{{ .icon }} fa-stack-1x fa-inverse"></i>
<i class="{{ $icon.icon }} fa-stack-1x fa-inverse"></i>
</span>
</a>
</li>
{{- end -}}
{{- end -}}
{{- end -}}
{{ if $.Site.Params.rss }}
{{- with $.OutputFormats.Get "RSS" }}
<li>
Expand Down
7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
{
"name": "simpl",
"version": "0.8.0",
"version": "0.9.0",
"description": "A simpl(e) Hugo Theme",
"author": "@esacteksab",
"packageManager": "pnpm@10.33.0",
"workspaces": [
"packages/hugoautogen"
],
"packageManager": "pnpm@10.33.0+sha512.10568bb4a6afb58c9eb3630da90cc9516417abebd3fabbe6739f0ae795728da1491e9db5a544c76ad8eb7570f5c4bb3d6c637b2cb41bfdcdb47fa823c8649319",
"scripts": {
"postcss": "postcss ./assets/css/main.css --config ./postcss.config.js -r"
},
Expand Down
7 changes: 7 additions & 0 deletions packages/hugoautogen/hugo_packagemeta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"sum": "7ad70783d3a16fc3",
"dependencySources": {
"dependencies": {},
"devDependencies": {}
}
}
6 changes: 6 additions & 0 deletions packages/hugoautogen/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "simpl",
"version": "0.9.0",
"dependencies": {},
"devDependencies": {}
}
Empty file added pnpm-workspace.yaml
Empty file.
Loading