diff --git a/content/.directory b/content/.directory new file mode 100644 index 00000000..c0bc2fdc --- /dev/null +++ b/content/.directory @@ -0,0 +1,7 @@ +[Dolphin] +HeaderColumnWidths=733,143,94,163 +PreviewsShown=false +Timestamp=2022,4,11,18,0,21.096 +Version=4 +ViewMode=1 +VisibleRoles=Details_text,Details_size,Details_modificationtime,Details_type,Details_permissions,CustomizedDetails diff --git a/content/news/homepage/1.jpeg b/content/news/homepage/1.jpeg deleted file mode 100644 index d486f5c5..00000000 Binary files a/content/news/homepage/1.jpeg and /dev/null differ diff --git a/content/news/homepage/2.jpeg b/content/news/homepage/2.jpeg deleted file mode 100644 index 79c47963..00000000 Binary files a/content/news/homepage/2.jpeg and /dev/null differ diff --git a/themes/buha/assets/css/article.css b/themes/buha/assets/css/article.css index 9df48649..81151f16 100644 --- a/themes/buha/assets/css/article.css +++ b/themes/buha/assets/css/article.css @@ -4,6 +4,7 @@ article { margin-left: 1rem; background-color: var(--background); padding: 1rem; + align-items: stretch; margin-bottom: 2rem; border-radius: 10px; } diff --git a/themes/buha/assets/css/generator.css b/themes/buha/assets/css/generator.css index a6ef163a..8c1c1720 100644 --- a/themes/buha/assets/css/generator.css +++ b/themes/buha/assets/css/generator.css @@ -12,3 +12,7 @@ input, textarea { background-color: var(--background-body); color: var(--text-link) } + +#display { + white-space: pre; display: none; background: var(--background-body); padding: 1rem 0 1rem 1rem; margin-top: 1rem; +} diff --git a/themes/buha/assets/css/main.css b/themes/buha/assets/css/main.css index 96ec7cb6..319054e5 100644 --- a/themes/buha/assets/css/main.css +++ b/themes/buha/assets/css/main.css @@ -23,7 +23,6 @@ h1 { padding-right: 1rem; padding-bottom: 1rem; display: flex; - flex-direction: row; padding: 1rem; } @@ -38,11 +37,12 @@ aside { } section { + flex-grow: 1; + flex-shrink: 0; margin-left: 1rem; - display: flex; - flex-direction: column; - justify-content: flex-start; - margin-bottom: 1rem; + padding: 1rem; + align-items: stretch; + border-radius: 10px; } @keyframes color { diff --git a/themes/buha/layouts/_default/single.html b/themes/buha/layouts/_default/single.html index d31491c9..5da31dfe 100644 --- a/themes/buha/layouts/_default/single.html +++ b/themes/buha/layouts/_default/single.html @@ -12,7 +12,7 @@ {{ else if eq .Params.tool "nottranslated" }} {{ $partial = "layout/nottranslated" }} {{ end }} -
+
{{ partial $partial (dict "context" . "pic" $pic "content" .Content "partial_before" $partial_before "type" "article") }} -
+ {{ end }} diff --git a/themes/buha/layouts/partials/layout/article.html b/themes/buha/layouts/partials/layout/article.html index 92699f3f..da7bd620 100644 --- a/themes/buha/layouts/partials/layout/article.html +++ b/themes/buha/layouts/partials/layout/article.html @@ -27,8 +27,7 @@
{{ if and (ne .type "list") (.context.Resources.ByType "image") }}{{ end }} - {{ if ne .type "list" }}{{ end }} - {{ if eq .type "article" }}{{ end }} + {{ if and (ne .type "list") (.context.Resources.ByType "image") }}{{ end }}
{{ end }} {{- if or .context.Content .context.Summary -}} diff --git a/themes/buha/layouts/partials/layout/generator/form.html b/themes/buha/layouts/partials/layout/generator/form.html index 34bd89e7..8cef561a 100644 --- a/themes/buha/layouts/partials/layout/generator/form.html +++ b/themes/buha/layouts/partials/layout/generator/form.html @@ -35,7 +35,7 @@ {{ else if eq .input_type "results" }} - +
{{ else if eq .input_type "submit" }}
@@ -60,10 +60,9 @@ {{ end }} {{ end }} {{ else if eq .title "foundations" }} - {{ range $pages }} - {{- with .Params.foundations -}} - {{- $finale = $finale | append . -}} - {{ end }} + {{ range resources.Match "/foundations/*" }} + {{ $n := path.Base (strings.TrimSuffix (path.Ext .Name) .Name) }} + {{- $finale = $finale | append $n -}} {{ end }} {{ else }} {{ range $pages }}