From 86a8c84dad54f055ec54f9b5d84471e7dd92e40a Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Thu, 11 Jul 2024 10:26:29 +0300 Subject: [PATCH 1/4] fix bg --- pages/[slug].vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pages/[slug].vue b/pages/[slug].vue index 59ea8ef..4403149 100644 --- a/pages/[slug].vue +++ b/pages/[slug].vue @@ -38,8 +38,10 @@ const policyText = computed(() => {
-
- +
+
-- 2.40.1 From 19999cc49295095fa5375af7ee64e63f6e84b0a9 Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Thu, 11 Jul 2024 10:33:08 +0300 Subject: [PATCH 2/4] deploy img base --- .gitea/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index eab5afb..932251f 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -41,7 +41,7 @@ jobs: HOSTING_PATH: ${{ gitea.ref_name == 'main' && '/home/svs-adm/mns-mini-zabor' || '/home/svs-adm/mns-mini-zabor_dev' }} DOCKER_PORT: ${{ gitea.ref_name == 'main' && '8103' || '8104' }} NUXT_PUBLIC_API_BASE: ${{'https://mns.'}}${{ gitea.ref_name == 'dev' && 'dev.' || '' }}kustarshina.ru/kp - NUXT_PUBLIC_IMG_BASE: 'https://mns.kustarshina.ru' + NUXT_PUBLIC_IMG_BASE: ${{'https://kupizabor.'}}${{ gitea.ref_name == 'dev' && 'dev.' || '' }}kustarshina.ru NUXT_PUBLIC_BASE_URL: ${{'https://kupizabor.'}}${{ gitea.ref_name == 'dev' && 'dev.' || '' }}kustarshina.ru NUXT_PUBLIC_YANDEX_METRIKA_ID: ${{ secrets.YANDEX_METRIKA_ID }} with: -- 2.40.1 From b7fb99af23d9b2083e7fec22068d2edaa0e43e49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=97=D0=B5=D0=BB=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F=20?= =?UTF-8?q?=D0=90=D0=BD=D0=B0=D1=81=D1=82=D0=B0=D1=81=D0=B8=D1=8F=20=D0=9D?= =?UTF-8?q?=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B5=D0=B2=D0=BD=D0=B0?= Date: Thu, 11 Jul 2024 10:51:44 +0300 Subject: [PATCH 3/4] telegram --- components/modal.vue | 4 ---- 1 file changed, 4 deletions(-) diff --git a/components/modal.vue b/components/modal.vue index 08259d1..76e2c70 100644 --- a/components/modal.vue +++ b/components/modal.vue @@ -2,7 +2,6 @@ import { getColorNameFromRal } from '@/components/ral' import type { ralTypes } from '@/components/ral' import { apiFetch } from '~/utils/apiFetch'; -import telegram from '@/assets/icons/telegram.svg' const config = useRuntimeConfig() const apiBase = config.public.apiBase @@ -200,9 +199,6 @@ const policy = () => {
-
- -
-- 2.40.1 From 0fd9dd472dbccb69938473d41eefa96329a5a1bf Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Thu, 11 Jul 2024 11:16:20 +0300 Subject: [PATCH 4/4] topmenu styles --- assets/main.scss | 39 +++++++++++++++++++++++++++++++-------- components/header.vue | 10 ++++------ pages/[slug].vue | 2 +- 3 files changed, 36 insertions(+), 15 deletions(-) diff --git a/assets/main.scss b/assets/main.scss index 54c8691..45156b9 100644 --- a/assets/main.scss +++ b/assets/main.scss @@ -25,24 +25,44 @@ body { .header { @apply p-2 bg-slate-200; - a:not([target="_blank"]) { - @apply hidden xl:inline-block + .container { + @apply items-center; } } .logo { - @apply text-ioprim font-bold w-20 text-2xl leading-4 py-4 col-span-4 xl:col-span-2; + @apply w-full py-4 col-span-4 xl:col-span-2; + + a { + @apply flex items-center gap-2; + } + + &_text { + @apply leading-4 text-3xl font-semibold; + } + + svg { + @apply text-ioprim inline-block m-0 w-10 h-10; + } } .menu { - @apply col-span-8 flex justify-between; + @apply col-span-10 flex justify-end; a { - @apply underline decoration-0 underline-offset-4 decoration-dotted hover:decoration-transparent transition-all; + @apply hover:text-ioprim-900 transition-colors; + + &:before { + content: ''; + @apply inline-block w-[2px] h-5 mx-4 align-middle bg-gradient-to-t from-transparent via-[#333333] via-50% to-transparent; + } + &:first-child::before { + content: none; + } } a[href^=http] { - @apply relative no-underline; + @apply relative; &:after { content: '↷'; @@ -63,7 +83,7 @@ a[href^="#"] { } .k-logo { - @apply col-span-12 xl:col-span-2 row-span-3 text-9xl text-ioprim; + @apply col-span-12 xl:col-span-2 row-span-3 text-9xl; svg { @apply my-0 mx-auto; @@ -150,9 +170,11 @@ a[href^="#"] { &-status { @apply text-center; + &-icon { @apply text-8xl; } + &-text { @apply text-3xl; } @@ -172,8 +194,9 @@ label { } input { - @apply bg-neutral-200 border border-gray-300 text-gray-900 rounded focus:ring-blue-500 focus:border-blue-500 text-lg p-2.5 disabled:cursor-not-allowed; + @apply bg-neutral-200 border border-gray-300 text-gray-900 rounded focus:ring-blue-500 focus:border-blue-500 text-lg p-2.5 disabled:cursor-not-allowed disabled:text-black; } + input[type=checkbox] { @apply w-4 h-4; } diff --git a/components/header.vue b/components/header.vue index 92b19df..93ef533 100644 --- a/components/header.vue +++ b/components/header.vue @@ -10,12 +10,10 @@ const route = useRoute()