mirror of
				https://github.com/BBaoVanC/bobatheme.git
				synced 2025-10-20 13:33:28 -05:00 
			
		
		
		
	WIP body-module and smarter usage of container divs
This commit is contained in:
		| @@ -293,17 +293,35 @@ body { | ||||
|   color: var(--text-0); | ||||
|   overflow-wrap: break-word; | ||||
|   margin: 0; | ||||
|   display: flex; | ||||
|   flex-direction: column; | ||||
|   align-items: center; | ||||
|   gap: var(--page-margin); | ||||
| } | ||||
|  | ||||
| .main-container { | ||||
|   margin: var(--page-margin) auto; | ||||
|   /* use padding because otherwise there's no way to have margin be both auto, and a minimum value */ | ||||
|   padding: 0 var(--page-margin); | ||||
|   max-width: calc(720px + 2 * var(--page-margin)); /* padding is included in the element's width */ | ||||
| .body-module { | ||||
|   width: 100%; /* without, it collapses inside flexbox for some reason TODO: figure out why */ | ||||
| } | ||||
|  | ||||
| .body-module--marginless { | ||||
|   margin: 0; | ||||
| } | ||||
|  | ||||
| .body-module--full-width { | ||||
|   margin: 0 var(--page-margin); | ||||
|   /* | ||||
|   margin-left: var(--page-margin); | ||||
|   margin-right: var(--page-margin); | ||||
|   */ | ||||
| } | ||||
| .body-module--wide { | ||||
|   margin-left: var(--page-margin); | ||||
|   margin-right: var(--page-margin); | ||||
|   max-width: 720px; | ||||
| } | ||||
|  | ||||
| footer { | ||||
|   margin: var(--page-margin) 0; | ||||
|   margin-bottom: var(--page-margin); | ||||
|   text-align: center; | ||||
|   font-size: smaller; | ||||
| } | ||||
| @@ -376,10 +394,6 @@ footer p { | ||||
|  | ||||
| /* Breadcrumb navigation {{{ */ | ||||
|  | ||||
| .breadcrumb { | ||||
|   margin: var(--page-margin) 0; | ||||
| } | ||||
|  | ||||
| .breadcrumb ul { | ||||
|   margin: 0; | ||||
|   padding: 0; | ||||
|   | ||||
| @@ -1,4 +1,4 @@ | ||||
| <nav class="breadcrumb" aria-label="{{ i18n "aria_breadcrumbnav" }}"> | ||||
| <nav class="body-module body-module--wide breadcrumb" aria-label="{{ i18n "aria_breadcrumbnav" }}"> | ||||
|     <ul> | ||||
|         {{ template "breadcrumbnav" (dict "p1" . "p2" .) }} | ||||
|     </ul> | ||||
|   | ||||
| @@ -1,4 +1,4 @@ | ||||
| <header class="top"> | ||||
| <header class="body-module body-module--marginless top"> | ||||
|     <div class="brand"> | ||||
|         <a href="{{ .Site.Home.Permalink | absLangURL }}"> | ||||
|             {{ .Site.Title | markdownify }} | ||||
|   | ||||
| @@ -8,11 +8,12 @@ | ||||
|  | ||||
|         {{ partial "top.html" . }} | ||||
|  | ||||
|         <div class="main-container"> | ||||
|         {{ if not .IsHome }} | ||||
|             {{ partial "breadcrumb.html" . }} | ||||
|         {{ end }} | ||||
|  | ||||
|         {{ block "pre-body" . }}{{ end }} | ||||
|  | ||||
|         <main id="main-content"> | ||||
|             {{ block "main" . }} | ||||
|                 THIS TEXT SHOULD NOT SHOW. YUZSIQGHE (that string is so I can grep for it) | ||||
| @@ -20,7 +21,7 @@ | ||||
|         </main> | ||||
|  | ||||
|         {{ if or .Site.Copyright .Site.Params.footer }} | ||||
|                 <footer> | ||||
|             <footer class="body-module body-module--wide"> | ||||
|                 {{ with .Site.Copyright }} | ||||
|                     {{ . | safeHTML }} | ||||
|                 {{ end }} | ||||
| @@ -30,7 +31,6 @@ | ||||
|                 {{ end }} | ||||
|             </footer> | ||||
|         {{ end }} | ||||
|         </div> | ||||
|  | ||||
|         {{ block "post-body" . }} | ||||
|             {{/* currently this is only used for related posts */}} | ||||
|   | ||||
| @@ -1,13 +1,13 @@ | ||||
| {{ define "main" }} | ||||
|     {{ with .Content }} | ||||
|         <article class="homepage-content"> | ||||
|         <article class="body-module body-module--wide"> | ||||
|             {{ . }} | ||||
|         </article> | ||||
|         <hr> | ||||
|         <hr class="body-module body-module--wide"> | ||||
|     {{ end }} | ||||
|  | ||||
|     {{ if .Site.Params.homepageLatestPosts }} | ||||
|         <div class="homepage-latest-posts"> | ||||
|         <div class="body-module body-module--wide"> | ||||
|             <h1> | ||||
|                 {{ i18n "latest_posts" }} | ||||
|                 {{ partial "rss-link.html" . }} | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| {{ define "main" }} | ||||
|     <article class="body-module body-module--wide"> | ||||
|         <div class="page-title"> | ||||
|             <h1> | ||||
|                 {{ .Title | markdownify }} | ||||
| @@ -69,10 +70,10 @@ | ||||
|                 {{ partial "comments.html" . }} | ||||
|             </div> | ||||
|         {{ end }} | ||||
| {{ end }} | ||||
|     {{ end }} | ||||
|  | ||||
|  | ||||
| {{ define "post-body" }} | ||||
|     {{ define "post-body" }} | ||||
|         {{ $related := .Site.RegularPages.Related . | first 10 }} | ||||
|         {{ with $related }} | ||||
|             <div class="related-posts"> | ||||
| @@ -81,4 +82,5 @@ | ||||
|                 {{ partial "page-list.html" . }} | ||||
|             </div> | ||||
|         {{ end }} | ||||
|     </article> | ||||
| {{ end }} | ||||
|   | ||||
		Reference in New Issue
	
	Block a user