From 93ffeae65a346ddd5f4d6ea8b42cc8619dc8923c Mon Sep 17 00:00:00 2001 From: Salam-vsem Date: Thu, 22 May 2025 14:55:31 +0300 Subject: [PATCH] fixes --- .gitea/workflows/deploy.yml | 2 +- public/favicon.ico | Bin 0 -> 4286 bytes public/favicon.png | Bin 0 -> 648 bytes src/components/Footer.astro | 2 +- src/components/Hero.astro | 2 +- src/components/Marquee.astro | 4 +- src/components/Reviews.tsx | 14 ++--- src/components/coaches/CoachCard.tsx | 2 +- src/components/header/Header.astro | 4 +- src/components/header/MobileNavigation.tsx | 2 +- .../services/CharachteristicCard.tsx | 4 +- src/components/swiper/simple-swiper.css | 4 +- src/content/pages/main.md | 2 +- src/i18n/utils.ts | 1 + src/layouts/BaseLayout.astro | 7 ++- src/pages/404.astro | 4 +- src/pages/coaches/styles.css | 2 +- src/pages/index.astro | 2 +- src/styles/global.css | 20 +++---- tailwind.config.js | 52 +++++++++++------- 20 files changed, 72 insertions(+), 58 deletions(-) create mode 100644 public/favicon.ico create mode 100644 public/favicon.png diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 2c9ccc6..81cfb58 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -22,7 +22,7 @@ jobs: run: | echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT echo REPO_VERSION=${GITHUB_REF_NAME#v} >> $GITHUB_OUTPUT - + # - name: Debug metadata outputs # run: echo "${{ toJson(steps.meta.outputs) }}" diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..42961c2785d211f5f3f27f4c26cd27751c70f814 GIT binary patch literal 4286 zcmc&&TTc@~6keYN<;i%72BRiE83iw|KI@~JpeAbk0r;T*MSp?u1%H6|8;wZPCM<2~ z)|M725N)K;h3>X#kLNqxDZATtS+*n&S%#U}o$s47=X_@dO*_CpqoW#rYp+H$?TDsn z=lS6-?K(f`m%?LbF0`L^ho;dkrKX!yxSgWvyLHc-EvreDsWREQnx{Ww#mwF zQ*)aeT&&DC=LC|#Pjb8XaDO?NtZUFdPi%t&W5MRoB+nj!!-G9?V0miQyERJb zxnI|Gj&I{qT=LA)W5bK@aN7%q>W7Nxq+6?7Hgd@dbzvjEFUG0r=vrf~F8kigK4CaO zA2YlbXna9(Ry$w7ms6)$>v^pm`vRNaRoKc;qH<8!`jE4S>}Q3E1+o_{vI`a!?=S4^ zyKmhJTh)y!`y)Wau{FR>O+j59uRcV+62Oj|G6!U1^|f-h0kbV&n`0B`1J-7Y`EZ(QcH+_%AVwxT5*pbvhH^82W2 zv!CHCxA`XAUMrlS8fW32HdmPbnmH71rGlmmJqAC=8LVr+{g|rFT9fCqZEemBjnVJL zp7E`4`qaS2*?!QnqiZhh?1L%3$NrBq9_%$}fi{b_xOF=STaB@gmL_wAGjG&_JO-Wg zXewgeAMXm&-OurdJa1*A-P@3>ao14yB4t&0 z&&gRlC$N#j%`Y4W9M_5)YWN!Na?5ixZC26OVPL9L&aXK$ype8ad)Y{U6(t1nD|!z2l!w0KRMOUfdBvi literal 0 HcmV?d00001 diff --git a/public/favicon.png b/public/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..39329e3c9e62c9a1b5b449cbf8e2dedb87c02361 GIT binary patch literal 648 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyX99deT!Hi|hE@9+_FrYVx}V|x zF_~j$q|RIvzqnuY>JgC}hj`8%<+*r*`|=^KYexjH9u>HDjQ7$Bo~uWMt{xSUb1%m=IuN8?%RLh@TJRFu0MP6^3|KS z@7{m-@$>J$-U??gplOUr-tI2W=@)pDfNU907sn8b({m@?4m)HZ;M(7@ts|^A%3*EP zmawH2jBA?&XMFxI|I~SbcINJgQ+wXcoqWcJVf!9$hJZ-vuTO2gc~;C>Y<3~*NGd1=TK1KGQVI?oemy9{HSE}vc#GEddpNa4H@2~U5PcX->~_O>$@{`7MycGpG`^7yLV4;q)julT+P+_*?+a0_l|oReNw+0%|}-IEVzq^$du^ey<@hsM8# n#jIbJw$08;Kh7X9^{4)d_N>aRSGP6;1C7Dc)z4*}Q$iB}V~sRB literal 0 HcmV?d00001 diff --git a/src/components/Footer.astro b/src/components/Footer.astro index 1974c33..89731b6 100644 --- a/src/components/Footer.astro +++ b/src/components/Footer.astro @@ -29,7 +29,7 @@ const t = useTranslations(lang)

{ socialMediaLinks && ( -
+
{socialMediaLinks.map(({ href, target, icon }) => { return ( diff --git a/src/components/Hero.astro b/src/components/Hero.astro index 8ca50ef..7cb4640 100644 --- a/src/components/Hero.astro +++ b/src/components/Hero.astro @@ -10,7 +10,7 @@ type Props = z.infer> & { className?: string } const { title, description, cta, image, imageAlt, className } = Astro.props --- -
+
diff --git a/src/components/Marquee.astro b/src/components/Marquee.astro index 6d0bec9..7b1dadd 100644 --- a/src/components/Marquee.astro +++ b/src/components/Marquee.astro @@ -11,7 +11,9 @@ const repeatedTexts = texts.length < 10 ? Array.from({ length: 10 / texts.length }, () => texts).flat() : texts --- -
+
{ repeatedTexts.map((text) => ( <> diff --git a/src/components/Reviews.tsx b/src/components/Reviews.tsx index fb9775b..c302312 100644 --- a/src/components/Reviews.tsx +++ b/src/components/Reviews.tsx @@ -29,7 +29,7 @@ export const Reviews: React.FC = ({ reviews, lang }) => { = ({ reviews, lang }) => { /> ))}
-
+
{review}
{author && ( @@ -64,7 +64,7 @@ export const Reviews: React.FC = ({ reviews, lang }) => { /> )}
- {author.name} + {author.name} {author.description}
@@ -73,18 +73,16 @@ export const Reviews: React.FC = ({ reviews, lang }) => { ))} -
+
- - {t('reviews.viewMore.title')} - + {t('reviews.viewMore.title')} {t('reviews.viewMore.description')} = ({ data, slug }) => { className="absolute inset-0 flex flex-col justify-end bg-gradient-to-t from-black/80 via-transparent p-2 lg:p-3" >
-

{name}

+

{name}

 diff --git a/src/components/header/Header.astro b/src/components/header/Header.astro index 6b44099..a36cfe9 100644 --- a/src/components/header/Header.astro +++ b/src/components/header/Header.astro @@ -25,13 +25,13 @@ const t = useTranslations(lang)
- + THEREALSKILLstudio
diff --git a/src/pages/coaches/styles.css b/src/pages/coaches/styles.css index f45560c..b63e28f 100644 --- a/src/pages/coaches/styles.css +++ b/src/pages/coaches/styles.css @@ -25,5 +25,5 @@ } .coach-card-list > li { - @apply flex items-center rounded-2xl bg-card px-3 py-2; + @apply flex items-center rounded-2xl bg-light px-3 py-2; } diff --git a/src/pages/index.astro b/src/pages/index.astro index 7aee315..e5fde46 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -80,7 +80,7 @@ const t = useTranslations(lang) id="image-slider" title={t('slider.title')} description={t('slider.subtitle')} - className="bg-bg-light" + className="bg-light" >
diff --git a/src/styles/global.css b/src/styles/global.css index 777ec78..23a88c0 100644 --- a/src/styles/global.css +++ b/src/styles/global.css @@ -20,9 +20,9 @@ @layer base { :root { - --header-height: 4rem; + --header-height: 5rem; --marquee-height: 105px; - --swiper-theme-color: rgba(198, 15, 211, 1) !important; + --swiper-theme-color: #ffffff !important; } html { @@ -32,7 +32,7 @@ html, body { - @apply h-full w-full bg-bg-main text-text; + @apply h-full w-full bg-main text; } h1 { @@ -60,28 +60,28 @@ h4, h5, h6 { - @apply text-text-light; + @apply text-white; } a { - @apply transform cursor-pointer no-underline duration-300 ease-in-out hover:text-text-light; + @apply transform cursor-pointer no-underline duration-300 ease-in-out hover:text-white; } } @layer components { .brand-btn { - @apply rounded-full bg-brand px-6 py-3 text-center text-text-light transition-colors duration-300 hover:bg-brand/80; + @apply rounded-full bg-brand px-6 py-3 text-center text-white transition-colors duration-300 hover:bg-brand/80; } .brand-btn-outline { - @apply rounded-full border border-brand bg-transparent px-6 py-3 text-center text-text-light transition-colors duration-300 hover:bg-brand; + @apply rounded-full border border-brand bg-transparent px-6 py-3 text-center text-white transition-colors duration-300 hover:bg-brand; } .tag-btn { - @apply hover:tag-btn-active rounded-full bg-card p-2 text-sm transition-colors duration-300; + @apply hover:tag-btn-active rounded-full bg-light p-2 text-sm transition-colors duration-300; } .tag-btn-active { - @apply bg-brand text-text-light; + @apply bg-brand text-white; } .card { - @apply rounded-3xl bg-card p-4 md:p-6; + @apply rounded-3xl bg-light p-4 md:p-6; } } diff --git a/tailwind.config.js b/tailwind.config.js index da65ad5..bf68ae5 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,31 +1,41 @@ -import { TW_WIDTHS } from './src/constants/images'; +import { TW_WIDTHS } from './src/constants/images' /** @type {import('tailwindcss').Config} */ + +const colors = { + background: { + DEFAULT: 'rgba(19, 21, 20, 1)', + light: 'rgba(28, 28, 30, 1)', + }, + text: { + DEFAULT: '#C4C4C4', + muted: '#D9D9D9', + }, + brand: { + DEFAULT: 'rgba(198, 15, 211, 1)', + }, + border: { + DEFAULT: '#D9D9D9', + }, +} + export default { content: ['./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}'], - theme: { + theme: { extend: { screens: { - xs: `${TW_WIDTHS.XS}px`, + xs: `${TW_WIDTHS.XS}px`, }, - colors: { - bg: { - main: 'rgba(19, 21, 20, 1)', - light: 'rgba(28, 28, 30, 1)', - }, - card: { - DEFAULT: 'rgba(28, 28, 30, 1)', - }, - brand: { - DEFAULT: 'rgba(198, 15, 211, 1)', - }, - text: { - light: '#FFFFFF', - DEFAULT: '#C4C4C4', - }, - border: { - light: '#D9D9D9', - }, + colors, + textColor: { + DEFAULT: colors.text.DEFAULT, + }, + backgroundColor: { + main: colors.background.DEFAULT, + light: colors.background.light, + }, + borderColor: { + DEFAULT: colors.border.DEFAULT, }, aspectRatio: { '3/4': '3 / 4',