diff --git a/assets/css/theme.css b/assets/css/theme.css index 4ca6c2faf4..6e917c14fe 100644 --- a/assets/css/theme.css +++ b/assets/css/theme.css @@ -279,27 +279,33 @@ a:focus, z-index: 100; } -#R-sidebar .padding { - padding: 0 1rem; +#R-menu-footer { + margin-bottom: 1.25rem; } -.footerFooter { - font-size: 0.8125rem; - padding-top: 2rem; - padding-bottom: 0.75rem; - text-align: center; -} - -.footerFooter > * { - margin: 0 auto; +#R-menu-footer > hr:first-child { + margin-bottom: 1.25rem; + margin-top: 1.25rem; } #R-footer { color: var(--INTERNAL-MENU-SECTIONS-LINK-color); + font-size: 0.8125rem; + margin-bottom: 1.25rem; + margin-top: 0.75rem; + text-align: center; +} +#R-footer:empty { + display: none; +} + +#R-footer > * { + margin: 0 auto; } #R-footer > hr:first-child { - margin-top: 0; + margin-bottom: 1.25rem; + margin-top: -0.5rem; } /* increase specifity to override following #R-content-wrapper hr style */ @@ -308,6 +314,10 @@ a:focus, margin-right: 0; } +#R-sidebar .padding { + padding: 0 1rem; +} + #R-sidebar .R-sidebarmenu > ul { margin-top: 1rem; } @@ -2689,10 +2699,6 @@ body #R-logo svg :not([fill='#000000']) { padding-top: calc(0.125rem - var(--bpx1) * 1px); } -#R-menu-footer { - padding-bottom: 1rem; -} - article .R-taxonomy ul, article .R-taxonomy li { list-style: none; diff --git a/layouts/partials/menu.html b/layouts/partials/menu.html index bbd18097b4..f9ee5bdff8 100644 --- a/layouts/partials/menu.html +++ b/layouts/partials/menu.html @@ -38,7 +38,7 @@ {{- if (ne .Site.Params.landingPageURL nil) }} {{- warnf "UNSUPPORTED usage of 'landingPageURL' config parameter found, remove it and optionally overwrite the `logo.html` partial to provide a link if it should not point to the project's home page; see https://mcshelby.github.io/hugo-theme-relearn/introduction/releasenotes/4/#4-2-0" }} {{- end }} - {{- $title := trim (.Site.Params.landingPageName | plainify) "\n\r\t "}} + {{- $title := trim (.Site.Params.landingPageName | plainify) "\n\r\t " }} {{- $pre := "" }} {{- $post := "" }} {{- if $title }} @@ -72,7 +72,8 @@ {{- $themevariants := partialCached "_relearn/themeVariants.gotmpl" . }} {{- $showvariantswitch := gt (int (len $themevariants)) 1 }} {{- $footer := partial "menu-footer.html" . }} - {{- $showfooter := not (eq 0 (int (len ($footer | plainify)))) }} + {{- $plainfooter := trim ($footer | plainify) "\n\r\t " }} + {{- $showfooter := not (eq 0 (int (len $plainfooter))) }} <div class="padding footermargin footerLangSwitch footerVariantSwitch footerVisitedLinks footerFooter{{if $showlangswitch}} showLangSwitch{{end}}{{if $showvariantswitch}} showVariantSwitch{{end}}{{if $showvisitedlinks}} showVisitedLinks{{end}}{{if $showfooter}} showFooter{{end}}"></div> <div id="R-menu-footer"> <hr class="padding default-animation footerLangSwitch footerVariantSwitch footerVisitedLinks footerFooter{{if $showlangswitch}} showLangSwitch{{end}}{{if $showvariantswitch}} showVariantSwitch{{end}}{{if $showvisitedlinks}} showVisitedLinks{{end}}{{if $showfooter}} showFooter{{end}}"> @@ -126,10 +127,8 @@ </li> </ul> </div> - <div id="R-footer" class="footerFooter{{if $showfooter}} showFooter{{end}}"> - {{- $footer }} - </div> </div> + <div id="R-footer" class="footerFooter{{if $showfooter}} showFooter{{end}}">{{- $footer }}</div> </div> </aside> diff --git a/layouts/partials/version.txt b/layouts/partials/version.txt index 45c6507074..228cbecbb6 100644 --- a/layouts/partials/version.txt +++ b/layouts/partials/version.txt @@ -1 +1 @@ -7.5.0+9a020e7eadb7d8203f5b01b18756c72d94773ec9 \ No newline at end of file +7.5.0+6e9f056fd7ce9909fba00e8973ff439a09614879 \ No newline at end of file