.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:

assets/main.scss

@@ -25,24 +25,44 @@ body {
 .header {
     @apply p-2 bg-slate-200;
 
-    a:not([target="_blank"]) {
+    .container {
-        @apply hidden xl:inline-block
+        @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;
 }

components/header.vue

@@ -10,13 +10,11 @@ const route = useRoute()
     <div class="header">
         <div class="container">
             <div class="logo">
-                <div class="k-logo">
                 <NuxtLink to="/">
                     <k_logo />
-                        Kupizabor
+                    <span class="logo_text">Kupizabor</span>
                 </NuxtLink>
             </div>
-            </div>
             <div class="menu">
                 <template v-for="item in pagesData">
                     <NuxtLink :to="item.external_link || ((route.name == 'index' ? '' : '/') + `#${item.slug}`)"

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 = () => {
         <div class="modal">
             <span class="modal-close" @click="toggleModal">
                 <Icon name="mdi:close" />
-                <div>
-                    <Icon name="telegram" />
-                </div>
             </span>
             <div class="modal-status" v-if="modal_state.show_status" :class="[modal_state.show_status]">
                 <div class="modal-status-icon">

pages/[slug].vue

@@ -38,10 +38,12 @@ const policyText = computed(() => {
                 <div class="col-span-full prose max-w-full" v-html="policyText" />
             </div>
         </div>
-        <div class="siteblock-image" v-if="data?.image">
+        <div class="siteblock siteblock_imgbg bg-slate-500" v-if="data?.image"
-            <NuxtImg :src="[imgBase, data?.image].join('/')" :alt="data.title || 'фоновая картинка'" title="" format="webp" />
+            :style="[{ backgroundImage: `url(${[imgBase, data?.image].join('/')})` }]">
+            <NuxtImg :src="[imgBase, data?.image].join('/')" class="invisible" alt="data.title || 'фоновая картинка'" title="" format="webp"
+                loading="lazy" />
         </div>
-        <div class="siteblock siteblock_calc bg-white">
+        <div class="siteblock siteblock_calc bg-white" v-else>
             <Suspense>
                 <CalcModels />
             </Suspense>