diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 0ae3841..7c6ed4a 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -1,7 +1,7 @@ <head> <meta charset="utf-8" /> <title>{{.Title}}</title> -<link rel="stylesheet" href="/css/theme.css"> -<link rel="stylesheet" href="/style2.css"> +<link rel="stylesheet" href="{{.Site.BaseURL}}css/theme.css"> +<link rel="stylesheet" href="{{.Site.BaseURL}}style.css"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> </head> \ No newline at end of file diff --git a/layouts/partials/post.html b/layouts/partials/post.html index b0dcd10..bee3f04 100644 --- a/layouts/partials/post.html +++ b/layouts/partials/post.html @@ -3,15 +3,23 @@ {{if .Date }} <p>{{.Date | time.Format "Jan 02 2006"}}</p> {{end}} -{{if .Params.video}}<video controls loop preload="none"><source src="{{.Params.video}}"></video> +<a href="{{.Permalink}}"> +{{if .Params.gif}} + <video autoplay muted loop preload="true"> + <source src="{{.Site.BaseURL}}{{.Params.gif}}"> + </video> {{else}} -{{if .Params.audio}}<audio controls preload="none"><source src="{{.Params.audio}}"></audio> + {{if .Params.video}}<video controls loop preload="none"><source src="{{.Site.BaseURL}}{{.Params.video}}"></video> {{else}} -{{if .Params.image}}<img loading="lazy" src="{{.Params.image}}"> +{{if .Params.audio}}<audio controls preload="none"><source src="{{.Site.BaseURL}}{{.Params.audio}}"></audio> +{{else}} +{{if .Params.image}}<img loading="lazy" src="{{.Site.BaseURL}}{{.Params.image}}"> {{end}} {{end}} {{end}} -<p>{{.Summary}}</p> +{{end}} +</a> +<p>{{.Params.description}}</p> {{ if .GetTerms "tags" }} <div class="post-tags"> diff --git a/layouts/partials/profile.html b/layouts/partials/profile.html index 08a4de5..0c8081a 100644 --- a/layouts/partials/profile.html +++ b/layouts/partials/profile.html @@ -1,10 +1,10 @@ <main id="profile"> <div> - <a href="/"> + <a href="{{.Site.BaseURL}}"> <img id='profilephoto' loading="lazy" src="{{.Site.Params.default_img}}"> </a> <div id="profile-details"> - <a href="/"><h1>{{.Site.Title}}</h1></a> + <a href="{{.Site.BaseURL}}"><h1>{{.Site.Title}}</h1></a> <p>{{.Site.Params.subtitle}}</p> {{ if .Site.Data.details.links }} <div id="profile-links"> diff --git a/layouts/shortcodes/audio.html b/layouts/shortcodes/audio.html index db86c1a..88cb889 100644 --- a/layouts/shortcodes/audio.html +++ b/layouts/shortcodes/audio.html @@ -1,3 +1,3 @@ <audio controls> - <source src='{{.Get "src" }}'> + <source src='{{.Site.BaseURL}}{{.Get "src" }}'> </audio> \ No newline at end of file diff --git a/layouts/shortcodes/gif.html b/layouts/shortcodes/gif.html index 0f39d02..bdd7d0a 100644 --- a/layouts/shortcodes/gif.html +++ b/layouts/shortcodes/gif.html @@ -1,4 +1,4 @@ <video autoplay muted loop preload="true"> - <source src='{{.Get "src" }}'> - <source src='{{.Get 0 }}'> + <source src='{{.Site.BaseURL}}{{.Get "src" }}'> + <source src='{{.Site.BaseURL}}{{.Get 0 }}'> </video> \ No newline at end of file diff --git a/layouts/shortcodes/video.html b/layouts/shortcodes/video.html index 372a77f..d35661a 100644 --- a/layouts/shortcodes/video.html +++ b/layouts/shortcodes/video.html @@ -1,3 +1,4 @@ <video {{if .Get "autoplay"}}autoplay muted loop preload="true"{{else}}controls preload="false"{{end}}> - <source src='{{.Get "src" }}'> + <source src='{{.Site.BaseURL}}{{.Get "src" }}'> + <source src='{{.Site.BaseURL}}{{.Get 0}}'> </video> \ No newline at end of file diff --git a/layouts/shortcodes/yesterweb.html b/layouts/shortcodes/yesterweb.html deleted file mode 100644 index fd90118..0000000 --- a/layouts/shortcodes/yesterweb.html +++ /dev/null @@ -1,3 +0,0 @@ -<a href="https://webring.yesterweb.org/noJS/index.php?d=prev&url=https://yesterweb.org/">Previous</a> - <a href="https://webring.yesterweb.org/noJS/index.php?d=rand&url=https://yesterweb.org/">Random</a> - <a href="https://webring.yesterweb.org/noJS/index.php?d=next&url=https://yesterweb.org/">Next</a> \ No newline at end of file diff --git a/static/css/theme.css b/static/css/theme.css index ed64cfb..c4e5497 100644 --- a/static/css/theme.css +++ b/static/css/theme.css @@ -1,21 +1,21 @@ body{ - --theme-color-primary: rgba(255, 255, 255, 0.9); + --theme-color-primary: rgba(255, 255, 255, 0.8); --theme-color-secondary: black; - --theme-accent: #8c5c09; + --theme-accent: #09448c; } @media screen and (prefers-color-scheme:dark){ body{ - --theme-color-primary:rgba(0, 0, 0, 0.9); + --theme-color-primary:rgba(0, 0, 0, 0.8); --theme-color-secondary:white; - --theme-accent: #42c0ff; + --theme-accent: #2db1f3; } } body{ color:var(--theme-color-secondary); background-color: var(--theme-color-primary); - background-image: url(/res/bg5.png); - background-size: 15vh; + background-image: url(/res/bg.png); + background-size: 35vh; display:flex; flex-direction: row; flex-wrap: nowrap; @@ -23,7 +23,6 @@ body{ justify-content: space-evenly; width:100%; margin:0; - padding-left:0.25rem; padding-top:1rem; overflow-x: hidden; font-weight: 500; @@ -51,7 +50,6 @@ img, audio{ max-width:100%; max-height: 30vh; - margin:1.5rem; } #profile img { @@ -61,10 +59,9 @@ audio{ } #profile{ margin-bottom:1rem; - width: fit-content; + width: 100%; max-width: 80rem; flex-shrink: none; - } #profile-details{ display:flex; @@ -141,7 +138,7 @@ article,main > div,main>nav{ background-color: var(--theme-color-primary); color: var(--theme-color-secondary); border:0.25rem solid var(--theme-accent); - backdrop-filter: blur(0.1rem); + backdrop-filter: blur(0.5rem); border-radius: 1rem; margin-bottom:1.5rem; width:90%; @@ -149,6 +146,7 @@ article,main > div,main>nav{ article p, article h3, +article h4, article ul, article ol, article table{ @@ -160,13 +158,25 @@ article img{ } blockquote { - margin-left:2rem; - padding-left:1rem; - border-left:0.5rem solid var(--theme-accent); + margin-left: 10%; + padding-left: 2.5rem; + width:80%; + border-left: 0.5rem solid var(--theme-accent); + font-style: italic; } .gallery{ - max-width:40vw; + width:70%; + display:flex; + flex-direction: row; + flex-wrap: wrap; + align-items: center; + justify-content: space-evenly; + +} +.gallery>*{ + margin:0.1rem; + border:1px solid var(--theme-color-accent); } audio{ @@ -179,10 +189,13 @@ audio{ flex-wrap: wrap; align-items: center; justify-content: space-evenly; - width:80%; font-weight: bolder; font-size:1.25rem } +.post-tags>*{ + margin:0.5rem; +} + @media screen and (orientation: portrait){ body{ flex-direction: column; @@ -208,3 +221,23 @@ audio{ +.link-preview{ + display:flex; + flex-direction: row; + flex-wrap: nowrap; + padding:1.5%; + justify-content: center; + text-decoration: none; + text-align: left; + width:80%; +} +.link-preview>div{ + margin:1rem; +} +.link-preview>img{ + max-width: 20%; +} +.link-preview>div>p{ + text-decoration: none !important; + color: var(--theme-color-secondary); +} \ No newline at end of file diff --git a/static/res/bg.png b/static/res/bg.png new file mode 100644 index 0000000..da99fb0 Binary files /dev/null and b/static/res/bg.png differ diff --git a/static/res/bg5.png b/static/res/bg5.png deleted file mode 100644 index 0dc13b9..0000000 Binary files a/static/res/bg5.png and /dev/null differ diff --git a/static/res/default.png b/static/res/default.png index 79455f8..ba01824 100644 Binary files a/static/res/default.png and b/static/res/default.png differ diff --git a/static/res/sand.png b/static/res/sand.png deleted file mode 100644 index 48d8be3..0000000 Binary files a/static/res/sand.png and /dev/null differ