diff --git a/css/main.3192fee1af5ccf8af82c0b58a62586fea02433e2bf9d3464e328346eeafc8a3e.css b/css/main.3192fee1af5ccf8af82c0b58a62586fea02433e2bf9d3464e328346eeafc8a3e.css new file mode 100644 index 0000000..fabb652 --- /dev/null +++ b/css/main.3192fee1af5ccf8af82c0b58a62586fea02433e2bf9d3464e328346eeafc8a3e.css @@ -0,0 +1,1200 @@ +@charset "UTF-8"; +/* + * Fonts + */ +/* + * Commented out until I decide to buy a licence for Input Mono. + * + * @font-face { + * font-family: "Input Mono"; + * src: url(/fonts/InputMono-Regular.ttf); + * } + */ +@font-face { + font-family: Domitian; + src: url("/fonts/Domitian-Roman.woff2") format("woff2"); } + +@font-face { + font-family: Domitian; + src: url("/fonts/Domitian-Bold.woff2") format("woff2"); + font-weight: bold; } + +@font-face { + font-family: Domitian; + src: url("/fonts/Domitian-Italic.woff2") format("woff2"); + font-style: italic; } + +@font-face { + font-family: Domitian; + src: url("/fonts/Domitian-BoldItalic.woff2") format("woff2"); + font-weight: bold; + font-style: italic; } + +/* + * Base + */ +html { + font-size: 16px; + color: #020202; + background-color: #fffff0; + font-family: "Domitian", "Palatino Linotype", "Book Antiqua", palatino, garamond, serif; } + +h1, +h2, +h3, +h4, +h5, +h6 { + font-weight: normal; + margin: 0; } + +a { + text-decoration-skip-ink: auto; + color: #020202; + text-decoration: underline; + opacity: 0.8; } + a:hover { + text-decoration: none; + opacity: 1; } + +/* + * Quotations + */ +q:lang(en) { + quotes: "‘" "’" "“" "”"; } + +/* + * Citations + */ +cite, +cite.book, +cite.film, +cite.tv-show, +cite.comic, +cite.podcast, +cite.album, +cite.report { + font-style: italic; } + +cite.book--proper-noun { + font-style: inherit; } + +cite.legislation, +cite.smallcite, +cite.comic-strip, +cite.short-story, +cite.article, +cite.episode, +cite.video, +cite.chapter, +cite.software, +cite.website, +cite.campaign, +cite.song, +cite.speech, +cite.course, +cite.presentation { + font-style: normal; } + +cite.smallcite::before, +cite.article::before, +cite.comic-strip::before, +cite.short-story::before, +cite.episode::before, +cite.video::before, +cite.chapter::before, +cite.song::before, +cite.poem::before, +cite.campaign::before, +cite.speech::before, +cite.course::before, +cite.presentation::before { + content: "“"; } + +cite.smallcite::after, +cite.article::after, +cite.comic-strip::after, +cite.short-story::after, +cite.episode::after, +cite.video::after, +cite.chapter::after, +cite.song::after, +cite.poem::after, +cite.campaign::after, +cite.speech::after, +cite.course::after, +cite.presentation::after { + content: "”"; } + +cite.article--shortcite::before, +cite.article--shortcite::after { + content: none; } + +cite, +.cite { + font-style: italic; } + cite[itemtype$="Code"], cite[itemtype$="SocialMediaPosting"], cite[itemtype$="SoftwareApplication"], cite[itemtype$="WebSite"], cite[itemtype$="WebContent"], cite[itemtype$="CreativeWorkSeason"], cite[itemtype$="PodcastSeason"], cite[itemtype$="RadioSeason"], cite[itemtype$="TVSeason"], cite[itemtype$="CreativeWorkSeries"], cite[itemtype$="BookSeries"], cite[itemtype$="MovieSeries"], cite[itemtype$="VideoGameSeries"], cite[itemtype$="Legislation"], cite--inherit, + .cite[itemtype$="Code"], + .cite[itemtype$="SocialMediaPosting"], + .cite[itemtype$="SoftwareApplication"], + .cite[itemtype$="WebSite"], + .cite[itemtype$="WebContent"], + .cite[itemtype$="CreativeWorkSeason"], + .cite[itemtype$="PodcastSeason"], + .cite[itemtype$="RadioSeason"], + .cite[itemtype$="TVSeason"], + .cite[itemtype$="CreativeWorkSeries"], + .cite[itemtype$="BookSeries"], + .cite[itemtype$="MovieSeries"], + .cite[itemtype$="VideoGameSeries"], + .cite[itemtype$="Legislation"], + .cite--inherit { + font-style: inherit; } + cite[itemtype$="Article"], cite[itemtype$="BlogPosting"], cite[itemtype$="NewsArticle"], cite[itemtype$="AnalysisNewsArticle"], cite[itemtype$="ReportageNewsArticle"], cite[itemtype$="OpinionNewsArticle"], cite[itemtype$="ScholarlyArticle"], cite[itemtype$="TechArticle"], cite[itemtype$="Chapter"], cite[itemtype$="Clip"], cite[itemtype$="MovieClip"], cite[itemtype$="RadioClip"], cite[itemtype$="TVClip"], cite[itemtype$="VideoGameClip"], cite[itemtype$="Comment"], cite[itemtype$="Course"], cite[itemtype$="DigitalDocument"], cite[itemtype$="NoteDigitalDocument"], cite[itemtype$="PresentationDigitalDocument"], cite[itemtype$="TextDigitalDocument"], cite[itemtype$="Episode"], cite[itemtype$="PodcastEpisode"], cite[itemtype$="RadioEpisode"], cite[itemtype$="TVEpisode"], cite[itemtype$="MusicRecording"], cite[itemtype$="MusicComposition"], cite[itemtype$="Message"], cite--enquote, + .cite[itemtype$="Article"], + .cite[itemtype$="BlogPosting"], + .cite[itemtype$="NewsArticle"], + .cite[itemtype$="AnalysisNewsArticle"], + .cite[itemtype$="ReportageNewsArticle"], + .cite[itemtype$="OpinionNewsArticle"], + .cite[itemtype$="ScholarlyArticle"], + .cite[itemtype$="TechArticle"], + .cite[itemtype$="Chapter"], + .cite[itemtype$="Clip"], + .cite[itemtype$="MovieClip"], + .cite[itemtype$="RadioClip"], + .cite[itemtype$="TVClip"], + .cite[itemtype$="VideoGameClip"], + .cite[itemtype$="Comment"], + .cite[itemtype$="Course"], + .cite[itemtype$="DigitalDocument"], + .cite[itemtype$="NoteDigitalDocument"], + .cite[itemtype$="PresentationDigitalDocument"], + .cite[itemtype$="TextDigitalDocument"], + .cite[itemtype$="Episode"], + .cite[itemtype$="PodcastEpisode"], + .cite[itemtype$="RadioEpisode"], + .cite[itemtype$="TVEpisode"], + .cite[itemtype$="MusicRecording"], + .cite[itemtype$="MusicComposition"], + .cite[itemtype$="Message"], + .cite--enquote { + font-style: normal; } + cite[itemtype$="Article"]::before, cite[itemtype$="BlogPosting"]::before, cite[itemtype$="NewsArticle"]::before, cite[itemtype$="AnalysisNewsArticle"]::before, cite[itemtype$="ReportageNewsArticle"]::before, cite[itemtype$="OpinionNewsArticle"]::before, cite[itemtype$="ScholarlyArticle"]::before, cite[itemtype$="TechArticle"]::before, cite[itemtype$="Chapter"]::before, cite[itemtype$="Clip"]::before, cite[itemtype$="MovieClip"]::before, cite[itemtype$="RadioClip"]::before, cite[itemtype$="TVClip"]::before, cite[itemtype$="VideoGameClip"]::before, cite[itemtype$="Comment"]::before, cite[itemtype$="Course"]::before, cite[itemtype$="DigitalDocument"]::before, cite[itemtype$="NoteDigitalDocument"]::before, cite[itemtype$="PresentationDigitalDocument"]::before, cite[itemtype$="TextDigitalDocument"]::before, cite[itemtype$="Episode"]::before, cite[itemtype$="PodcastEpisode"]::before, cite[itemtype$="RadioEpisode"]::before, cite[itemtype$="TVEpisode"]::before, cite[itemtype$="MusicRecording"]::before, cite[itemtype$="MusicComposition"]::before, cite[itemtype$="Message"]::before, cite--enquote::before, + .cite[itemtype$="Article"]::before, + .cite[itemtype$="BlogPosting"]::before, + .cite[itemtype$="NewsArticle"]::before, + .cite[itemtype$="AnalysisNewsArticle"]::before, + .cite[itemtype$="ReportageNewsArticle"]::before, + .cite[itemtype$="OpinionNewsArticle"]::before, + .cite[itemtype$="ScholarlyArticle"]::before, + .cite[itemtype$="TechArticle"]::before, + .cite[itemtype$="Chapter"]::before, + .cite[itemtype$="Clip"]::before, + .cite[itemtype$="MovieClip"]::before, + .cite[itemtype$="RadioClip"]::before, + .cite[itemtype$="TVClip"]::before, + .cite[itemtype$="VideoGameClip"]::before, + .cite[itemtype$="Comment"]::before, + .cite[itemtype$="Course"]::before, + .cite[itemtype$="DigitalDocument"]::before, + .cite[itemtype$="NoteDigitalDocument"]::before, + .cite[itemtype$="PresentationDigitalDocument"]::before, + .cite[itemtype$="TextDigitalDocument"]::before, + .cite[itemtype$="Episode"]::before, + .cite[itemtype$="PodcastEpisode"]::before, + .cite[itemtype$="RadioEpisode"]::before, + .cite[itemtype$="TVEpisode"]::before, + .cite[itemtype$="MusicRecording"]::before, + .cite[itemtype$="MusicComposition"]::before, + .cite[itemtype$="Message"]::before, + .cite--enquote::before { + content: "“"; } + cite[itemtype$="Article"]::after, cite[itemtype$="BlogPosting"]::after, cite[itemtype$="NewsArticle"]::after, cite[itemtype$="AnalysisNewsArticle"]::after, cite[itemtype$="ReportageNewsArticle"]::after, cite[itemtype$="OpinionNewsArticle"]::after, cite[itemtype$="ScholarlyArticle"]::after, cite[itemtype$="TechArticle"]::after, cite[itemtype$="Chapter"]::after, cite[itemtype$="Clip"]::after, cite[itemtype$="MovieClip"]::after, cite[itemtype$="RadioClip"]::after, cite[itemtype$="TVClip"]::after, cite[itemtype$="VideoGameClip"]::after, cite[itemtype$="Comment"]::after, cite[itemtype$="Course"]::after, cite[itemtype$="DigitalDocument"]::after, cite[itemtype$="NoteDigitalDocument"]::after, cite[itemtype$="PresentationDigitalDocument"]::after, cite[itemtype$="TextDigitalDocument"]::after, cite[itemtype$="Episode"]::after, cite[itemtype$="PodcastEpisode"]::after, cite[itemtype$="RadioEpisode"]::after, cite[itemtype$="TVEpisode"]::after, cite[itemtype$="MusicRecording"]::after, cite[itemtype$="MusicComposition"]::after, cite[itemtype$="Message"]::after, cite--enquote::after, + .cite[itemtype$="Article"]::after, + .cite[itemtype$="BlogPosting"]::after, + .cite[itemtype$="NewsArticle"]::after, + .cite[itemtype$="AnalysisNewsArticle"]::after, + .cite[itemtype$="ReportageNewsArticle"]::after, + .cite[itemtype$="OpinionNewsArticle"]::after, + .cite[itemtype$="ScholarlyArticle"]::after, + .cite[itemtype$="TechArticle"]::after, + .cite[itemtype$="Chapter"]::after, + .cite[itemtype$="Clip"]::after, + .cite[itemtype$="MovieClip"]::after, + .cite[itemtype$="RadioClip"]::after, + .cite[itemtype$="TVClip"]::after, + .cite[itemtype$="VideoGameClip"]::after, + .cite[itemtype$="Comment"]::after, + .cite[itemtype$="Course"]::after, + .cite[itemtype$="DigitalDocument"]::after, + .cite[itemtype$="NoteDigitalDocument"]::after, + .cite[itemtype$="PresentationDigitalDocument"]::after, + .cite[itemtype$="TextDigitalDocument"]::after, + .cite[itemtype$="Episode"]::after, + .cite[itemtype$="PodcastEpisode"]::after, + .cite[itemtype$="RadioEpisode"]::after, + .cite[itemtype$="TVEpisode"]::after, + .cite[itemtype$="MusicRecording"]::after, + .cite[itemtype$="MusicComposition"]::after, + .cite[itemtype$="Message"]::after, + .cite--enquote::after { + content: "”"; } + cite--normal, + .cite--normal { + font-style: normal !important; } + cite--normal::before, + .cite--normal::before { + content: none !important; } + cite--normal::after, + .cite--normal::after { + content: none !important; } + +/* + * Code + */ +pre { + padding-left: 1em; + border-left: 2px outset #020202; + display: inline-block; + overflow: hidden; + max-width: 50vw; + overflow: scroll; } + @media only screen and (min-width: 1248px) { + pre { + margin: 1em 2em; } } +code, +samp, +var, +pre { + font-family: "Input Mono", "Lucida Console", monaco, monospace; + font-size: 1em; } + +code, +samp, +var { + background-color: #d1d1d1; + border-radius: 5px; + padding: 2px; } + +samp { + display: block; + width: 80ch; + margin: 1em 4em; + border-left: 2px solid #ccc; + color: #333; } + +h1 code, +pre code, +pre samp, +pre var, +h1 samp, +h1 var, +.post-title code, +.post-title samp, +.post-title var { + background-color: transparent; + padding: 0; } + +.heading code, +.subheading code { + background-color: transparent; } + +kbd { + padding: 0.1em 0.6em; + border: 1px solid #ccc; + font-size: 11px; + font-family: Arial, Helvetica, sans-serif; + background-color: #f7f7f7; + color: #333; + box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; + border-radius: 3px; + display: inline-block; + margin: 0 0.1em; + text-shadow: 0 1px 0 white; + line-height: 1.4; + white-space: nowrap; } + +/* + * Special Text + */ +.pre-nominals, +.post-nominals { + font-size: 0.6em; + font-variant: small-caps; } + +.sic::after { + content: " [sic]"; + font-style: italic; } + +.latex { + display: inline !important; } + +.MathJax { + font-size: 1em !important; } + +:where([title]) { + text-decoration: underline; + text-decoration: underline dotted; } + +dfn { + font-variant: small-caps; } + +.site-container { + display: grid; + grid-template-columns: 2.5% 1fr 2.5%; + grid-template-rows: auto 1fr 2.5%; + grid-template-areas: "header header header" "page-container page-container page-container" "footer footer footer"; + min-height: calc(100vh - 4em); + border-top: 0; } + @media only screen and (min-width: 1248px) { + .site-container { + margin-bottom: 2em; + grid-template-areas: "header header header" ". page-container ." "footer footer footer"; + border: 2px solid black; + margin-left: 2em; + margin-right: 2em; } } + .site-container--homepage { + align-items: center; + grid-template-rows: auto 2.5%; + grid-template-areas: "page-container page-container page-container" "footer footer footer"; + margin-top: 2em; + margin-bottom: 2em; } + @media only screen and (min-width: 1248px) { + .site-container--homepage { + border: 2px solid black; + margin-left: 2em; + margin-right: 2em; + grid-template-areas: ". page-container ." "footer footer footer"; } } + .site-container--list, .site-container--section { + align-items: center; } + +.site-header { + display: grid; + grid-area: header; + grid-gap: 0; + grid-template-columns: 1fr; + grid-template-rows: auto auto auto auto; + grid-template-areas: "header-title" "header-tagline" "header-icons" "header-nav"; + top: 0; + left: 0; + width: 100%; + text-align: center; + z-index: 1; } + .site-header__title, .site-header__tagline, .site-header__icons, .site-header__nav { + background-color: #fffff0; + margin: 0; } + .site-header__title, .site-header__tagline, .site-header__icons { + padding: 5px 0; } + .site-header__title { + font-weight: normal; + grid-area: header-title; } + .site-header__tagline { + grid-area: header-tagline; } + .site-header__icons { + grid-area: header-icons; + border-bottom: 2px solid #020202; + margin-bottom: 0; } + .site-header__nav { + grid-area: header-nav; + margin: auto; + width: 100%; } + @media only screen and (min-width: 1248px) { + .site-header__nav { + width: 60%; } } + .site-header__nav ul { + margin-top: 0; + margin-bottom: 0; } + .site-header__nav ul li { + width: calc(100% / 3); + display: block; + float: left; + border-bottom: 2px solid black; + border-left: 1px solid black; + border-right: 1px solid black; + padding: 0.4em; + background-color: inherit; } + .site-header__nav ul li:hover { + background-color: #ffffd0; } + .site-header__nav ul li a { + width: 100%; + height: 100%; + display: block; } + .site-header__nav ul a:first-child li { + border-left: 2px solid black; } + .site-header__nav ul a:last-child li { + border-right: 2px solid black; } + +.site-footer { + grid-area: footer; + display: block; + width: 99%; + /* Overflows right of viewport otherwise */ + position: fixed; + bottom: 0; } + .site-footer p { + width: fit-content; + margin: auto; + text-align: center; + background: #fffff0; + border: 2px solid black; + padding: 0.4em; + border-bottom: none; + font-size: 1em; } + +.site-content { + grid-area: page-container; } + @media only screen and (min-width: 1248px) { + .site-content { + margin: 2em; } } +.feed-icon { + display: inline-block; + height: 1em; + width: 1em; + margin-bottom: 0.2em; } + +.site-header__icons a { + text-decoration: none; } + +.link--tile { + text-decoration: none; + box-sizing: border-box; + border: 2px solid transparent; } + .link--tile:hover { + border-color: #020202; } + +.site-container--section .item-tile.lazy { + background-image: none !important; } + +.item-tile { + display: grid; + min-height: 180px; + grid-template-columns: 5% auto 5%; + grid-template-rows: 2.5% auto 2.5%; + grid-template-areas: ". . ." ". tile-details ." ". . ."; + background-size: cover; + background-repeat: no-repeat; + background-position: center; } + @media (prefers-reduced-data: reduce) { + .item-tile { + background: none !important; } } + .item-tile__header { + text-align: center; + background-color: #020202; + opacity: 0.9; + display: grid; + grid-area: tile-details; + grid-template-columns: 5px auto 5px; + grid-template-rows: 0 1.8em auto auto; + grid-template-areas: ". . ." ". banner ." ". tile-title ." ". tile-subtitle ."; } + .item-tile--heading { + font-size: 3em; } + .item-tile--heading .item-tile__header { + opacity: 1; + grid-template-rows: auto; + grid-template-areas: ". tile-title ."; } + .item-tile--ohwhatohjeez { + border: 2px solid #ff8900; } + .item-tile--oldphaloskepsis { + border: 2px solid #003d52; } + .item-tile--omphaloskepsis { + border: 2px solid #fffff0; } + .item-tile__banner { + padding: 0.5em 1em 0; + grid-area: banner; + width: auto; + margin-left: auto; + margin-right: auto; + border-radius: 0 0 10px 10px; + text-align: center; + text-decoration: none !important; + line-height: 1em; + background-color: #ebebeb; } + .item-tile__title, .item-tile__subtitle { + color: #fffff0; + margin: 0; + font-weight: normal; } + .item-tile__title { + font-size: 1.4em; + line-height: 1em; + grid-area: tile-title; + align-self: center; } + .item-tile__title--long { + font-size: 1em; } + .item-tile__subtitle { + font-size: 1em; + grid-area: tile-subtitle; + align-self: start; } + +/* TODO: Not currently used */ +@media screen and (max-width: 480px) { + .table-scroller { + overflow-x: auto; + width: 320px; } } + +table { + border: 1px solid #020202; + margin: auto; } + table td { + padding: 0.5em 1em; + border: 1px solid #020202; } + +.blockquote { + padding-left: 1em; + border-left: 2px outset #020202; + display: inline-block; + max-width: 85%; } + @media only screen and (min-width: 1024px) { + .blockquote { + margin: 0.5em 1em; } } + .blockquote__body p:first-child { + margin-top: 0; } + .blockquote__body p:last-of-type { + margin-bottom: 0.5em; } + .blockquote__caption { + display: none; + text-align: right; + font-style: normal; + margin-left: 5em; + width: 80%; + orphans: 3; } + .blockquote__caption::before { + content: "—"; } + .blockquote--epigram { + font-size: 1.1em; + text-align: center; + display: block; + margin: 0 auto; + border-left: 0; + padding-left: 0; + width: 100%; + padding-top: 1em; + padding-bottom: 1.2em; + border-top: 2px outset #020202; + border-bottom: 2px inset #020202; } + .blockquote--epigram .blockquote__caption { + display: block; } + .blockquote--script .blockquote__body { + display: grid; + grid-template-columns: auto 1fr 0.2fr; + padding-bottom: 0.4em; + text-align: left; } + .blockquote--script .blockquote__body > p::before, .blockquote--script .blockquote__body > p::after { + content: none !important; } + .blockquote--script .blockquote__body > .script-line__character { + margin: 0.5em 2em 0.5em 0.5em; + font-style: italic; } + .blockquote--script .blockquote__body > .script-line__text { + grid-column-start: 2; + grid-column-end: 4; + margin: 0.5em; } + +.gallery { + display: grid; + grid-gap: 10px; + grid-template-columns: repeat(auto-fill, minmax(20%, 1fr)); + grid-template-rows: 1fr auto; + overflow-x: scroll; } + .gallery__caption { + grid-column-end: -1; + grid-column-start: 1; } + +.comment__author { + display: inline; + font-weight: bold; + margin-right: 0.5em; } + +.comment__publish-date { + display: inline; + font-style: italic; } + +.comment__source { + font-style: italic; + font-size: 0.8em; } + +.comment__subheading { + font-weight: bold; + margin-bottom: 1em; + margin-top: 1em; } + +.comment__thread, .comment__subthread { + list-style: none; + margin-top: 1em; + padding-left: 1em; + border-left: 1px dotted #020202; + margin-left: 0; } + +.site-content--homepage { + text-align: center; } + .site-content--homepage .page-title { + font-size: 2.5em; + margin-bottom: 1em; } + @media only screen and (min-width: 1248px) { + .site-content--homepage .page-title { + font-size: 4em; } } + .site-content--homepage .page-title span { + display: block !important; } + +.site-content--section, +.site-content--list { + display: grid; + grid-gap: 10px; + grid-template-columns: 0.2fr 1fr 0.2fr; + grid-template-rows: auto auto 60px; + justify-items: center; + align-items: center; + grid-template-areas: "list-page-header list-page-header list-page-header" "list-page-grid list-page-grid list-page-grid" "list-page-footer list-page-footer list-page-footer"; + margin-top: 5em; } + @media only screen and (min-width: 1248px) { + .site-content--section, + .site-content--list { + grid-template-areas: ". list-page-header ." "list-page-grid list-page-grid list-page-grid" ". list-page-footer ."; } } + .site-content--section .site-content__header, + .site-content--list .site-content__header { + grid-area: list-page-header; + text-align: center; } + .site-content--section .site-content__header .page-header__minor-links, + .site-content--list .site-content__header .page-header__minor-links { + text-align: center; + margin: auto; + overflow: auto; } + .site-content--section .site-content__header .page-header__minor-links ul, + .site-content--list .site-content__header .page-header__minor-links ul { + list-style: none; } + .site-content--section .site-content__header .page-header__minor-links ul li, + .site-content--list .site-content__header .page-header__minor-links ul li { + float: left; + margin: 0 1em; } + .site-content--section .site-content__header .page-header__minor-links ul li *, + .site-content--list .site-content__header .page-header__minor-links ul li * { + display: inline-block; } + .site-content--section .site-content__header .page-header__minor-links .minor-links__categories, + .site-content--list .site-content__header .page-header__minor-links .minor-links__categories { + width: 100%; + display: block; + font-size: 0.8em !important; + overflow: auto; } + @media only screen and (min-width: 1248px) { + .site-content--section .site-content__header .page-header__minor-links .minor-links__categories, + .site-content--list .site-content__header .page-header__minor-links .minor-links__categories { + font-size: 1em !important; } } + .site-content--section .site-content__header .page-header__minor-links .minor-links__years, + .site-content--list .site-content__header .page-header__minor-links .minor-links__years { + width: 100%; + display: block; + margin: auto; + width: fit-content; } + .site-content--section .site-content__header .page-header__minor-links .minor-links__years li, + .site-content--list .site-content__header .page-header__minor-links .minor-links__years li { + padding: 1em; } + @media only screen and (min-width: 1248px) { + .site-content--section .site-content__header .page-header__minor-links .minor-links__years li, + .site-content--list .site-content__header .page-header__minor-links .minor-links__years li { + padding: 0; } } + .site-content--section .site-content__body, + .site-content--list .site-content__body { + width: 100%; + display: grid; + grid-gap: 10px; + grid-area: list-page-grid; + grid-template-columns: 1fr; + grid-template-rows: repeat(8, 1fr); + justify-items: stretch; + align-items: stretch; } + @media only screen and (min-width: 768px) { + .site-content--section .site-content__body, + .site-content--list .site-content__body { + grid-template-columns: repeat(2, 1fr); + grid-template-rows: repeat(4, 1fr); } } + @media only screen and (min-width: 1248px) { + .site-content--section .site-content__body, + .site-content--list .site-content__body { + grid-template-columns: repeat(4, 1fr); + grid-template-rows: repeat(2, 1fr); } } + .site-content--section .site-content__body--list, + .site-content--list .site-content__body--list { + grid-template-columns: 1fr auto 1fr; + grid-template-rows: auto; + grid-template-areas: ". sections-list ."; } + .site-content--section .site-content__body--chart, + .site-content--list .site-content__body--chart { + grid-template-columns: 1em 100% 1fr; + grid-template-rows: 100%; + grid-template-areas: ". section-chart ."; } + .site-content--section .site-content__footer, + .site-content--list .site-content__footer { + grid-area: list-page-footer; } + +.site-content--single { + display: grid; + column-gap: 2em; + grid-template-columns: 0.4fr 0.6fr; + grid-template-rows: auto auto auto auto; } + .site-content--single .site-content__header, .site-content--single .site-content__footer { + display: grid; + grid-column-start: 1; + grid-column-end: 3; + background-color: #fffff0; + filter: brightness(80%); } + @media only screen and (min-width: 1248px) { + .site-content--single .site-content__header, .site-content--single .site-content__footer { + border: 2px solid #020202; + grid-column-end: 2; + padding: 2em; } } + .site-content--single .site-content__header { + grid-row-start: 1; + grid-row-end: 2; + overflow: auto; + border-bottom: 2px solid #020202; + margin-bottom: 2em; + padding-left: 1em; + padding-right: 1em; } + .site-content--single .site-content__header .article-header { + text-align: center; + background-color: #020202; + opacity: 0.8; + color: #fffff0; + display: grid; + grid-area: post-header-details; + grid-template-columns: 1fr; + padding: 20px; + grid-template-rows: 1fr auto auto 1fr; + justify-items: center; + align-items: center; + grid-template-areas: "." "post-title" "post-subtitle" "."; } + .site-content--single .site-content__header .article-header__series { + margin: 0 auto 1em; + font-size: 1.2em; } + .site-content--single .site-content__header .article-header__featured-image { + display: grid; + grid-template-columns: 15% 1fr 15%; + grid-template-rows: 20% 1fr 20%; + grid-template-areas: ". . ." ". post-header-details ." ". . ."; + background-position: center center; + background-repeat: no-repeat; + background-size: cover; + height: 40vh; + min-height: 380px; + width: 100%; + border: 2px solid #020202; } + .site-content--single .site-content__header .article-header__featured-image .attr { + background-color: #020202; + font-size: 0.7em; + color: #fffff0; + width: fit-content; + position: fixed; + padding: 0.2em 0.5em; + opacity: 0.8; + margin: 0 auto; } + .site-content--single .site-content__header .article-header__featured-image .attr a { + color: #fffff0; } + .site-content--single .site-content__header .article-header__title, .site-content--single .site-content__header .article-header__subtitle { + border-bottom: 2px inset #020202; + margin-top: 0; + margin-bottom: 0; + line-height: 1.2em; } + .site-content--single .site-content__header .article-header__subtitle { + font-size: 1.5em; } + .site-content--single .site-content__header .article-header__title-wrapper { + display: grid; + grid-area: post-header-details; + background-color: #020202; + opacity: 0.8; + text-align: center; + grid-template-columns: 1fr; + padding: 20px; + grid-template-rows: 1fr auto auto 1fr; + justify-items: center; + align-items: center; + grid-template-areas: "." "post-title" "post-subtitle" "."; } + .site-content--single .site-content__header .article-header__title-wrapper--no-title { + visibility: hidden; } + .site-content--single .site-content__header .article-header__title-wrapper .article-header__title, .site-content--single .site-content__header .article-header__title-wrapper .article-header__subtitle { + color: #fffff0; } + .site-content--single .site-content__header .article-header__title-wrapper .article-header__title { + grid-area: post-title; + font-weight: bold; } + .site-content--single .site-content__header .article-header__title-wrapper .article-header__title--long { + font-size: 1.5em; } + .site-content--single .site-content__header .article-header__title-wrapper .article-header__subtitle { + grid-area: post-subtitle; } + .site-content--single .site-content__header .article-header__word-count, .site-content--single .site-content__header .article-header__publish-date, .site-content--single .site-content__header .article-header__modified-date { + font-size: 1.2em; + margin: 0.2rem auto; } + .site-content--single .site-content__header .article-header__word-count { + margin-top: 1rem; } + .site-content--single .site-content__header .article-header__notes, .site-content--single .site-content__header .article-header__warnings { + width: 90%; + margin: 1.6em auto; + display: block; + padding-right: 1em; } + .site-content--single .site-content__header .article-header__notes ul, .site-content--single .site-content__header .article-header__warnings ul { + list-style: circle; } + .site-content--single .site-content__header .article-header__notes ul li, .site-content--single .site-content__header .article-header__warnings ul li { + margin: 0.5em 0; } + .site-content--single .site-content__header .article-header__notes { + background-color: #fffff0; + filter: brightness(70%); + border: 1px solid gray; } + .site-content--single .site-content__header .article-header__warnings { + border: 4px solid darkred; + background-color: #fc3a3a; + color: #fffff0; + font-weight: 500; } + .site-content--single .site-content__header .article-header__warnings ul { + list-style: disc; } + .site-content--single .site-content__header .article-header__table-of-contents ul { + list-style-type: arabic; + padding-left: 2em; + margin-bottom: 0; } + .site-content--single .site-content__header .article-header__table-of-contents ul.toc-list--appendices, .site-content--single .site-content__header .article-header__table-of-contents ul.toc-list--corrigenda { + list-style-type: circle; + margin-top: 0; } + .site-content--single .site-content__header .article-header__table-of-contents ul.toc-list--appendices ol, .site-content--single .site-content__header .article-header__table-of-contents ul.toc-list--corrigenda ol { + padding-left: 2em; + list-style-type: upper-latin !important; } + .site-content--single .site-content__header .article-header__table-of-contents ul li { + padding: 0.8em 0; } + @media only screen and (min-width: 1248px) { + .site-content--single .site-content__header .article-header__table-of-contents ul li { + padding: 0; } } + .site-content--single .site-content__body { + grid-column-start: 1; + grid-column-end: 3; + grid-row-start: 2; + grid-row-end: 3; + padding-left: 1em; + padding-right: 1em; + /* Temporary until I've fixed all the figures */ + overflow-x: clip; + /* TODO: remove once replaced in content with figures */ } + @media only screen and (min-width: 1248px) { + .site-content--single .site-content__body { + grid-row-start: 1; + grid-row-end: 5; + grid-column-start: 2; } } + .site-content--single .site-content__body .article__links { + background-color: #fffff0; + filter: brightness(80%); + width: 60%; + margin: auto; + margin-bottom: 1em; + border: 2px solid #020202; + padding: 1em; } + .site-content--single .site-content__body .article-body__summary { + display: none; } + .site-content--single .site-content__body .heading { + text-align: center; + font-size: 2em; + font-weight: bold; } + .site-content--single .site-content__body .heading::before, .site-content--single .site-content__body .heading::after { + content: " ~ "; } + .site-content--single .site-content__body .heading-anchor { + font-size: 0.6em; + line-height: 1em; + text-decoration: none; + vertical-align: middle; } + .site-content--single .site-content__body .subheading { + font-size: 1.6em; + border-bottom: 2px inset #020202; + margin-top: 0.5em; + margin-bottom: 0.5em; + line-height: 1.2em; + text-align: center; } + .site-content--single .site-content__body .subheading--appendices, .site-content--single .site-content__body .subheading--comments { + text-decoration: underline; + border-bottom: none; + font-size: 2em; + padding-top: 1em; + border-top: 1px dashed #020202; } + .site-content--single .site-content__body .subheading__subtitle { + font-size: 1em; + border-bottom: 1px dashed #020202; + line-height: 1em; + text-align: center; + font-weight: bold; + width: fit-content; + margin: 0 auto 1em auto; + padding: 0 3em 0.5em 0.4em; } + .site-content--single .site-content__body .subsubheading { + font-size: 1.4em; + border-bottom: 1px dashed #020202; + margin-top: 1em; + margin-bottom: 1em; + padding-bottom: 0.5em; + line-height: 1em; + text-align: left; + font-weight: bold; } + .site-content--single .site-content__body .subsubsubheading { + font-size: 1.2em; + margin-top: 1em; + margin-bottom: 1em; + line-height: 1em; + text-align: left; + font-weight: bold; } + .site-content--single .site-content__body .article-body__content > blockquote { + padding-left: 1em; + border-left: 2px outset #020202; + display: inline-block; + max-width: 85%; } + .site-content--single .site-content__body .article-body__content > blockquote footer { + text-align: right; + font-style: normal; + display: inline-block; + margin-left: 5em; } + .site-content--single .site-content__body .article-body__content > blockquote footer::before { + content: "—"; } + .site-content--single .site-content__body .article-body__content > blockquote p:first-child { + margin-top: 0; } + .site-content--single .site-content__body .article-body__content > blockquote p:last-of-type { + margin-bottom: 0.5em; } + .site-content--single .site-content__body .article-body__content > blockquote.script { + display: grid; + grid-template-columns: auto 1fr 0.2fr; + padding-bottom: 0.4em; + text-align: left; } + .site-content--single .site-content__body .article-body__content > blockquote.script > p::before, .site-content--single .site-content__body .article-body__content > blockquote.script > p::after { + content: none !important; } + .site-content--single .site-content__body .article-body__content > blockquote.script > .script-line__character { + grid-column: 1; + margin: 0.5em 2em 0.5em 0.5em; + font-style: italic; } + .site-content--single .site-content__body .article-body__content > blockquote.script > .script-line__text { + grid-column-start: 2; + grid-column-end: 4; + margin: 0.5em; } + .site-content--single .site-content__body .article-body__content > blockquote.script footer { + grid-column-start: 1; + grid-column-end: 3; } + .site-content--single .site-content__body .article-body__content > blockquote:not(.blockquote):first-child { + font-size: 1.2em; + text-align: center; + display: block; + margin: 0 auto; + border-left: 0; + padding-left: 0; + width: 100%; + padding-top: 1em; + padding-bottom: 1.2em; + border-top: 2px outset #020202; + border-bottom: 2px inset #020202; } + @media only screen and (min-width: 1024px) { + .site-content--single .site-content__body blockquote { + margin: 1em 2em; } } + .site-content--single .site-content__body img, + .site-content--single .site-content__body video { + max-width: 100%; + height: auto; + width: auto; + max-height: 50vh; + margin: auto; + display: block; } + .site-content--single .site-content__body .figure { + margin: 16px auto; + width: fit-content; } + .site-content--single .site-content__body .figure__image { + display: block; + width: auto; + max-width: 100%; + margin: auto; + height: auto; + max-height: 50vh; } + .site-content--single .site-content__body .figure__chart { + min-height: 40vh; + max-height: 60vh; } + .site-content--single .site-content__body .figure__caption { + height: auto; + margin: auto; + text-align: center; } + .site-content--single .site-content__body .figure__caption--no-height { + height: 0; } + .site-content--single .site-content__body .figure__caption .figcaption__caption { + font-size: 0.9em; + font-style: italic; } + .site-content--single .site-content__body .figure__caption .figcaption__title { + font-size: 0.95em; + font-weight: bold; } + .site-content--single .site-content__body .figure__caption .figcaption__attr { + background-color: #020202; + font-size: 0.7em; + color: #fffff0; + width: fit-content; + top: -2em; + position: relative; + padding: 0.2em 0.5em; + opacity: 0.8; + margin: 0 auto; } + .site-content--single .site-content__body .figure__caption .figcaption__attr + .figcaption__caption { + margin-top: -0.5em; } + .site-content--single .site-content__body .figure__caption .figcaption__full-size-link { + font-size: 0.6em; + padding-left: 1em; } + .site-content--single .site-content__body .figure__caption .figcaption__full-size-link::before { + content: "["; } + .site-content--single .site-content__body .figure__caption .figcaption__full-size-link::after { + content: "]"; } + .site-content--single .site-content__comments { + grid-column-start: 1; + grid-column-end: 3; + grid-row-start: 3; + grid-row-end: 4; + font-size: 0.8em; + padding-left: 1em; + padding-right: 1em; + margin-bottom: 2em; } + @media only screen and (min-width: 1248px) { + .site-content--single .site-content__comments { + grid-column-end: 2; + grid-row-start: 2; + grid-row-end: 3; + padding: 1em 3em 1em 2em; + border-right: 2px solid #020202; } } + .site-content--single .site-content__comments + .site_content__footer { + grid-row-start: 4; + grid-row-end: 5; } + @media only screen and (min-width: 1248px) { + .site-content--single .site-content__comments + .site_content__footer { + margin-bottom: 2em; + grid-row-start: 3; + grid-row-end: 4; } } + .site-content--single .site-content__footer { + grid-row-start: 3; + grid-row-end: 4; + border-top: 2px solid #020202; + padding-left: 1em; + padding-right: 1em; } + @media only screen and (min-width: 1248px) { + .site-content--single .site-content__footer { + margin-bottom: 2em; + grid-row-start: 2; + grid-row-end: 3; } } + .site-content--single .site-content__footer h2 { + margin: 1rem 0; } + .site-content--single .site-content__footer ul { + margin: 0; } + .site-content--single .site-content__footer ul li { + padding: 0.8em 0; } + @media only screen and (min-width: 1248px) { + .site-content--single .site-content__footer ul li { + padding: 0; } } + .site-content--single .site-content__footer section { + margin: 1rem 0; } + .site-content--single .site-content__footer #map { + border: 2px solid #020202; } + +.organisations-table { + grid-column-start: 1; + grid-column-end: 5; } + +#organisation-body .index { + display: grid; + grid-gap: 6px 5px; + grid-area: items; + grid-template-columns: repeat(4, 1fr); + grid-template-rows: 1fr; + justify-items: stretch; + align-items: stretch; + grid-template-areas: "item1 item2 item3 item4"; } + +#organisation-body .index .item:nth-child(1) { + grid-area: item1; } + +#organisation-body .index .item:nth-child(2) { + grid-area: item2; } + +#organisation-body .index .item:nth-child(3) { + grid-area: item3; } + +#organisation-body .index .item:nth-child(4) { + grid-area: item4; } + +#organisation-body details { + cursor: pointer; + border: 2px solid #020202; } + +#organisation-body summary { + text-align: center; } + #organisation-body summary::marker { + font-size: 2em; + padding-left: 2em; } + #organisation-body summary .subheading { + display: inline; + width: 95%; + border-bottom: none; } + #organisation-body summary .index { + border-top: 2px solid #020202; } + +#organisation-body #roles-timeline { + margin-bottom: 1em; } + +#organisation-body #timeline { + clear: both; } + #organisation-body #timeline > div > div { + height: unset !important; } + #organisation-body #timeline > div > div > div { + position: unset !important; + width: unset !important; + height: unset !important; } + #organisation-body #timeline > div > div > div > div:first-of-type { + overflow: unset !important; + position: unset !important; } + +#organisation-body #related .org-items { + margin-bottom: 1em; } + +.organisation-table__logo { + max-width: 5em; + max-height: 5em; } + +.timeline__legend > div { + width: 50%; + float: left; + text-align: center; } + +#hierarchy ul { + list-style: none; + padding-left: 1em; } + #hierarchy ul .hierarchy-item::before { + content: "\21B3"; + margin: 0 0.4em; } + #hierarchy ul .hierarchy-item--current { + font-weight: bold; } + #hierarchy ul .hierarchy-item--child::before { + content: "\2192"; } + +.timeline__legend .legend__button { + cursor: pointer; } + .timeline__legend .legend__button span { + margin: 0 1em; + display: inline-block; } + .timeline__legend .legend__button span.colour-square { + width: 1em; + height: 1em; + border-radius: 2.5px; + border: 1px solid #020202; } + .timeline__legend .legend__button span.colour-square--unpaid-current { + background-color: #bbbbb0; } + .timeline__legend .legend__button span.colour-square--unpaid-past { + background-color: #fffff0; } + .timeline__legend .legend__button span.colour-square--paid-current { + background-color: #bcbc7e; } + .timeline__legend .legend__button span.colour-square--paid-past { + background-color: #fcfca6; } + .timeline__legend .legend__button--disabled { + text-decoration: line-through; } + +.site-content__body--chart #timeline, .site-content__body--chart #map { + width: 100%; + max-width: 100%; + grid-area: section-chart; } + +.site-content__body--list .site-content__sections-list { + grid-area: sections-list; + display: block; + list-style: none; + margin: auto; + padding-left: 0; } + .site-content__body--list .site-content__sections-list li * { + display: inline-block; } + +/* @import "themes/dark"; */ diff --git a/images/feed-icon.svg b/images/feed-icon.svg index b1c7bbe..11fd98a 100644 Binary files a/images/feed-icon.svg and b/images/feed-icon.svg differ diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 58f0dbf..0734d4b 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -6,8 +6,7 @@ {{ define "header-scripts" }} {{ with .Params.locations }} - {{ $mapJS := resources.Get "js/leaflet.js" | fingerprint }} - + {{ end }} {{ end }} @@ -36,7 +35,7 @@ L.marker([{{ .lat }}, {{ .lon }}]).addTo(map); latLons.push([{{ .lat }}, {{ .lon }}]); {{ else }} - {{ warnf "Could not find lat-lon for %q (%q)" . $.File.Path }} + {{ erroridf "missing-lat-lon" "Could not find lat-lon for %q (%q)" . $.File.Path }} {{ end }} {{ end }} map.fitBounds(latLons); @@ -48,11 +47,10 @@ {{ end }} - {{ if in . "charts" }} - {{ $chartsCoreJS := resources.Get "js/chart.js" | fingerprint }} - {{ $chartsConfigJS := $.Page.Resources.GetMatch "charts-init" }} - - + {{ if in . "charts" }} + {{ $chartsConfigJS := $.Page.Resources.GetMatch "charts-init" | fingerprint }} + + {{ end }} {{ end }} {{ end }} diff --git a/layouts/blog/single.html b/layouts/blog/single.html index f16e193..3424aaf 100644 --- a/layouts/blog/single.html +++ b/layouts/blog/single.html @@ -6,8 +6,7 @@ {{ define "header-scripts" }} {{ with .Params.locations }} - {{ $mapJS := resources.Get "js/leaflet.js" | fingerprint }} - + {{ end }} {{ end }} @@ -36,10 +35,12 @@ L.marker([{{ .lat }}, {{ .lon }}]).addTo(map); latLons.push([{{ .lat }}, {{ .lon }}]); {{ else }} - {{ warnf "Could not find lat-lon for %q (%q)" . $.File.Path }} + {{ erroridf "missing-lat-lon" "Could not find lat-lon for %q (%q)" . $.File.Path }} {{ end }} {{ end }} + map.fitBounds(latLons); + if (map.getZoom() < 10) map.setZoom(10); {{ end }} {{ with .Params.scripts }} @@ -50,10 +51,9 @@ {{ end }} {{ end }} {{ if $.HasShortcode "chart" }} - {{ $chartsCoreJS := resources.Get "js/chart.js" | fingerprint }} - {{ $chartsConfigJS := $.Page.Resources.GetMatch "charts-init" }} - - + {{ $chartsConfigJS := $.Page.Resources.GetMatch "charts-init" | fingerprint }} + + {{ end }} {{ end }} @@ -255,7 +255,7 @@

Comments

{{ end }} {{ end }} diff --git a/layouts/cv/locations.html b/layouts/cv/locations.html index 2e8784f..6f5fd1c 100644 --- a/layouts/cv/locations.html +++ b/layouts/cv/locations.html @@ -5,31 +5,14 @@ {{ define "main-class" }}--section location-map{{ end }} {{ define "header-scripts" }} - + {{ end }} {{ define "footer-scripts" }} - + - - {{ end }} diff --git a/layouts/cv/organisations/section.html b/layouts/cv/organisations/section.html new file mode 100644 index 0000000..68916f5 --- /dev/null +++ b/layouts/cv/organisations/section.html @@ -0,0 +1,37 @@ +{{ define "title" }} + {{ .Page.Title | plainify }} | {{ .Site.Title }} +{{ end }} + +{{ define "main-class" }}--section layouts-cv-organisations-section{{ end }} + +{{ define "main-header" }} + {{ if .IsDescendant ( .GetPage "/cv/organisations" ) }} +
+
+ +
+
+ {{ else }} +
+

{{ .Title | safeHTML }}.

+ {{- .Content -}} +
+ {{ end }} +{{ end }} + +{{ define "main-body" }} + {{ with .GetPage "cv/organisations" }} + {{ partial "cv/organisations/items-table.html" . }} + {{ end }} +{{ end }} + +{{ define "main-footer" }} + +{{ end }} diff --git a/layouts/cv/section.html b/layouts/cv/section.html index f0d2953..e33cb26 100644 --- a/layouts/cv/section.html +++ b/layouts/cv/section.html @@ -8,8 +8,7 @@ {{ define "header-scripts" }} {{ if ( or ( eq .Type "cv" ) ( .IsDescendant ( .GetPage "/cv/organisations" ) ) ) }} - {{ $googleChartsJS := resources.Get "js/google-charts.js" | fingerprint }} - + {{ end }} {{ end }} @@ -24,22 +23,22 @@ var container = document.getElementById('timeline'); var chart = new google.visualization.Timeline(container); var dataTable = new google.visualization.DataTable(); - + dataTable.addColumn({ type: 'string', id: 'Type' }); dataTable.addColumn({ type: 'string', id: 'Job Title' }); dataTable.addColumn({ type: 'string', id: 'style', role: 'style' }); dataTable.addColumn({ type: 'date', id: 'Start' }); dataTable.addColumn({ type: 'date', id: 'End' }); - dataTable.addRows([ + dataTable.addRows([ {{- $unpaid_past := "#FFFFF0" -}} {{- $paid_past := "#FCFCA6" -}} {{- $unpaid_current := "#BBBBB0" -}} {{- $paid_current := "#BCBC7E" -}} {{ with ( .GetPage "cv/roles" ).Pages -}} {{- range ( where . ".Params.organisations" "intersect" $titles ) -}} - [ - "{{- delimit ( intersect .Params.organisations $titles ) ", " | safeHTML -}}", - "{{- .Title | safeHTML -}}", + [ + "{{- delimit ( intersect .Params.organisations $titles ) ", " | safeHTML -}}", + "{{- .Title | plainify -}}", "{{ if .Params.end_date -}} {{- if .Params.paid -}} {{- $paid_past -}} @@ -53,19 +52,19 @@ {{- $unpaid_current -}} {{- end -}} {{- end }}", - new Date("{{ .Date.Format "2006-01-02" }}"), + new Date("{{ .Date.Format "2006-01-02" }}"), new Date(" {{- if .Params.end_date -}} {{- .Params.end_date -}} {{- else -}} {{- now.Format "2006-01-02" -}} {{- end -}} - ") + ") ], {{- end -}} {{ end -}} ]); - + var options = { title: '{{ .Title | plainify }} Roles Timeline', height: '100%', @@ -75,61 +74,56 @@ width: '100%', timeline: { showBarLabels: true } }; - + chart.draw(dataTable, options); } {{ else }} - {{ $js := resources.Get "js/roles-chart.js" | resources.ExecuteAsTemplate "/js/render-roles-timeline.js" ( .GetPage "cv/roles" ) }} - + {{ $js := resources.Get "js/roles-chart.js" | resources.ExecuteAsTemplate "/js/render-roles-timeline.js" ( .GetPage "cv/roles" ) | resources.Fingerprint }} + {{ end }} {{ end }} {{ define "main-header" }} {{ if .IsDescendant ( .GetPage "/cv/organisations" ) }} -
-
- -
-
+
+
+ +
+
{{ else }}
-

{{ .Title | safeHTML }}.

- {{ .Content }} - {{ if eq .Type "cv" }} - - {{ end }} - {{ if eq .Type "cv" }} - - {{ end }} +

{{ .Title | safeHTML }}. {{ if not ( or ( eq .Type "cv" ) ( eq .Type "cv/organisations" ) ) -}} + {{- range .AlternativeOutputFormats -}} + + RSS feed + + {{- end -}} + {{- end -}} +

+ {{- .Content -}} + + {{- if ( and ( eq .Type "cv" ) ( not ( .IsDescendant ( .GetPage "/cv/organisations" ) ) ) ) -}} + + {{- partialCached "cv/timeline-legend.html" . -}} + {{- else -}} + + {{- end -}}
{{ end }} {{ end }} @@ -141,63 +135,47 @@ {{ $titles = $titles | append ( partial "cv/organisations/recursive-children-titles.html" . ) }} {{ end }} {{ .Scratch.Set "titles" $titles }} - +
{{ .Content }}
- +
- - +
- +
- {{ else }} - {{ if eq .Type "cv" }} -
- -
- {{ else if eq .Type "cv/organisations" . }} - {{ with .GetPage "cv/organisations" }} - {{ partial "cv/organisations/items-table.html" . }} - {{ end }} - {{ else }} - {{ partial "items-grid.html" . }} - {{ end }} - {{ end }} + {{ else if eq .Type "cv" }} +
+ +
+ {{ else }} + {{ partial "items-grid.html" . }} + {{ end }} {{ end }} {{ define "main-footer" }} @@ -227,9 +199,9 @@

Hierarchy

{{ $.Scratch.Set "parents" ( slice ) }} - {{ partial "cv/organisations/recursive-parents.html" (dict "c" . "g" $ ) }} + {{ partial "cv/organisations/recursive-parents.html" ( dict "c" . "g" $ ) }} {{- $parents := partial "cv/organisations/reverse-slice.html" ( $.Scratch.Get "parents" ) -}} - + {{- range $parents -}}