From 3dc2ebc738a452c5e60609f7a052b4ec5348d17f Mon Sep 17 00:00:00 2001
From: Alexander Bilz <mail@alexbilz.com>
Date: Sun, 06 Mar 2022 17:34:08 +0000
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into feature/improve-portfolio-metadata-styling
---
layouts/_default/baseof.html | 2 +-
layouts/_default/single.html | 2 +-
assets/scss/partials/components/_archive.scss | 1 +
assets/scss/partials/components/_portfolio.scss | 1 -
layouts/portfolio/list.html | 2 +-
layouts/partials/series.html | 2 +-
assets/scss/partials/components/_post.scss | 3 ---
layouts/index.html | 2 +-
8 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/assets/scss/partials/components/_archive.scss b/assets/scss/partials/components/_archive.scss
index 7a58f63..ce98d6b 100644
--- a/assets/scss/partials/components/_archive.scss
+++ b/assets/scss/partials/components/_archive.scss
@@ -32,6 +32,7 @@
&-title {
display: inline-block;
flex: 0.96;
+ text-transform: uppercase;
@include themed() {
color: t('primary');
diff --git a/assets/scss/partials/components/_portfolio.scss b/assets/scss/partials/components/_portfolio.scss
index 148d14e..1396def 100644
--- a/assets/scss/partials/components/_portfolio.scss
+++ b/assets/scss/partials/components/_portfolio.scss
@@ -27,7 +27,6 @@
}
&__title {
- text-transform: uppercase;
letter-spacing: 1px;
font-size: 2.6rem;
line-height: 1;
diff --git a/assets/scss/partials/components/_post.scss b/assets/scss/partials/components/_post.scss
index 27712cc..ed1333d 100644
--- a/assets/scss/partials/components/_post.scss
+++ b/assets/scss/partials/components/_post.scss
@@ -97,7 +97,6 @@
$font-size-h1: 3.6rem;
font-size: $font-size-h1;
- text-transform: uppercase;
letter-spacing: 1px;
line-height: 1;
@@ -115,7 +114,6 @@
font-size: $font-size-h2;
font-weight: 600;
- text-transform: uppercase;
letter-spacing: 1px;
line-height: 1;
@@ -133,7 +131,6 @@
font-size: $font-size-h3;
font-weight: 600;
- text-transform: uppercase;
letter-spacing: 1px;
line-height: 1;
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index cd973a8..6043511 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -7,7 +7,7 @@
>
{{- partial "head.html" . -}}
<body
- {{ if eq .Params.displayMode "dark" }}
+ {{ if eq .Site.Params.displayMode "dark" }}
class="body theme--dark"
{{ else }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index e6482e6..e0954b2 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -15,7 +15,7 @@
{{ end }}
<div class="post__content">
- <h1>{{ .Title }}</h1>
+ <h1>{{ title .Title }}</h1>
{{ if or (eq .Type "post") (eq .Type .Site.Params.postSectionName) }}
<ul class="post__meta">
<li class="post__meta-item">
diff --git a/layouts/index.html b/layouts/index.html
index 36dd0dc..ef29d79 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -57,7 +57,7 @@
{{ end }}
<div class="post__content">
- <h3><a href="{{ .RelPermalink }}">{{ .Title }}</a></h3>
+ <h3><a href="{{ .RelPermalink }}">{{ upper .Title }}</a></h3>
{{ if .Site.Params.fullPostContent }}
{{ .Content }}
diff --git a/layouts/partials/series.html b/layouts/partials/series.html
index 380be46..eed27ea 100644
--- a/layouts/partials/series.html
+++ b/layouts/partials/series.html
@@ -4,7 +4,7 @@
<h3>Posts in this Series</h3>
<ul>
{{ range $related }}
- <li><a href="{{ .Page.RelPermalink }}">{{ .Page.Title }}</a></li>
+ <li><a href="{{ .Page.RelPermalink }}">{{ title .Page.Title }}</a></li>
{{ end }}
</ul>
diff --git a/layouts/portfolio/list.html b/layouts/portfolio/list.html
index ca8a59a..1e1d3ca 100644
--- a/layouts/portfolio/list.html
+++ b/layouts/portfolio/list.html
@@ -9,7 +9,7 @@
{{ end }}"
>
- <h2 class="portfolio__title">{{ .title }}</h2>
+ <h2 class="portfolio__title">{{ title .title }}</h2>
{{ range $i, $p := .portfolioitem }}
<div class="portfolio">
{{ if .image }}
--
Gitblit v1.10.0