diff --git a/astro.config.mjs b/astro.config.mjs index a954ce2..50ab317 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -33,9 +33,7 @@ export default defineConfig({ }, }), // image(), - compress({ - html: false, - }), + compress(), mdx({ remarkPlugins: [remarkGfm, remarkSmartypants], rehypePlugins: [ diff --git a/src/components/BaseLayout/BaseLayout.astro b/src/components/BaseLayout/BaseLayout.astro index 390519e..8e18df1 100644 --- a/src/components/BaseLayout/BaseLayout.astro +++ b/src/components/BaseLayout/BaseLayout.astro @@ -2,9 +2,9 @@ import { IS_SITE_UNDER_CONSTRUCTION } from "@root/config"; import Header from "@components/Header"; import Footer from "@components/Footer"; +import SiteContent from "@components/SiteContent"; import HeaderBanner from "@components/HeaderBanner"; import UIString from "@components/UIString"; -import "./BaseLayout.scss"; --- @@ -18,8 +18,8 @@ import "./BaseLayout.scss"; ) }
-
+ -
+ + + diff --git a/src/components/Footer/Footer.scss b/src/components/Footer/Footer.scss deleted file mode 100644 index 82847af..0000000 --- a/src/components/Footer/Footer.scss +++ /dev/null @@ -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); - } -} diff --git a/src/components/SiteContent/SiteContent.astro b/src/components/SiteContent/SiteContent.astro new file mode 100644 index 0000000..098514b --- /dev/null +++ b/src/components/SiteContent/SiteContent.astro @@ -0,0 +1,17 @@ +
+ +
+ + diff --git a/src/components/SiteContent/index.ts b/src/components/SiteContent/index.ts new file mode 100644 index 0000000..f093e67 --- /dev/null +++ b/src/components/SiteContent/index.ts @@ -0,0 +1 @@ +export { default } from "./SiteContent.astro"; diff --git a/src/layouts/article.astro b/src/layouts/article.astro index 8dce44a..ddff15a 100644 --- a/src/layouts/article.astro +++ b/src/layouts/article.astro @@ -6,10 +6,9 @@ import mime from "mime-types"; import BaseHead from "@components/BaseHead.astro"; import BaseLayout from "@components/BaseLayout"; import ArticleContent from "@components/ArticleContent"; -import * as utils from "@utils/string"; import ArticlePost from "@components/ArticlePost"; -import "@styles/global.scss"; import { SITE_METADATA } from "@root/config"; +import "@styles/global.scss"; export interface Props extends BaseHeadProps { lang?: string | undefined; @@ -27,17 +26,15 @@ const { lang = "ru", content, canonicalUrl } = Astro.props as Props; - { - content.coverImage && ( - - - - - ) - } + {content.coverImage && ( + + + + + )} + -