diff --git a/src/components/Layout/Navbar.tsx b/src/components/Layout/Navbar.tsx index ba4f56a..58ae3ec 100644 --- a/src/components/Layout/Navbar.tsx +++ b/src/components/Layout/Navbar.tsx @@ -140,7 +140,7 @@ function LangToggler({ lang }: { lang: Lang }) { return (
-
+

Социальные сети

-
+
  • @@ -52,7 +52,7 @@ export function Decreasing() {
diff --git a/src/components/Main/Distance.tsx b/src/components/Main/Distance.tsx index 9231cd5..f0276a5 100644 --- a/src/components/Main/Distance.tsx +++ b/src/components/Main/Distance.tsx @@ -9,7 +9,7 @@ export function Distance() { устройства
-
+

Обучающиеся будут получать доступ к системе с высоко детализированной 3D графикой для прохождения сценариев на любом diff --git a/src/components/Main/Efficiency.tsx b/src/components/Main/Efficiency.tsx index 0003571..3f0c46a 100644 --- a/src/components/Main/Efficiency.tsx +++ b/src/components/Main/Efficiency.tsx @@ -82,9 +82,9 @@ function Figure({

{title}
-

+

{percents} - + %

diff --git a/src/components/Main/Events.tsx b/src/components/Main/Events.tsx index 09744c4..bb07a72 100644 --- a/src/components/Main/Events.tsx +++ b/src/components/Main/Events.tsx @@ -29,7 +29,7 @@ export function Events() { />
@@ -81,7 +81,7 @@ function LinkButton({ href }: { href: string }) { {hovered && ( )} diff --git a/src/components/Main/ProductTabs/ForTeachingTab.tsx b/src/components/Main/ProductTabs/ForTeachingTab.tsx index fa0873a..c87c743 100644 --- a/src/components/Main/ProductTabs/ForTeachingTab.tsx +++ b/src/components/Main/ProductTabs/ForTeachingTab.tsx @@ -1,6 +1,6 @@ export function ForTeachingTab() { return ( -
+

Интерактивные тренажеры для учебных заведений diff --git a/src/components/Main/ProductTabs/SimulatorsTab.tsx b/src/components/Main/ProductTabs/SimulatorsTab.tsx index 5099dc1..1565d67 100644 --- a/src/components/Main/ProductTabs/SimulatorsTab.tsx +++ b/src/components/Main/ProductTabs/SimulatorsTab.tsx @@ -49,7 +49,7 @@ export function SimulatorsTab() { }); return ( -
+
diff --git a/src/components/Main/ProductTabs/TrainingsTab.tsx b/src/components/Main/ProductTabs/TrainingsTab.tsx index 4c2693e..fc46b16 100644 --- a/src/components/Main/ProductTabs/TrainingsTab.tsx +++ b/src/components/Main/ProductTabs/TrainingsTab.tsx @@ -1,8 +1,8 @@ export function TrainingsTab() { return ( -
+
-
+

Промышленные тренажеры виртуальной реальности diff --git a/src/components/Main/Projects.tsx b/src/components/Main/Projects.tsx index cd08403..562a7b9 100644 --- a/src/components/Main/Projects.tsx +++ b/src/components/Main/Projects.tsx @@ -116,9 +116,11 @@ function Slider({ setSliderOffset(-baseOffset); }, [order, baseOffset, slide]); + useEffect(() => console.log(sliderOffset), [sliderOffset]); + return (
-
+
-
+
Управление процессом @@ -81,7 +81,7 @@ function TeachingFeaturesForDesktop() {
-
+
Статистика обучения Фиксация правильных и неправильных действий. @@ -89,7 +89,7 @@ function TeachingFeaturesForDesktop() { Отчет об ошибках
-
+
+
Управление @@ -119,12 +119,12 @@ function TeachingFeaturesForOtherScreens() {
-
+
Управление процессом Назначение сценария обучения @@ -133,12 +133,12 @@ function TeachingFeaturesForOtherScreens() {
-
+
Видеозапись обучения Фиксация и хранение сессий обучения, тренировки и тестирования. @@ -146,19 +146,19 @@ function TeachingFeaturesForOtherScreens() {
-
+
Статистика обучения - + Фиксация правильных и неправильных действий.
Отчет об ошибках
-
+
diff --git a/src/components/Main/Trainings.tsx b/src/components/Main/Trainings.tsx index 7857a7f..e424f22 100644 --- a/src/components/Main/Trainings.tsx +++ b/src/components/Main/Trainings.tsx @@ -70,7 +70,7 @@ function TrainingsFeature({ ref={ref} className="lg:first:h-[200px] lg:last:h-[200px] lg:h-[176px] sm:flex items-stretch justify-between sm:py-10 mobile:max-sm:pt-5" > -
+

{title}

@@ -80,7 +80,7 @@ function TrainingsFeature({

{order}

-
+

{order}

-
+
-

+

{order}

diff --git a/src/index.css b/src/index.css index f6e98b9..b16087b 100644 --- a/src/index.css +++ b/src/index.css @@ -15,38 +15,38 @@ body { @layer components { .h1 { - @apply -tracking-[.02em] leading-[90%] desktop-figma:text-[clamp(96px,6vw,128px)] lg:max-desktop-figma:text-[clamp(76px,76px+(100vw-1024px)/576*20,96px)] tablet-figma:max-lg:text-[clamp(64px,64px+(100vw-768px)/256*16,80px)] sm:max-tablet-figma:text-[clamp(56px,56px+(100vw-640px)/128*8,64px)] mobile:max-sm:text-[clamp(40px,40px+(100vw-360px)/280*4,44px)]; + @apply -tracking-[.02em] leading-[90%] desktop-figma:text-[clamp(96px,6vw,128px)] lg:max-desktop-figma:text-[clamp(76px,76px+(100vw-1024px)/576*20,96px)] md:max-lg:text-[clamp(64px,64px+(100vw-768px)/256*16,80px)] sm:max-md:text-[clamp(56px,56px+(100vw-640px)/128*8,64px)] mobile:max-sm:text-[clamp(40px,40px+(100vw-360px)/280*4,44px)]; } .h2 { - @apply -tracking-[.02em] lg:leading-[90%] mobile:max-lg:leading-[100%] desktop-figma:text-[clamp(64px,4vw,80px)] lg:max-desktop-figma:text-[clamp(56px,56px+(100vw-1024px)/576*8,64px)] tablet-figma:max-lg:text-[clamp(40px,40px+(100vw-768px)/256*12,52px)] sm:max-tablet-figma:text-[clamp(32px,32px+(1000vw-640px)/128*8,40px)] mobile:max-sm:text-[clamp(28px,28px+(100vw-360px)/280*4,32px)]; + @apply -tracking-[.02em] lg:leading-[90%] mobile:max-lg:leading-[100%] desktop-figma:text-[clamp(64px,4vw,80px)] lg:max-desktop-figma:text-[clamp(56px,56px+(100vw-1024px)/576*8,64px)] md:max-lg:text-[clamp(40px,40px+(100vw-768px)/256*12,52px)] sm:max-md:text-[clamp(32px,32px+(1000vw-640px)/128*8,40px)] mobile:max-sm:text-[clamp(28px,28px+(100vw-360px)/280*4,32px)]; } .h3 { - @apply leading-[100%] desktop-figma:text-[clamp(32px,2vw,40px)] lg:max-desktop-figma:text-[clamp(28px,28px+(100vw-1024px)/576*4,32px)] tablet-figma:max-lg:text-[clamp(24px,24px+(100vw-768px)/256*4,28px)] sm:max-tablet-figma:text-[clamp(20px,20px+(100vw-640px)/128*4,24px)] mobile:max-sm:text-[clamp(20px,20px+(100vw-360px)/280*4,24px)]; + @apply leading-[100%] desktop-figma:text-[clamp(32px,2vw,40px)] lg:max-desktop-figma:text-[clamp(28px,28px+(100vw-1024px)/576*4,32px)] md:max-lg:text-[clamp(24px,24px+(100vw-768px)/256*4,28px)] sm:max-md:text-[clamp(20px,20px+(100vw-640px)/128*4,24px)] mobile:max-sm:text-[clamp(20px,20px+(100vw-360px)/280*4,24px)]; } .h4 { - @apply leading-[120%] desktop-figma:text-[clamp(14px,0.875vw,16px)] lg:max-desktop-figma:text-sm tablet-figma:max-lg:text-[clamp(16px,16px+(100vw-768px)/256*2,18px)] sm:max-tablet-figma:text-[clamp(14px,14px+(100vw-640px)/128*2,16px)] mobile:max-sm:text-[clamp(14px,14px+(100vw-360px)/280*2,16px,18px)]; + @apply leading-[120%] desktop-figma:text-[clamp(14px,0.875vw,16px)] lg:max-desktop-figma:text-sm md:max-lg:text-[clamp(16px,16px+(100vw-768px)/256*2,18px)] sm:max-md:text-[clamp(14px,14px+(100vw-640px)/128*2,16px)] mobile:max-sm:text-[clamp(14px,14px+(100vw-360px)/280*2,16px,18px)]; } .l-text { - @apply leading-[135%] desktop-figma:text-[clamp(18px,1.125vw,20px)] lg:max-desktop-figma:text-[clamp(16px,16px+(100vw-1024px)/576*2,18px)] tablet-figma:max-lg:text-[clamp(16px,16px+(100vw-768px)/256*2,18px)] sm:max-tablet-figma:text-[clamp(14px,14px+(100vw-640px)/128*2,16px)] mobile:max-sm:text-[clamp(14px,14px+(100vw-360px)/280*2,16px)]; + @apply leading-[135%] desktop-figma:text-[clamp(18px,1.125vw,20px)] lg:max-desktop-figma:text-[clamp(16px,16px+(100vw-1024px)/576*2,18px)] md:max-lg:text-[clamp(16px,16px+(100vw-768px)/256*2,18px)] sm:max-md:text-[clamp(14px,14px+(100vw-640px)/128*2,16px)] mobile:max-sm:text-[clamp(14px,14px+(100vw-360px)/280*2,16px)]; } .m-text { - @apply leading-[140%] desktop-figma:text-[clamp(14px,0.875vw,16px)] lg:max-desktop-figma:text-sm tablet-figma:max-lg:text-[clamp(12px,12px+(100vw-768px)/576*2,14px)] sm:max-tablet-figma:text-xs mobile:max-sm:text-[clamp(12px,12px+(100vw-360px)/280*2,14px)]; + @apply leading-[140%] desktop-figma:text-[clamp(14px,0.875vw,16px)] lg:max-desktop-figma:text-sm md:max-lg:text-[clamp(12px,12px+(100vw-768px)/576*2,14px)] sm:max-md:text-xs mobile:max-sm:text-[clamp(12px,12px+(100vw-360px)/280*2,14px)]; } .btn-text { - @apply -tracking-[.02em] leading-[100%] desktop-figma:text-[clamp(18px,1.125vw,20px)] lg:max-desktop-figma:text-[clamp(16px,16px+(100vw-1024px)/576*2,18px)] tablet-figma:max-lg:text-[clamp(16px,16px+(100vw-768px)/256*2,18px)] sm:max-tablet-figma:text-[clamp(14px,14px+(100vw-640px)/128*2,16px)] mobile:max-sm:text-[clamp(14px,14px+(100vw-360px)/280*2,16px)]; + @apply -tracking-[.02em] leading-[100%] desktop-figma:text-[clamp(18px,1.125vw,20px)] lg:max-desktop-figma:text-[clamp(16px,16px+(100vw-1024px)/576*2,18px)] md:max-lg:text-[clamp(16px,16px+(100vw-768px)/256*2,18px)] sm:max-md:text-[clamp(14px,14px+(100vw-640px)/128*2,16px)] mobile:max-sm:text-[clamp(14px,14px+(100vw-360px)/280*2,16px)]; } .link { - @apply tracking-[.02em] leading-[120%] desktop-figma:text-[clamp(14px,0.875vw,16px)] lg:max-desktop-figma:text-[clamp(12px,12px+(100vw-1024px)/576*2,14px)] tablet-figma:max-lg:text-[clamp(12px,12px+(100vw-768px)/256*2,14px)] sm:max-tablet-figma:text-xs mobile:max-sm:text-[clamp(12px,12px+(100vw-360px)/280*2,14px)]; + @apply tracking-[.02em] leading-[120%] desktop-figma:text-[clamp(14px,0.875vw,16px)] lg:max-desktop-figma:text-[clamp(12px,12px+(100vw-1024px)/576*2,14px)] md:max-lg:text-[clamp(12px,12px+(100vw-768px)/256*2,14px)] sm:max-md:text-xs mobile:max-sm:text-[clamp(12px,12px+(100vw-360px)/280*2,14px)]; } .descriptor { - @apply tracking-[.02em] leading-[120%] desktop-figma:text-[clamp(14px,0.875vw,16px)] lg:max-desktop-figma:text-[clamp(12px,12px+(100vw-1024px)/576*2,14px)] tablet-figma:max-lg:text-[clamp(12px,12px+(100vw-640px)/256*2,14px)] sm:max-tablet-figma:text-xs mobile:max-sm:text-[clamp(12px,12px+(100vw-360px)/280*2,14px)]; + @apply tracking-[.02em] leading-[120%] desktop-figma:text-[clamp(14px,0.875vw,16px)] lg:max-desktop-figma:text-[clamp(12px,12px+(100vw-1024px)/576*2,14px)] md:max-lg:text-[clamp(12px,12px+(100vw-640px)/256*2,14px)] sm:max-md:text-xs mobile:max-sm:text-[clamp(12px,12px+(100vw-360px)/280*2,14px)]; } .feedback-field:focus ~ .feedback-placeholder { diff --git a/tailwind.config.js b/tailwind.config.js index d1b66ca..ed68c42 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -7,7 +7,6 @@ export default { extend: { screens: { mobile: '360px', - 'tablet-figma': '768px', 'desktop-figma': '1600px', }, animation: {