mirror of
https://github.com/sergeyyarkov/yarkov.tech.git
synced 2026-10-11 10:29:21 +03:00
fix
This commit is contained in:
parent
fcd6eb6d04
commit
605618f90f
@ -33,9 +33,7 @@ export default defineConfig({
|
|||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
// image(),
|
// image(),
|
||||||
compress({
|
compress(),
|
||||||
html: false,
|
|
||||||
}),
|
|
||||||
mdx({
|
mdx({
|
||||||
remarkPlugins: [remarkGfm, remarkSmartypants],
|
remarkPlugins: [remarkGfm, remarkSmartypants],
|
||||||
rehypePlugins: [
|
rehypePlugins: [
|
||||||
|
|||||||
@ -2,9 +2,9 @@
|
|||||||
import { IS_SITE_UNDER_CONSTRUCTION } from "@root/config";
|
import { IS_SITE_UNDER_CONSTRUCTION } from "@root/config";
|
||||||
import Header from "@components/Header";
|
import Header from "@components/Header";
|
||||||
import Footer from "@components/Footer";
|
import Footer from "@components/Footer";
|
||||||
|
import SiteContent from "@components/SiteContent";
|
||||||
import HeaderBanner from "@components/HeaderBanner";
|
import HeaderBanner from "@components/HeaderBanner";
|
||||||
import UIString from "@components/UIString";
|
import UIString from "@components/UIString";
|
||||||
import "./BaseLayout.scss";
|
|
||||||
---
|
---
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
@ -18,8 +18,8 @@ import "./BaseLayout.scss";
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
<Header />
|
<Header />
|
||||||
<main class="site-content">
|
<SiteContent>
|
||||||
<slot />
|
<slot />
|
||||||
</main>
|
</SiteContent>
|
||||||
<Footer />
|
<Footer />
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
@ -1,11 +0,0 @@
|
|||||||
.site-content {
|
|
||||||
flex: 1 0 auto;
|
|
||||||
width: 100%;
|
|
||||||
margin-top: 5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media screen and (max-width: 768px) {
|
|
||||||
.site-content {
|
|
||||||
margin-top: 3rem;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,5 +1,4 @@
|
|||||||
---
|
---
|
||||||
import "./Footer.scss";
|
|
||||||
import { Icon } from "astro-icon";
|
import { Icon } from "astro-icon";
|
||||||
---
|
---
|
||||||
|
|
||||||
@ -22,3 +21,38 @@ import { Icon } from "astro-icon";
|
|||||||
<p class="footer__copy">© Sergey Yarkov, 2022</p>
|
<p class="footer__copy">© Sergey Yarkov, 2022</p>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
|
|
||||||
|
<style lang="scss">
|
||||||
|
footer {
|
||||||
|
user-select: none;
|
||||||
|
text-align: center;
|
||||||
|
font-weight: 500;
|
||||||
|
margin-top: 5rem;
|
||||||
|
& .container {
|
||||||
|
padding: 25px 0 10px 0;
|
||||||
|
border-top: 1px solid var(--border-color);
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
row-gap: 15px;
|
||||||
|
}
|
||||||
|
& ul {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
column-gap: 25px;
|
||||||
|
& li {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
column-gap: 7px;
|
||||||
|
& a {
|
||||||
|
color: var(--font-color);
|
||||||
|
font-size: var(--font-size-sm);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
& p {
|
||||||
|
text-align: center;
|
||||||
|
font-size: var(--font-size-xs);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|||||||
@ -1,34 +0,0 @@
|
|||||||
.footer {
|
|
||||||
& .container {
|
|
||||||
margin-top: 5rem;
|
|
||||||
padding: 25px 0 10px 0;
|
|
||||||
font-weight: 500;
|
|
||||||
border-top: 1px solid var(--border-color);
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
align-items: center;
|
|
||||||
row-gap: 15px;
|
|
||||||
user-select: none;
|
|
||||||
}
|
|
||||||
&__links {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
column-gap: 25px;
|
|
||||||
list-style: none;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
& li {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
column-gap: 7px;
|
|
||||||
& a {
|
|
||||||
color: var(--font-color);
|
|
||||||
font-size: var(--font-size-sm);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
&__copy {
|
|
||||||
text-align: center;
|
|
||||||
font-size: var(--font-size-xs);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
17
src/components/SiteContent/SiteContent.astro
Normal file
17
src/components/SiteContent/SiteContent.astro
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
<main>
|
||||||
|
<slot />
|
||||||
|
</main>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
main {
|
||||||
|
flex: 1 0 auto;
|
||||||
|
width: 100%;
|
||||||
|
margin-top: 5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 768px) {
|
||||||
|
main {
|
||||||
|
margin-top: 3rem;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
1
src/components/SiteContent/index.ts
Normal file
1
src/components/SiteContent/index.ts
Normal file
@ -0,0 +1 @@
|
|||||||
|
export { default } from "./SiteContent.astro";
|
||||||
@ -6,10 +6,9 @@ import mime from "mime-types";
|
|||||||
import BaseHead from "@components/BaseHead.astro";
|
import BaseHead from "@components/BaseHead.astro";
|
||||||
import BaseLayout from "@components/BaseLayout";
|
import BaseLayout from "@components/BaseLayout";
|
||||||
import ArticleContent from "@components/ArticleContent";
|
import ArticleContent from "@components/ArticleContent";
|
||||||
import * as utils from "@utils/string";
|
|
||||||
import ArticlePost from "@components/ArticlePost";
|
import ArticlePost from "@components/ArticlePost";
|
||||||
import "@styles/global.scss";
|
|
||||||
import { SITE_METADATA } from "@root/config";
|
import { SITE_METADATA } from "@root/config";
|
||||||
|
import "@styles/global.scss";
|
||||||
|
|
||||||
export interface Props extends BaseHeadProps {
|
export interface Props extends BaseHeadProps {
|
||||||
lang?: string | undefined;
|
lang?: string | undefined;
|
||||||
@ -27,17 +26,15 @@ const { lang = "ru", content, canonicalUrl } = Astro.props as Props;
|
|||||||
<meta property="og:description" content={content.description} />
|
<meta property="og:description" content={content.description} />
|
||||||
<meta property="og:type" content="article" />
|
<meta property="og:type" content="article" />
|
||||||
<meta property="og:url" content={canonicalUrl} />
|
<meta property="og:url" content={canonicalUrl} />
|
||||||
{
|
{content.coverImage && (
|
||||||
content.coverImage && (
|
|
||||||
<meta property="og:image" content={`${Astro.url.origin}${content.coverImage}`} />
|
<meta property="og:image" content={`${Astro.url.origin}${content.coverImage}`} />
|
||||||
<meta property="og:image:width" content="700" />
|
<meta property="og:image:width" content="700" />
|
||||||
<meta property="og:image:height" content="400" />
|
<meta property="og:image:height" content="400" />
|
||||||
<meta property="og:image:type" content={`${mime.lookup(extname(content.coverImage))}`} />
|
<meta property="og:image:type" content={`${mime.lookup(extname(content.coverImage))}`} />
|
||||||
)
|
)}
|
||||||
}
|
<script is:inline defer src="/assets/js/load-code-highlight.js"></script>
|
||||||
</BaseHead>
|
</BaseHead>
|
||||||
|
|
||||||
<script is:inline defer src="/assets/js/load-code-highlight.js"></script>
|
|
||||||
|
|
||||||
<BaseLayout>
|
<BaseLayout>
|
||||||
<div class="container">
|
<div class="container">
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user