pidgin/nest

Merged in default (pull request #74)

22 months ago, Gary Kramlich
0280bd7d6447
Merged in default (pull request #74)

E6d8faf88e15

Approved-by: Gary Kramlich
--- a/hugo/layouts/partials/footline.html Tue Jan 14 02:58:18 2020 +0000
+++ b/hugo/layouts/partials/footline.html Tue Jan 14 02:59:32 2020 +0000
@@ -1,39 +1,38 @@
<footer id="footline">
- <div>
- <ul class="footline-columns">
- <li>
- &copy; Pidgin
- </li>
- <li>
- {{ T "Content" }} - GPL3
- </li>
- <li>
- <a href="https://github.com/matcornic/hugo-theme-learn">{{ T "Theme" }}</a> - MIT
- </li>
- <li>
- {{ with $.Lastmod }}
- Modified {{ .Format "2006-01-02" }}
- {{ else }}
- {{ T "Last-Modified-Not-Found" }}
- {{ end }}
- by
- {{ with .Params.LastModifierDisplayName }}
- {{ if $.Params.LastModifierEmail }}
- <a href="mailto:{{ $.Params.LastModifierEmail }}">
- {{ . }}
- </a>
- {{ else }}
- {{ . }}
- {{ end }}
- {{ else }}
- {{ T "Anon" }}
- {{ end }}
- </li>
- </ul>
+ <div class="footline-block">
+ {{ with $.Lastmod }}
+ Modified {{ .Format "2006-01-02" }}
+ {{ else }}
+ {{ T "Last-Modified-Not-Found" }}
+ {{ end }}
+ by
+ {{ with .Params.LastModifierDisplayName }}
+ {{ if $.Params.LastModifierEmail }}
+ <a href="mailto:{{ $.Params.LastModifierEmail }}">
+ {{ . }}
+ </a>
+ {{ else }}
+ {{ . }}
+ {{ end }}
+ {{ else }}
+ {{ T "Anon" }}
+ {{ end }}
+ </div>
+
+ <div class="footline-block footline-old-site-info">
+ {{ if .Params.replaces }}
+ This page was migrated from the old sites. This is what it replaces:
+ {{ partial "replaces-list.html" . }}
+ {{ else }}
+ To see content from the old wiki visit a
+ <a href="https://old.pigidn.im" rel="nofollow">
+ old.pidgin.im
+ </a>
+ {{ end }}
</div>
{{ with .Site.Menus.shortcuts }}
- <ul class="footline-columns">
+ <ul class="footline-block footline-columns">
{{ range sort . "Weight" }}
<li>
{{ .Pre }}
@@ -44,5 +43,19 @@
</ul>
{{ end }}
- {{ partial "supporters.html" . }}
+ <div class="footline-block">
+ {{ partial "supporters.html" . }}
+ </div>
+
+ <ul class="footline-block footline-columns copyright-text">
+ <li>
+ &copy; Pidgin
+ </li>
+ <li>
+ {{ T "Content" }} - GPL3
+ </li>
+ <li>
+ <a href="https://github.com/matcornic/hugo-theme-learn">{{ T "Theme" }}</a> - MIT
+ </li>
+ </ul>
</footer>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hugo/layouts/partials/replaces-list.html Tue Jan 14 02:59:32 2020 +0000
@@ -0,0 +1,6 @@
+<ul>
+ {{ range .Params.replaces }}
+ <li><a href="{{ . }}" rel="nofollow">{{ . }}</a></li>
+ {{ end }}
+</ul>
+
--- a/hugo/static/css/custom.css Tue Jan 14 02:58:18 2020 +0000
+++ b/hugo/static/css/custom.css Tue Jan 14 02:59:32 2020 +0000
@@ -25,6 +25,10 @@
font-size: 20px;
}
+/*****************************************************************************
+ * Visual fixes
+ *****************************************************************************/
+
#body-inner li p {
/* This is to fix the unwanted p-tags that blackfriday adds */
margin-block-start: 0;
@@ -41,7 +45,7 @@
}
#body-inner {
- margin-bottom:0;
+ margin-bottom: 0;
}
nav#TableOfContents ul li:first-child:nth-last-child(1) {
@@ -58,11 +62,25 @@
padding: 0px 2px;
}
+/*****************************************************************************
+ * Footline
+ *****************************************************************************/
+
#footline {
background: rgb(246, 246, 246);
border-radius: 15px;
text-align: center;
margin-top: 15px;
+ padding: 1rem;
+}
+
+.footline-block {
+ margin-block-end: 1rem;
+ margin-top: 0;
+}
+
+.footline-block:last-child {
+ margin-block-end: 0;
}
#page-info {
@@ -70,12 +88,11 @@
}
#page-info > div {
- display: inline-block;
- width: 49%;
+ display: inline-block;
+ width: 49%;
}
.footline-columns {
- margin: 0;
vertical-align: top;
padding: 0;
}
@@ -93,6 +110,23 @@
content: "";
}
+.footline-old-site-info > ul {
+ margin-top: 0;
+ margin-bottom: 0;
+}
+
+.footline-old-site-info > ul > li {
+ list-style-type: none;
+}
+
+.copyright-text {
+ font-size: x-small;
+}
+
+/*****************************************************************************
+ * Supporters
+ *****************************************************************************/
+
.supporters {
padding: 7px;
text-align: center;
@@ -112,6 +146,10 @@
width: auto;
}
+/*****************************************************************************
+ * Pligin Table
+ *****************************************************************************/
+
.plugin-icon {
vertical-align: top;
padding: 0.25rem !important;
@@ -125,7 +163,11 @@
width: 48px;
}
-.plugin-heading, .plugin-publisher, .plugin-type, .plugin-info, .plugin-repo {
+.plugin-heading,
+.plugin-publisher,
+.plugin-type,
+.plugin-info,
+.plugin-repo {
vertical-align: top;
}
@@ -133,3 +175,7 @@
text-align: center;
padding: 0.25rem !important;
}
+
+/*****************************************************************************
+ * End of structure
+ *****************************************************************************/