From e8738e1ac449d2832e98743d19a7d912a5ca8463 Mon Sep 17 00:00:00 2001 From: Halfdan Date: Thu, 10 Nov 2022 14:48:26 +0100 Subject: [PATCH] Improvements in the site layout --- .../datacoop2020/assets/static/css/style.scss | 47 ++++++++------- .../datacoop2020/layouts/_default/baseof.html | 52 +++++++---------- .../datacoop2020/layouts/partials/head.html | 58 +++++++++---------- 3 files changed, 78 insertions(+), 79 deletions(-) diff --git a/themes/datacoop2020/assets/static/css/style.scss b/themes/datacoop2020/assets/static/css/style.scss index 90048ef..9cfa36c 100644 --- a/themes/datacoop2020/assets/static/css/style.scss +++ b/themes/datacoop2020/assets/static/css/style.scss @@ -65,7 +65,7 @@ body { background : var(--bg-color); color : var(--text-color); - font-family : space grotesk; + font-family : "Space Grotesk"; font-size : var(--base-font-size); line-height : 165%; text-align : left; @@ -139,6 +139,8 @@ main article { aside nav { position : sticky; top : var(--base-grid); + display : block; + min-width : 200px; } aside nav ol { @@ -182,7 +184,7 @@ aside header a img { @media(max-width:1000px) { :root { --base-grid : 40px; - --base-font-size : 30px; + --base-font-size : 20px; } body { @@ -201,6 +203,8 @@ aside header a img { display : flex; flex-direction : row; justify-content : space-between; + align-items : center; + margin : calc(var(--base-grid) / 2) var(--base-grid); } aside header a { @@ -212,6 +216,10 @@ aside header a img { display : none; } + aside nav.display { + display : inherit; + } + aside #menu-toggle { display : initial; font-size : 3em; @@ -225,40 +233,39 @@ aside header a img { } header .nav-toggle { - cursor : pointer; - display : block; - height : var(--burger_size); - float : right; - margin : 40px 20px; + cursor : pointer; + display : block; + height : var(--burger_size); + float : right; } header .nav-toggle span { - display : block; - height : calc( ( var(--burger_size) / 3 ) / 2 ); - width : var(--burger_size); - background : var(--text-color); - margin-bottom : calc( ( var(--burger_size) / 3 ) / 2 ); + display : block; + height : calc( ( var(--burger_size) / 4 ) / 2 ); + width : var(--burger_size); + background : var(--text-color); + margin-bottom : calc( ( var(--burger_size) / 3 ) / 2 ); } header .nav-toggle span { - position : relative; - top : 0; - transition : all 0.4s; + position : relative; + top : 0; + transition : all 0.3s; } header .nav-toggle.display span#nav-toggle-b { - opacity : 0; + opacity : 0; } header .nav-toggle.display span#nav-toggle-a { - transform : rotate(45deg); - top : calc( var(--burger_size) / 3 ); + transform : rotate(45deg); + top : calc( var(--burger_size) / 4 ); } header .nav-toggle.display span#nav-toggle-c { - transform : rotate(-45deg); - top : calc( ( var(--burger_size) / 3 ) * -1 ); + transform : rotate(-45deg); + top : calc( ( var(--burger_size) / 3 ) * -1 ); } } diff --git a/themes/datacoop2020/layouts/_default/baseof.html b/themes/datacoop2020/layouts/_default/baseof.html index 6feb09a..7445feb 100644 --- a/themes/datacoop2020/layouts/_default/baseof.html +++ b/themes/datacoop2020/layouts/_default/baseof.html @@ -1,46 +1,38 @@ - -{{ partial "head.html" . }} - - - - -
-
- {{ block "main" . }}{{ end }} - -
-
- - + {{ partial "head.html" . }} + + +
+
+ {{ block "main" . }}{{ end }} +
+
- - - + diff --git a/themes/datacoop2020/layouts/partials/head.html b/themes/datacoop2020/layouts/partials/head.html index f3f4f60..f93498d 100644 --- a/themes/datacoop2020/layouts/partials/head.html +++ b/themes/datacoop2020/layouts/partials/head.html @@ -1,34 +1,34 @@ - - - - - {{ hugo.Generator }} + + + - {{ with .Site.Params.description }} - - {{ end }} + {{ hugo.Generator }} - - - - - - - + {{ with .Site.Params.description }} + + {{ end }} - {{ $style := resources.Get "static/css/style.scss" | resources.ToCSS | resources.Minify | resources.Fingerprint "sha512" }} - + + + + + + + - {{ if .IsHome }} - {{ $homepage := "Home" }} - {{ with .Site.Menus.nav }} - {{ range first 1 . }} - {{ $homepage = .Name }} - {{ end }} - {{ end }} - {{ $homepage }} | {{ .Site.Title }} - {{ else }} - {{ .Title }} | {{ .Site.Title }} - {{ end }} + {{ $style := resources.Get "static/css/style.scss" | resources.ToCSS | resources.Minify | resources.Fingerprint "sha512" }} + - + {{ if .IsHome }} + {{ $homepage := "Home" }} + {{ with .Site.Menus.nav }} + {{ range first 1 . }} + {{ $homepage = .Name }} + {{ end }} + {{ end }} + {{ $homepage }} | {{ .Site.Title }} + {{ else }} + {{ .Title }} | {{ .Site.Title }} + {{ end }} + +