From 9d1c7a8a59298295db8465a47c8e9722eeae1ca9 Mon Sep 17 00:00:00 2001 From: Laura Engelhardt Date: Mon, 2 Mar 2026 12:25:59 +0100 Subject: [PATCH 01/20] Consistently use banner on all pages and hide on mobile --- 404.md | 1 + contributor.md | 2 ++ publications.md | 2 ++ 3 files changed, 5 insertions(+) diff --git a/404.md b/404.md index 709a614..e9a333b 100644 --- a/404.md +++ b/404.md @@ -4,6 +4,7 @@ layout: page_serifheader description: This page could not be found permalink: "/404.html" banner: true +banner_hide_on_mobile: true --- The page you are looking for is not available. Please navigate through the menu above. diff --git a/contributor.md b/contributor.md index ab90c99..0967796 100644 --- a/contributor.md +++ b/contributor.md @@ -2,6 +2,8 @@ title: Contributing institutes layout: contributor permalink: "/contributors/" +banner: true +banner_hide_on_mobile: true --- The project 4C was started in 2002 at the Technical University of Munich under supervision of Prof. W. A. Wall diff --git a/publications.md b/publications.md index 341bae3..393eb8b 100644 --- a/publications.md +++ b/publications.md @@ -4,6 +4,8 @@ layout: page_serifheader description: Publications bodyClass: page-community permalink: "/publications/" +banner: true +banner_hide_on_mobile: true --- ## How to cite 4C From 7637bb30f5f393ccde2a21276ed5b2cfcc87e916 Mon Sep 17 00:00:00 2001 From: Laura Engelhardt Date: Mon, 2 Mar 2026 13:04:43 +0100 Subject: [PATCH 02/20] Unify serif- and non-serif versions --- 404.md | 2 +- _layouts/capabilities.html | 2 +- _layouts/page.html | 4 +- _layouts/page_serifheader.html | 15 ---- _sass/components/_content.scss | 12 +-- _sass/components/_content_serifheader.scss | 95 ---------------------- history.md | 2 +- publications.md | 2 +- 8 files changed, 12 insertions(+), 122 deletions(-) delete mode 100644 _layouts/page_serifheader.html delete mode 100644 _sass/components/_content_serifheader.scss diff --git a/404.md b/404.md index e9a333b..307403e 100644 --- a/404.md +++ b/404.md @@ -1,6 +1,6 @@ --- title: Page not found -layout: page_serifheader +layout: page description: This page could not be found permalink: "/404.html" banner: true diff --git a/_layouts/capabilities.html b/_layouts/capabilities.html index 2d0b883..c18389b 100644 --- a/_layouts/capabilities.html +++ b/_layouts/capabilities.html @@ -8,7 +8,7 @@

{{page.title}}

-
{{content}}
+
{{content}}
diff --git a/_layouts/page.html b/_layouts/page.html index 6a6e96d..54f34ac 100644 --- a/_layouts/page.html +++ b/_layouts/page.html @@ -6,10 +6,10 @@
+

{{page.title}}

-

{{page.title}}

{{content}}
-
+ \ No newline at end of file diff --git a/_layouts/page_serifheader.html b/_layouts/page_serifheader.html deleted file mode 100644 index 527c7ff..0000000 --- a/_layouts/page_serifheader.html +++ /dev/null @@ -1,15 +0,0 @@ ---- -layout: default -bodyClass: "page-basic" ---- - -
-
-
-

{{page.title}}

-
-
{{content}}
-
-
-
-
diff --git a/_sass/components/_content.scss b/_sass/components/_content.scss index d0783e8..6e94f33 100644 --- a/_sass/components/_content.scss +++ b/_sass/components/_content.scss @@ -20,22 +20,22 @@ color: $steel; } h1 { - font-family: $font-family-base; + font-family: $font-family-heading; font-size: 34px; line-height: 1.26; - font-weight: normal; + font-weight: bold; margin-top: 30px; - margin-bottom: 20px; } h2 { - font-family: $font-family-base; + font-family: $font-family-heading; font-size: 26px; - font-weight: normal; + font-weight: bold; line-height: 1.4; margin-top: 30px; + color: $black; } h3 { - font-family: $font-family-base; + font-family: $font-family-heading; font-size: 20px; line-height: 1.4; font-weight: normal; diff --git a/_sass/components/_content_serifheader.scss b/_sass/components/_content_serifheader.scss deleted file mode 100644 index c028424..0000000 --- a/_sass/components/_content_serifheader.scss +++ /dev/null @@ -1,95 +0,0 @@ -.content { - a { - text-decoration: underline; - } - img { - max-width: 100%; - height: auto; - margin-top: 20px; - margin-bottom: 20px; - } - strong { - font-width: bold; - } - em { - font-style: italic; - } - p { - font-family: $font-family-base; - line-height: 1.56; - color: $steel; - } - h1 { - font-family: $font-family-heading; - font-size: 34px; - line-height: 1.26; - font-weight: normal; - margin-top: 30px; - margin-bottom: 20px; - } - h2 { - font-family: $font-family-heading; - font-size: 26px; - font-weight: normal; - line-height: 1.4; - margin-top: 30px; - } - h3 { - font-family: $font-family-heading; - font-size: 20px; - line-height: 1.4; - font-weight: normal; - margin-top: 30px; - } - ul, - ol { - margin-bottom: 20px; - ul, - ol { - margin-bottom: 0; - } - } - ul { - list-style: disc; - } - ol { - list-style: decimal; - } - li { - margin-bottom: 5px; - line-height: 1.56; - margin-left: 40px; - margin-bottom: 20px; - font-size: 20px; - color: $steel; - } - hr { - border: none; - border-bottom: 1px solid $white-offset; - } - table { - width: 100%; - margin-top: 30px; - margin-bottom: 30px; - th, - td { - padding: 5px; - vertical-align: top; - border-top: 1px solid $white-offset; - } - thead th { - vertical-align: bottom; - border-bottom: 1px solid $white-offset; - text-align: left; - font-weight: bold; - } - tbody + tbody { - border-top: 1px solid $white-offset; - } - } - blockquote { - padding: 0 1em; - color: $steel; - border-left: 0.25em solid $secondary; - } -} diff --git a/history.md b/history.md index fac5cf0..30226df 100644 --- a/history.md +++ b/history.md @@ -1,6 +1,6 @@ --- title: History -layout: page_serifheader +layout: page description: "The more than 20 year long history of 4C" permalink: "/history/" banner: true diff --git a/publications.md b/publications.md index 393eb8b..3e413c9 100644 --- a/publications.md +++ b/publications.md @@ -1,6 +1,6 @@ --- title: Publications -layout: page_serifheader +layout: page description: Publications bodyClass: page-community permalink: "/publications/" From f30a83b6627f9c949470a9a0c7b9321dad086a31 Mon Sep 17 00:00:00 2001 From: Laura Engelhardt Date: Mon, 2 Mar 2026 13:12:05 +0100 Subject: [PATCH 03/20] Add padding around VIEW ALL EXAMPLES button --- _layouts/home.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/home.html b/_layouts/home.html index 81ca96c..f682c6b 100755 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -53,7 +53,7 @@

{{ capability.title }}

{% endif %} {% endfor %} -
+
Date: Mon, 2 Mar 2026 13:36:28 +0100 Subject: [PATCH 04/20] Unify scattered heading definitions Apply improved heading margins Remove header wrappings where not applicable --- _includes/footer.html | 2 +- _sass/components/_content.scss | 22 ----------------- _sass/components/_footer.scss | 1 + _sass/components/_headings.scss | 27 +++++++++++++++++++++ _sass/components/_intro.scss | 21 ---------------- _sass/components/_type.scss | 43 --------------------------------- assets/css/style.scss | 2 +- 7 files changed, 30 insertions(+), 88 deletions(-) create mode 100644 _sass/components/_headings.scss delete mode 100644 _sass/components/_type.scss diff --git a/_includes/footer.html b/_includes/footer.html index 94b47fb..9ca939b 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -3,7 +3,7 @@