Merge branch 'release/1.0.4' into main

This commit is contained in:
Sergey Yarkov 2022-11-05 22:08:29 +03:00
commit 36478d1080
No known key found for this signature in database
GPG Key ID: E91CE1FABC619B6F
12 changed files with 1021 additions and 941 deletions

View File

@ -6,3 +6,4 @@ updates:
interval: "weekly" interval: "weekly"
day: "friday" day: "friday"
target-branch: "develop" target-branch: "develop"
open-pull-requests-limit: 10

View File

@ -5,7 +5,6 @@ import solid from "@astrojs/solid-js";
import mdx from "@astrojs/mdx"; import mdx from "@astrojs/mdx";
import sitemap from "@astrojs/sitemap"; import sitemap from "@astrojs/sitemap";
import image from "@astrojs/image"; import image from "@astrojs/image";
import compress from "astro-compress";
/** /**
* Remark plugins * Remark plugins
@ -46,9 +45,8 @@ export default defineConfig({
locales: Object.fromEntries(Object.keys(languages).map((key) => [key, key])), locales: Object.fromEntries(Object.keys(languages).map((key) => [key, key])),
}, },
}), }),
image(), image({
compress({ serviceEntryPoint: "@astrojs/image/sharp",
img: false,
}), }),
mdx({ mdx({
remarkPlugins: [remarkGfm, remarkSmartypants], remarkPlugins: [remarkGfm, remarkSmartypants],

@ -1 +1 @@
Subproject commit f6935ce7cb7e7926ebd39375b1ce7383bd08442b Subproject commit 174135ce8e96c4fc14b0f4df1d549fd8f463ce6d

1841
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
{ {
"name": "yarkov.tech", "name": "yarkov.tech",
"version": "1.0.3", "version": "1.0.4",
"private": true, "private": true,
"description": "Personal website created with Astro.", "description": "Personal website created with Astro.",
"author": { "author": {
@ -19,32 +19,34 @@
"lint": "eslint '**/*.{js,mjs,ts,tsx}'" "lint": "eslint '**/*.{js,mjs,ts,tsx}'"
}, },
"devDependencies": { "devDependencies": {
"@astrojs/image": "^0.7.1", "@astrojs/image": "^0.11.1",
"@astrojs/mdx": "^0.11.1", "@astrojs/mdx": "^0.11.5",
"@astrojs/rss": "^1.0.1", "@astrojs/rss": "^1.0.3",
"@astrojs/sitemap": "^1.0.0", "@astrojs/sitemap": "^1.0.0",
"@astrojs/solid-js": "^1.1.0", "@astrojs/solid-js": "^1.2.2",
"@types/html-escaper": "^3.0.0", "@types/html-escaper": "^3.0.0",
"@types/mdx": "^2.0.2", "@types/mdx": "^2.0.3",
"@typescript-eslint/eslint-plugin": "^5.38.0", "@typescript-eslint/eslint-plugin": "^5.42.0",
"@typescript-eslint/parser": "^5.38.0", "@typescript-eslint/parser": "^5.42.0",
"astro": "^1.3.0", "astro": "^1.6.3",
"astro-compress": "^1.0.8", "astro-icon": "^0.8.0",
"astro-icon": "^0.7.3", "eslint": "^8.26.0",
"eslint": "^8.23.1", "eslint-plugin-solid": "^0.8.0",
"eslint-plugin-solid": "^0.7.3",
"hast-util-to-string": "^2.0.0", "hast-util-to-string": "^2.0.0",
"hastscript": "^7.0.2", "hastscript": "^7.1.0",
"html-escaper": "^3.0.3", "html-escaper": "^3.0.3",
"mime-types": "^2.1.35", "mime-types": "^2.1.35",
"netlify-plugin-minify-html": "^0.3.1", "netlify-plugin-minify-html": "^0.3.1",
"prettier": "^2.7.1", "prettier": "^2.7.1",
"prettier-plugin-astro": "^0.5.4", "prettier-plugin-astro": "^0.7.0",
"rehype-autolink-headings": "^6.1.1", "rehype-autolink-headings": "^6.1.1",
"rehype-slug": "^5.0.1", "rehype-slug": "^5.1.0",
"remark-gfm": "^3.0.1", "remark-gfm": "^3.0.1",
"remark-smartypants": "^2.0.0", "remark-smartypants": "^2.0.0",
"sass": "^1.55.0", "sass": "^1.56.0",
"solid-js": "^1.5.5" "solid-js": "^1.6.1"
},
"dependencies": {
"sharp": "^0.31.2"
} }
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 MiB

View File

@ -1,11 +1,4 @@
.article-content { .article-content {
& p,
& em,
& q {
line-height: var(--line-height-base);
font-size: var(--font-size-lg);
}
& h1, & h1,
h2, h2,
h3, h3,
@ -17,11 +10,11 @@
padding-bottom: 5px; padding-bottom: 5px;
} }
& ul { & ul,
ol {
padding-left: 1.5rem; padding-left: 1.5rem;
line-height: var(--line-height-base); line-height: var(--line-height-base);
margin-bottom: 1.5rem; margin: 1.5rem 0;
margin-top: 0;
& li { & li {
font-size: var(--font-size-lg); font-size: var(--font-size-lg);
line-height: var(--line-height-base); line-height: var(--line-height-base);
@ -50,6 +43,9 @@
& figure { & figure {
margin: 0 0 1em; margin: 0 0 1em;
& figcaption {
color: var(--color-gray-400);
}
} }
& hr { & hr {

View File

@ -12,7 +12,7 @@ export type Props = {
}; };
const { data, lang } = Astro.props as Props; const { data, lang } = Astro.props as Props;
const { title, coverImage, tags, author, published_at } = data; const { title, description, coverImage, tags, author, published_at } = data;
--- ---
<article itemscope itemtype="http://schema.org/BlogPosting" class="article"> <article itemscope itemtype="http://schema.org/BlogPosting" class="article">
@ -41,13 +41,13 @@ const { title, coverImage, tags, author, published_at } = data;
</div> </div>
{ {
coverImage && ( coverImage && (
<div> <div class="cover">
<figure> <figure>
<Picture <Picture
itemprop="image" itemprop="image"
src={isURL(coverImage) ? coverImage : `../../../content/assets/images/${coverImage}`} src={isURL(coverImage) ? coverImage : `../../../content/assets/images/${coverImage}`}
sizes="(max-width: 500px) 500px, 700px" sizes="(max-width: 450px) 450px, 700px"
widths={[500, 700]} widths={[450, 700]}
formats={["webp"]} formats={["webp"]}
aspectRatio={"16:9"} aspectRatio={"16:9"}
alt={title} alt={title}
@ -56,6 +56,11 @@ const { title, coverImage, tags, author, published_at } = data;
</div> </div>
) )
} }
<div class="description">
<p>
{description}
</p>
</div>
</header> </header>
<slot /> <slot />
<ArticleComments /> <ArticleComments />

View File

@ -31,21 +31,28 @@
} }
} }
& img { & .cover {
border-radius: var(--border-radius-md); margin: 20px 0;
display: block; & figure {
margin: 0 auto; margin: 0;
max-width: 100%; }
height: auto;
}
& figure {
margin: 0;
} }
& footer { & footer {
margin-top: 5rem; margin-top: 5rem;
} }
& img {
border-radius: var(--border-radius-lg);
display: block;
margin: 0 auto;
max-width: 100%;
height: auto;
&:not([src*=".svg"]) {
filter: var(--image-filter);
}
}
} }
@media screen and (max-width: 560px) { @media screen and (max-width: 560px) {

View File

@ -57,7 +57,7 @@ const t = useTranslation(Astro);
} }
@media screen and (max-width: 560px) { @media screen and (max-width: 560px) {
.contact-form .flex { form .flex {
flex-direction: column; flex-direction: column;
row-gap: 7px; row-gap: 7px;
} }

View File

@ -35,6 +35,13 @@ body {
background: var(--background-body-color); background: var(--background-body-color);
} }
p,
em,
q {
line-height: var(--line-height-base);
font-size: var(--font-size-lg);
}
.container { .container {
max-width: var(--content-width); max-width: var(--content-width);
margin: 0 auto; margin: 0 auto;
@ -80,11 +87,6 @@ body {
} }
} }
p {
margin-top: 0;
margin-bottom: 1.5rem;
}
ul { ul {
list-style: none; list-style: none;
padding: 0; padding: 0;

View File

@ -25,7 +25,7 @@
--line-height-none: 1; --line-height-none: 1;
--line-height-shorter: 1.25; --line-height-shorter: 1.25;
--line-height-short: 1.375; --line-height-short: 1.375;
--line-height-base: 1.5; --line-height-base: 1.525;
--line-height-tall: 1.625; --line-height-tall: 1.625;
/* Colors */ /* Colors */
@ -138,6 +138,8 @@
--icon-secondary: var(--color-gray-100); --icon-secondary: var(--color-gray-100);
--icon-filter: invert(100%); --icon-filter: invert(100%);
--image-filter: grayscale(50%);
& body > header svg, & body > header svg,
& body > main svg:not([data-filter="none"]) { & body > main svg:not([data-filter="none"]) {
filter: var(--icon-filter); filter: var(--icon-filter);