diff --git a/themes/lumbung-theme/layouts/_default/list.html b/themes/lumbung-theme/layouts/_default/list.html index cd6e480..ba88fdd 100644 --- a/themes/lumbung-theme/layouts/_default/list.html +++ b/themes/lumbung-theme/layouts/_default/list.html @@ -1,23 +1,32 @@ {{ define "main" }} -
+
- {{ range .Pages }} -
-
-
-

{{ .Title }}

- -
- {{ if .Truncated }} -
- {{ .Summary }} -

Read More…

- {{ else }} -
- {{ end }} -
-
-
+ {{ range (.Paginator 13).Pages }} + + {{ if in .Params.categories "tv"}} + + {{- partial "video_box.html" . -}} + + {{ else if in .Params.categories "calendar" }} + + {{- partial "calendar_card.html" . -}} + + {{ else if in .Params.categories "network" }} + + {{- partial "network_card.html" . -}} + + {{ else }} + + {{- partial "card.html" . -}} + + {{ end }} + {{ end }} -
+ + + + + {{ end }} diff --git a/themes/lumbung-theme/layouts/index.html b/themes/lumbung-theme/layouts/index.html index b7872fc..546e4b7 100644 --- a/themes/lumbung-theme/layouts/index.html +++ b/themes/lumbung-theme/layouts/index.html @@ -1,7 +1,7 @@ {{ define "main" }}
- {{ range (.Paginator 10).Pages }} + {{ range (.Paginator 13).Pages }} {{ if in .Params.categories "tv"}} @@ -11,6 +11,10 @@ {{- partial "calendar_card.html" . -}} + {{ else if in .Params.categories "network" }} + + {{- partial "network_card.html" . -}} + {{ else }} {{- partial "card.html" . -}} diff --git a/themes/lumbung-theme/layouts/partials/calendar_card.html b/themes/lumbung-theme/layouts/partials/calendar_card.html index dca81c8..6c65f76 100644 --- a/themes/lumbung-theme/layouts/partials/calendar_card.html +++ b/themes/lumbung-theme/layouts/partials/calendar_card.html @@ -1,5 +1,6 @@ -
-
+{{ $t := (time .Params.event_end) }} +
+

{{ .Title }}

@@ -15,9 +16,9 @@
Duration: {{ .Params.duration }}
-
{{ .Params.location | markdownify }}
+
{{ .Params.location | markdownify }}
-
+
{{.Content}}
@@ -25,4 +26,5 @@
-
\ No newline at end of file +
+ \ No newline at end of file diff --git a/themes/lumbung-theme/layouts/partials/calendar_list.html b/themes/lumbung-theme/layouts/partials/calendar_list.html new file mode 100644 index 0000000..60bc5ca --- /dev/null +++ b/themes/lumbung-theme/layouts/partials/calendar_list.html @@ -0,0 +1,24 @@ +
+
+
+

{{ .Title }}

+
+
+ + {{ .Params.localized_begin | markdownify }} + +
+ + + + +
+
\ No newline at end of file diff --git a/themes/lumbung-theme/layouts/partials/network_card.html b/themes/lumbung-theme/layouts/partials/network_card.html new file mode 100644 index 0000000..bc21bb3 --- /dev/null +++ b/themes/lumbung-theme/layouts/partials/network_card.html @@ -0,0 +1,33 @@ +
+
+
+

{{ .Title }}

+ +
+ +
From {{ if .Params.author }}{{.Params.author}} at {{ end }}{{ .Params.feed_name }}
+ +
+ {{ with (index (.Resources.ByType "image") 0) }} + {{ $thumb := .Fit "540x360"}} +
+ {{ .Title }} +
+ {{ end }} +
+ {{ .Summary }} +
+ +
+ {{ if .Truncated }} + + {{ end }} + +
+
\ No newline at end of file diff --git a/themes/lumbung-theme/layouts/partials/test.html b/themes/lumbung-theme/layouts/partials/test.html new file mode 100644 index 0000000..83bb54f --- /dev/null +++ b/themes/lumbung-theme/layouts/partials/test.html @@ -0,0 +1,35 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/themes/lumbung-theme/static/css/main.css b/themes/lumbung-theme/static/css/main.css index f9664d7..a34a31f 100644 --- a/themes/lumbung-theme/static/css/main.css +++ b/themes/lumbung-theme/static/css/main.css @@ -93,9 +93,10 @@ body { } .entries{ - padding-top: 15%; + padding-top: 5%; } + /* base header & menu */ #top-menu{ @@ -105,6 +106,7 @@ body { width: 90%; z-index: 1; margin-top: 1em; + display: none; } .logo { @@ -142,6 +144,7 @@ body { .h-entry header { display: flex; border-bottom: 2px solid var(--border-color); + justify-content: space-between; } .h-entry header h2{ @@ -149,7 +152,8 @@ body { margin: 0; padding-right: 0.3em; padding-left: 0.3em; - border-right: 2px solid var(--border-color); + border-left: 2px solid var(--border-color); + flex-grow: 1; } .h-entry header h2:hover{ @@ -165,13 +169,21 @@ body { .h-entry header .header-metadata{ margin: 0; - padding: 0.5em; display: flex; flex-flow: column wrap; - font-size: 0.9em; - align-content: flex-end; + font-size: 0.8rem; } +.header-metadata .dt-published{ + padding: 0.5em 1.2em 0.5em 1.2em; +} + +.author.p-author { + border-top: 2px solid var(--border-color); + padding: 0.5em 1.2em 0.5em 1.2em; +} + + .p-summary.truncated.image { display: flex; flex-direction: row-reverse; @@ -219,6 +231,100 @@ footer.post-footer { font-size: 0.9rem; } +/* network cards */ + +.card.network{ + + border: 2px solid darkcyan; + box-shadow:1em 1em 0 #d2d1c8; + background-color: lightgreen; + max-width: 540px; + margin-bottom: 2em; + flex: auto; + margin: 0 3em 3em 0; + align-self: start; + color: darkcyan; + } + +.h-entry.network header { + display: flex; + border-bottom: 2px solid darkcyan; + flex-direction: row-reverse; +} + +.h-entry.network header h2{ + padding: 0.2em 0.5em 0.2em 0.5em; + margin: 0; + border-color: darkcyan; +} + +.h-entry.network header h2:hover{ + box-shadow: inset 4px 4px 0px darkcyan; + cursor: pointer; +} + +.h-entry.network header h2 a { + text-decoration: none; + color: darkcyan; +} + +.network .header-metadata { + align-items: center; +} + +.network .header-metadata .dt-published{ + padding-left: 1.2em; + min-width: 16ch; + border-bottom: 2px solid darkcyan; +} + +.network .filler { + min-height: 1rem; +} + +.network .author.p-author { + border-color: darkcyan; + padding: 0.5em 1.2em 0.5em 1.2em; +} + +.network footer.post-footer{ + border-top: 2px solid darkcyan; +} + +.network .summary-image { + border-bottom: 2px solid darkcyan; + border-right: none; +} + +.network .summary-image > img { + display: inherit; +} +.network .summary-text { + font-size: 14px; +} + +div.network-source{ + padding: 0.5em 1.2em 0.5em 1.2em; + border-bottom: 2px solid darkcyan; + font-size: 14px; + display: flex; + justify-content: space-between; +} + +.network-source a { + font-weight: bold; + color: darkcyan; +} + +.network .footer-filler{ + border: none; +} +.network .read-more { + border: none; + border-left: 2px solid darkcyan; +} + + /* calendar cards */ .card.calendar { @@ -234,23 +340,31 @@ footer.post-footer { } -.h-entry.calendar header { +.card.calendar.past { + opacity: 0.3; +} + +.card.calendar.past:hover { + opacity: 1; +} + +.h-event.calendar header { display: flex; border-bottom: 2px solid cornflowerblue; } -.h-entry.calendar header h2{ +.h-event.calendar header h2{ padding: 0.2em 0.5em 0.2em 0.5em; margin: 0; border-right: none; } -.h-entry.calendar header h2:hover{ +.h-event.calendar header h2:hover{ box-shadow: inset 4px 4px 0px royalblue; cursor: pointer; } -.h-entry.calendar header h2 a { +.h-event.calendar header h2 a { text-decoration: none; color: royalblue; }