Merge branch 'upstream'

CHANGELOG.md

 # Changelog
 
-## 2.0.1
+## 2.1.0
 
 * Card shortcode will not longer render the horizontal rule when there is no
     bottom text to render.
+* Added several shortcodes and CSS for rendering info-fields, for example for
+    contact info. See `info-entry.html`, `info-field.html`, `info-key.html` and
+    `info-value.html` under the `/layouts/shortcodes/` directory.
+* Added the `container-split` short code which will split a container into two
+    columns.
+* Removed significant portions of unused CSS to load quicker.
+* Improved responsive aspects of the CSS.
+* Several root settings in `/hugo.toml` were being overridden such as `paginate`
+    these should now be fixed.
+* Fixed the CSS so the `navbar` wont overflow under very low resolutions.
+* Fixed certain text inside `<p>` tags overflowing and distorting the layout.
+* Updated CSS for `blockquote` and fonts to be more readable.
 
 ## 2.0.0
 

api/nodeinfo/2.1.ts

@@ -9,7 +9,7 @@ export default function (req: VercelRequest, res: VercelResponse) {
       "name": "Fedipage",
       "repository": "https://git.qoto.org/fedipage/fedipage",
       "homepage": "https://fedipage.com/",
-      "version": "2.0.1"
+      "version": "2.1.0"
     },
     "protocols": [
       "activitypub"

config/_default/hugo.toml

 Copyright = "Jeffrey Phillips Freeman 2023 - present"
 
-paginate = 20
-pygmentsCodeFences = true
-pygmentsCodeFencesGuessSyntax = true
-pygmentsStyle = "monokai"
-DefaultContentLanguage = "en"
-defaultContentLanguageInSubdir = false
-
 enableRobotsTXT = true
 uglyURLs=false
 pluralizelisttitles=false

layouts/partials/head.html

@@ -116,23 +116,18 @@
 <link href="/manifest.json" rel="manifest">
 <link rel="home" href="{{.Site.BaseURL}}">
 <style>
-  {{ $main := resources.Get "css/main.css" }}
-  {{ $goblin := resources.Get "css/goblin.css" }}
-  {{ $fa := resources.Get "css/fontawesome.css" }}
-  {{ $primer := resources.Get "css/primer.css" }}
-  {{ $ghost := resources.Get "css/ghost.css" }}
-  {{ $glyph := resources.Get "css/glyphicons.css" }}
-  {{ $pseudocode := resources.Get "css/pseudocode.css" }}
-
-  {{ $css := slice $main $goblin $fa $primer $ghost $glyph $pseudocode | resources.Concat "css/bundle.css"  }}
-  {{ $minifiedCSS := $css | minify}}
-  {{ $minifiedCSS.Content | safeCSS }}
-
   header.with-background {
     {{ if .Params.image_header }}background-image: url('{{ .Params.image_header}}');{{ end }}
   }
 </style>
+
+<link rel="stylesheet" href="/css/fontawesome.css">
+<link rel="stylesheet" href="/css/primer.css">
+<link rel="stylesheet" href="/css/glyphicons.css">
+<link rel="stylesheet" href="/css/pseudocode.css">
 <link rel="stylesheet" href="/javascripts/cal-heatmap/cal-heatmap.css">
+<link rel="stylesheet" href="/css/main.css">
+
 {{ range .AlternativeOutputFormats -}}
 <link rel="{{ .Rel }}" type="{{ .MediaType.Type }}" href="{{ .Permalink | safeURL }}">
 {{ end -}}
@@ -176,16 +171,16 @@ document.addEventListener("DOMContentLoaded", function() {
     "HTML-CSS": { fonts: ["TeX"] }
   });
 </script>
-<script type="text/javascript" src="/javascripts/mathjax/tex-chtml-full.js"></script>
+<script type="text/javascript" src="/javascripts/mathjax/tex-chtml-full.js" defer></script>
 
-<script type="text/javascript" src="/javascripts/d3.js"></script>
-<script type="text/javascript" src="/javascripts/popperjs/popper.js"></script>
-<script type="text/javascript" src="/javascripts/cal-heatmap/cal-heatmap.js"></script>
-<script type="text/javascript" src="/javascripts/cal-heatmap/plugins/Legend.js"></script>
-<script type="text/javascript" src="/javascripts/cal-heatmap/plugins/LegendLite.js"></script>
-<script type="text/javascript" src="/javascripts/cal-heatmap/plugins/Tooltip.js"></script>
-<script type="text/javascript" src="/javascripts/cal-heatmap/plugins/CalendarLabel.js"></script>
-<script type="module">
+<script type="text/javascript" src="/javascripts/d3.js" defer></script>
+<script type="text/javascript" src="/javascripts/popperjs/popper.js" defer></script>
+<script type="text/javascript" src="/javascripts/cal-heatmap/cal-heatmap.js" defer></script>
+<script type="text/javascript" src="/javascripts/cal-heatmap/plugins/Legend.js" defer></script>
+<script type="text/javascript" src="/javascripts/cal-heatmap/plugins/LegendLite.js" defer></script>
+<script type="text/javascript" src="/javascripts/cal-heatmap/plugins/Tooltip.js" defer></script>
+<script type="text/javascript" src="/javascripts/cal-heatmap/plugins/CalendarLabel.js" defer></script>
+<script type="module" defer>
 
 
   var getJSON = function(url, callback) {

layouts/partials/menu.html

-<nav class="navbar navbar--light navbar--fixed-top">
+<nav class="navbar navbar--fixed-top">
 	<div class="navbar__inner">
-		<div class="navbar__items navbar__items--left navbarItems_1xGM">
+		<div class="navbar__items navbar__items--left">
 			<a aria-current="page" class="navbar__brand active" href="/">
 				<img class="navbar__logo logo--light" src="/images/logo-header-light.png" alt="{{ site.Params.siteName }}">
-				<img class="navbar__logo logo--dark" src="/images/logo-header-dark.png" alt="{{ site.Params.siteName }}">
 			</a>
-			<div aria-label="Navigation bar toggle" class="navbar__toggle" role="button" tabindex="0">
-				<svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 30 30" role="img" focusable="false">
-					<title>Menu</title>
-					<path stroke="currentColor" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2" d="M4 7h22M4 15h22M4 23h22"></path>
-				</svg>
-			</div>
 		</div>
 		<div class="navbar__items navbar__items--right">
-			<a class="navbar__item navbar__link" href="/">Home</a>
-			{{ range (where .Site.Pages "Section" "") }}
-		     {{ range .Pages }}
-						<a class="navbar__item navbar__link" href="{{ .Permalink }}">{{ .Title }}</a>
-		     {{ end }}
-		  {{ end }}
-			<a class="displayOnlyInLargeViewport_16CL button button--primary" href={{ site.Params.repoUrl }} style="margin:0;margin-left:15px">MY GIT →</a>
-		</div>
-	</div>
-	<div role="presentation" class="navbar-sidebar__backdrop"></div>
-	<div class="navbar-sidebar">
-		<div class="navbar-sidebar__brand">
-			<a aria-current="page" class="navbar__brand active" href="/">
-				<img class="navbar__logo logo--light" src="/images/logo-header-light.png" alt="Goblin">
-				<img class="navbar__logo logo--dark" src="/images/logo-header-dark.png" alt="Goblin">
-			</a>
-		</div>
-		<div class="navbar-sidebar__items">
-			<div class="menu">
-				<ul class="menu__list">
-					<li class="menu__list-item">
-						<a class="menu__link" href="/">Home</a>
-					</li>
-					{{ range (where .Site.Pages "Section" "") }}
-				     {{ range .Pages }}
-								<li class="menu__list-item">
-									<a class="menu__link" href="{{ .Permalink }}">{{ .Title }}</a>
-								</li>
-				     {{ end }}
-				  {{ end }}
-					<div style="margin:5px;margin-top:15px"></div>
-					<a class="button button--block button--primary" href={{ site.Params.repoUrl }}>MY GIT →</a>
-				</ul>
-			</div>
+			<input class="menu-btn" type="checkbox" id="menu-btn" />
+		  <div class="menu-icon"><label for="menu-btn"><span class="navicon"></span></label></div>
+			<ul class="navbar-menu">
+				<li class="navbar-menu-item"><a class="navbar__item navbar__link" href="/">Home</a></li>
+				{{ range (where .Site.Pages "Section" "") }}
+			     {{ range .Pages }}
+							<li  class="navbar-menu-item"><a class="navbar__item navbar__link" href="{{ .Permalink }}">{{ .Title }}</a></li>
+			     {{ end }}
+			  {{ end }}
+				<li  class="navbar-menu-item"><a class="button button-primary" href={{ site.Params.repoUrl }}>MY GIT →</a></li>
+			</ul>
 		</div>
 	</div>
 </nav>

layouts/partials/top_single.html

@@ -14,4 +14,4 @@
           </h2>
         </div>
       </header>
-      <main class="hfeed container" id="content" role="main">
+      <main class="container" id="content" role="main">