diff --git a/layouts/_default/section.html b/layouts/_default/section.html index 3cfc9714..6b2b5001 100644 --- a/layouts/_default/section.html +++ b/layouts/_default/section.html @@ -9,12 +9,17 @@ - {{ else if eq .Type "bookmarkof" }} {{ $cats := slice }} @@ -81,7 +76,7 @@ @@ -99,8 +94,9 @@ {{ if .Params.repostof }}

Shared {{ .Params.repostof }}{{ end }}

{{ if .Content }}

{{ .Content }}

{{end}} -
- + {{ if not (eq .Type "article") }}
+ {{ with .Page.Params.category }}Categories: {{ partial "taxonomy/categories.html" . }}{{ end }}
+
{{ end }} {{end}} {{end}} diff --git a/themes/nipponalba/layouts/index.html b/themes/nipponalba/layouts/index.html index 91ec9af0..823938a2 100644 --- a/themes/nipponalba/layouts/index.html +++ b/themes/nipponalba/layouts/index.html @@ -24,11 +24,16 @@ -
{{ with .Page.Params.Image }}{{ partial "taxonomy/image.html" . }}{{ end }}

{{ .Title }}

+ {{ with .Page.Params.Image }}{{ partial "taxonomy/image.html" . }}{{ end }}

{{ .Title }}

- + diff --git a/themes/nipponalba/layouts/partials/bookmarks.html b/themes/nipponalba/layouts/partials/bookmarks.html deleted file mode 100644 index 0f975d43..00000000 --- a/themes/nipponalba/layouts/partials/bookmarks.html +++ /dev/null @@ -1,23 +0,0 @@ -{{ $cats := slice }} -{{ range .Site.Data.bookmarks }} - {{ $cats = $cats | append .category }} -{{ end }} -{{ $cats = uniq $cats | sort }} -{{ range $cats }} - {{ $cat := . }} -

{{ $cat }}

- {{ range $.Site.Data.bookmarks }} - {{ if eq .category $cat }} -
- - -
-{{ end }} -{{ end }} -{{ end }} diff --git a/themes/nipponalba/layouts/partials/taxonomy/categories.html b/themes/nipponalba/layouts/partials/taxonomy/categories.html index ec44260c..08433616 100644 --- a/themes/nipponalba/layouts/partials/taxonomy/categories.html +++ b/themes/nipponalba/layouts/partials/taxonomy/categories.html @@ -1,6 +1,6 @@ - + diff --git a/themes/nipponalba/layouts/partials/taxonomy/tags.html b/themes/nipponalba/layouts/partials/taxonomy/tags.html index 133c2fda..5cb48a0b 100644 --- a/themes/nipponalba/layouts/partials/taxonomy/tags.html +++ b/themes/nipponalba/layouts/partials/taxonomy/tags.html @@ -1,6 +1,6 @@ - + diff --git a/themes/nipponalba/static/css/style.css b/themes/nipponalba/static/css/style.css index 1cdb8f36..54831ca2 100644 --- a/themes/nipponalba/static/css/style.css +++ b/themes/nipponalba/static/css/style.css @@ -73,11 +73,11 @@ body { p { line-height: 1.9em; font-weight: 400; - font-size: 14px; + font-size: 15px; } - a { text-decoration: none; + color: var(--link-colour); } a:link, a:visited { opacity: 1; @@ -86,10 +86,10 @@ a:link, a:visited { -o-transition: all .15s linear; -ms-transition: all .15s linear; transition: all .15s linear; - color: var(--text-colour); + color: var(--link-colour); } a:hover, a:active { - color: var(--link-colour); + color: var(--text-colour); } img { opacity: var(--opacity-img); @@ -98,7 +98,27 @@ img { img:hover { opacity: 1 } - +table { + border-collapse:collapse; +} +table, td, th{ + border: 1px dotted var(--text-colour); + padding:15px; +} +h3 { + color: var(--text-colour); + font-size: 22px; + font-weight: 600; + line-height: 1.6; +} +h4 { + color: var(--text-colour); + font-size: 16px; +} +pre { + background: var(--bg-colour); + padding: 5px; +} #page{ color: var(--text-colour); background: var(--bg-colour); @@ -129,7 +149,13 @@ img:hover { background: var(--bg-colour); margin: 0 auto; } -.page-top .nav { +.page-top a { + color: var(--text-colour); +} +.page-top a:hover { + color: var(--link-colour); +} +.nav { width:80%; list-style: none; padding: 18px 0px; @@ -137,52 +163,39 @@ width:80%; font-size: 14px; display:inline-block; } -.page-top .nav li{ +.nav li{ position: relative; display: initial; padding-right: 20px; } -.page-top .nav a { - color: var(--text-colour); -} -.page-top .nav a:hover { - color: var(--link-colour); -} -.page-top .selectors{ +.selectors{ width:130px; float:right; display:inline-block; vertical-align:middle; padding: 10px 0px; } -.page-top .language-selector { +.selectors i{ + margin:0; + padding-left:10px;; +} +.language-selector { position:relative; display:inline-block; float:right; padding:0px 10px;padding:0; margin:0; } -.page-top .language-selector ul{ +.language-selector ul{ list-style:none; padding:0; margin:0; } -.page-top .selectors .theme-selector{ +.theme-selector{ margin:0; padding:0; } -.page-top .selectors i{ - margin:0; - padding-left:10px;; -} - .content { - background: var(--bg-colour); - color: var(--text-colour); - display:block; - width: 100% !important; - margin-top: 0 auto; - padding:0; height: 95%; overflow:auto; -ms-overflow-style: none; @@ -191,14 +204,13 @@ width:80%; .content::-webkit-scrollbar{ display:none; } - -.content .profile{ +.profile{ width:85% !important; display:block; margin: 0 auto; padding-top:30px; } -.content .profile .profile-left{ +.profile-left{ width:20% !important; min-width: 200px; padding:0; @@ -206,92 +218,92 @@ width:80%; display:inline-block; vertical-align:middle; } -.content .profile .profile-right{ +.profile-right{ vertical-align:top; - width:65%; + width:75%; display:inline-block; padding:0; margin:0; text-align:justify; } -.content .profile img{ +.profile-right a{ + color: var(--text-colour); +} +.profile-right a:hover{ + color: var(--link-colour); +} +.profile img{ width:165px; border-radius: 5%; margin-right: 40px; } - -.content .profile .description { - font-size: 14px; - color: var(--text-colour); - margin-left: 10px; -} -.content .profile .logo { - margin: 0 auto; -} -.content .profile .title{ +.profile .title{ text-transform: uppercase; - font-size: 1.5rem; + font-size: 1.8rem; font-weight: bold; - letter-spacing: 2px; + letter-spacing: 1.5px; line-height: 1; display:inline-block; padding-left:10px; - margin-bottom:5px; -} -.content .profile .title a { - text-decoration: none; - color: var(--text-colour); - font-size: 2rem; - font-weight: bold; } -.content .profile .social-links { +.social-links { list-style: none; padding: 0; } -.content .profile .social-links i { +.social-links i { margin-right: 3px; } -.content .profile .social-links li { +.social-links li { display: inline; } -.content .profile .social-links a { +.social-links a { color: var(--text-colour); } -.content .profile .social-links a:hover { +.social-links a:hover { color: var(--link-colour); } - -.category { - padding: 4px 6px; - border-radius: 3px; - border: 1px solid var(--text-colour); +.info i{ + opacity: 0.5; + margin-right: 5px; } -.blog { - padding: 4px 6px; - border-radius: 3px; - background: var(--link-colour); - border: 1px solid var(--text-colour); +.info{ + padding: 30px 0; + font-size:13px; +} +#info-date{ + float:right; +} +#info-date .dt-published{ + font-size:13px; +} +.category, .blog, .tag, #info-date { + display: inline-block; + font-size: 13px; + line-height: 1.5; +} +.categories, .tags{ + display:inline; + margin:0; + padding:0; +} +.categories li, .tags li{ + list-style:none; + display:inline; } .tag::before { content: "#"; opacity: .75; } -.tag, .category { - display: inline-block; - font-size: 15px; - line-height: 1; - margin: 5px 8px 5px 0; +.categories li::after, .tags li::after{ + content: ", "; } -pre { - background: var(--bg-colour); - padding: 5px; +.categories li:last-child:after, .tags li:last-child:after{ + content: ""; } -.info i{ - opacity: 0.5; - margin-right: 5px; -} -.info{ - padding: 30px 0; +.reading-time{ + display:inline; + float:right; + font-weight:bold; } .index_info i{ opacity: 0.5; @@ -300,161 +312,36 @@ pre { padding-bottom:150px; } .post{ - background: var(--bg-colour); margin: 30px 0; -} -.post .banner{ + } + .index_content{ + text-align:justify; + width:100%; + } +.banner{ width:90%; max-height: 300px; object-fit:scale-down; object-position:top; } -.post .post-title h1 { - text-transform: uppercase; - font-size: 30px; - letter-spacing: 5px; - line-height: 1; -} -.post .post-title h2 { - text-transform: uppercase; - letter-spacing: 1px; - font-size: 28px; - line-height: 1; - font-weight: 600; - color: var(--text-colour); -} -.post .post-title h3 { - text-transform: uppercase; - letter-spacing: 1px; - line-height: 1; - font-weight: 600; - color: var(--text-colour); - font-size: 22px; - margin: 0; -} -.post .post-title a, .h-entry .post-title a { - text-decoration: none; - letter-spacing: 1px; - color: var(--text-colour); -} -.post .post-title a:hover, .h-entry .post-title a:hover { - text-decoration: underline; -} -.post .post-content a, .h-entry p a { +.h-entry p a { text-decoration: none; color: var(--link-colour); } -.post .post-content table, .h-entry table { - border-collapse:collapse; -} -.post .post-content table,.post .post-content table td, .post .post-content table th, -.h-entry table,.h-entry table td, .h-entry table th{ - border: 1px dotted var(--text-colour); -} -.post .post-content table td, .post .post-content table th,.h-entry table td, .h-entry table th{ - padding: 15px -} -.post .post-content a:hover, .h-entry a:hover { +.h-entry a:hover { color: var(--link-colour); } -.post .post-content h3,section aside h3 { - color: var(--text-colour); - font-size: 22px; - font-weight: 600; -} -.post .post-content h4 { - color: var(--text-colour); - font-size: 16px; -} -.post .post-content img, .h-entry img { +.h-entry img { text-align: center; max-width: 800px; margin: 0 auto; display:block; padding:10px; } -.post .post-footer { - padding: 0 0 100px 0; - border-bottom: 1px dotted var(--text-colour); -} -.post .post-footer-page { - padding: 0 0 0 0; - width:100%; - display:block; -} -.post .post-footer .meta, .post .post-footer-page .meta { - max-width: 100%; - height: 25px; - color: var(--text-colour); -} -.post .post-footer .meta .info, .post .post-footer-page .meta .info { - float: left; - font-size: 12px; - margin-bottom: 1em; -} -.post .post-footer .info .separator a, .post .post-footer-page .info .separator a{ - margin-right: 0.2em; -} -.post .post-footer .meta .info .date, .post .post-footer-page .meta .info .date{ - margin-right: 10px; -} -.index_info .date { - margin: 0 10px; -} -.post .post-footer .meta a, .post .post-footer-page .meta a{ - text-decoration: none; - color: var(--text-colour); - padding-right: 10px; -} -.post .post-footer .meta a:hover, .post .post-footer-page .meta a:hover,{ - color: var(--link-colour); -} -.post .post-footer .blog, .post .post-footer-page .blog{ - color: var(--text-colour); -} -.post .post-footer .blog:hover, .post .post-footer-page .blog:hover{ - color: var(--text-colour); -} -.post .post-footer .meta i, .post .post-footer-page .meta i{ - margin-right: 6px; -} -.post .post-footer .tags, .post .post-footer-page .tags{ - padding-bottom: 15px; - font-size: 13px; -} -.post .post-footer .tags ul, .post .post-footer-page .tags ul{ - list-style-type: none; - display: inline; - margin: 0; - padding: 0; -} -.post .post-footer .tags ul li, .post .post-footer-page .tags ul li{ - list-style-type: none; - margin: 0; - padding-right: 5px; - display: inline; -} -.post .post-footer .tags a, .post .post-footer-page .tags a{ - text-decoration: none; - color: var(--text-colour); - font-weight: 400; -} -.post .post-footer .tags a:hover, .post .post-footer-page .tags a:hover{ - text-decoration: none; -} -.post .post-footer-page .syndication{ - display:inline; - float:right; - text-align:right; - font-size:13px; -} -.post .post-footer-page .date{ +.syndication{ display:inline; float:left; -} -.post .post-footer-page{ -display:block; -width:100% + font-size:13px; } .interactions{ margin:20px 0 10px 0; @@ -483,13 +370,13 @@ width:100% margin-top: 0 20px 0 0 ; padding: 0 0 200px 0; } -.webmentions .remote_profile{ +.remote_profile{ height: 100%; width: 70px; display:inline-block; vertical-align:top; } -.webmentions .remote_profile img{ +.remote_profile img{ width: 50px; border-radius: 50%; display:inline; @@ -497,7 +384,7 @@ width:100% border:0; padding:0; } -.webmentions .interaction{ +.interaction{ border:1px dotted var(--text-colour); padding: 10px; display:block; @@ -505,27 +392,27 @@ width:100% min-height:60px; vertical-align:top; } -.webmentions .interaction .intactivity{ +.interaction .intactivity{ font-size:13px; font-style:italic; line-height:18px; } -.webmentions .interaction .intcontent{ +.interaction .intcontent{ display:inline-block; font-size:15px; vertical-align:top; max-width: 90%; } -.webmentions .interaction time{ +.interaction time{ font-size:12px; } -.webmentions .interaction h4{ +.interaction h4{ line-height:15px; padding:0; margin:0; display:block; } -.webmentions .interaction.like, .webmentions .interaction.share{ +.interaction.like, .interaction.share{ border:0; color: var(--text-colour); padding:2px; @@ -534,11 +421,12 @@ width:100% width:100%; min-height:30px; } -.webmentions .interaction.like img, .webmentions .interaction.share img{ +.interaction.like img,.interaction.share img{ display:inline-flex; float:left; width:30px; height:30px; + margin:0; border-radius: 50%; } .footer { @@ -628,53 +516,43 @@ width:100% margin:0 auto; display:block; } -.content hr { +hr { color: var(--text-colour); } -.content .author{ - width: 75px; - display:inline-block; - margin:0; - padding:0; -} -.content .author img{ - width:50px; - margin: auto 0; -} -.content .author .title{ + +.author .title{ display:none; } -.content aside{ + +#response .h-cite{ width:100%; display:inline-block; - vertical-align: top; + vertical-align:top; + padding:0; } -.content #response p-content{ - width:90%; +#response p{ + margin:0; } -.content aside time, .h-cite time, .content #response time{ +time{ font-size:13px; - width:100%; -} -.content aside a.time{ - text-decoration:underline dashed; -} -.content aside .info time{ - font-size:15px; } .bookmark .p-content{ display:inline; margin:0; padding:0; } -.photos{ - display:inline-block; +.photo{ + display:flex; + width:100%; +} +.photogrid{ + display:block; width:100%; float:left; min-width:100%; margin-bottom:10px; } -.content img.thumb{ +img.thumb{ width:300px; float:left; display:inline; @@ -703,7 +581,12 @@ hr{ .pagination-bottom{ padding-bottom:100px; } - +.pagination a { + color: var(--text-colour); +} +.pagination a:hover { + color: var(--link-colour); +} .anchor { display:none; } @@ -760,9 +643,6 @@ hr{ .page-top .language-selector i{ padding:0 5px; } - .post-title h3, section aside h3 { - line-height: 1.6; - } .content { width:90%;