diff --git a/assets/images/city-novopolotsk-small-en.svg b/assets/images/city-novopolotsk-small-en.svg index 8e165f0..b2352e4 100644 --- a/assets/images/city-novopolotsk-small-en.svg +++ b/assets/images/city-novopolotsk-small-en.svg @@ -1,48 +1,104 @@ - + + - - + - - - - - - - - - + c-0.6,1.1-1.4,2-2.5,2.6S123.2,54.1,121.8,54.1z M121.8,50.8c1.1,0,2-0.4,2.5-1.2c0.6-0.8,0.8-1.8,0.8-3s-0.3-2.2-0.9-3 + c-0.6-0.7-1.4-1.1-2.5-1.1c-0.8,0-1.4,0.2-1.9,0.5s-0.9,0.8-1.1,1.4c-0.2,0.6-0.4,1.3-0.4,2.1c0,1.3,0.3,2.3,0.9,3 + C119.9,50.5,120.7,50.8,121.8,50.8z"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/city-novopolotsk-small-ru.svg b/assets/images/city-novopolotsk-small-ru.svg index 640267a..8cf9a49 100644 --- a/assets/images/city-novopolotsk-small-ru.svg +++ b/assets/images/city-novopolotsk-small-ru.svg @@ -1,41 +1,98 @@ - - - - + .st0{fill:#1D508B;} + .st1{fill:#F2F2F2;} + .st2{fill-rule:evenodd;clip-rule:evenodd;fill:#1D518B;stroke:#FFFFFF;stroke-width:0.75;stroke-miterlimit:10;} + .st3{fill:#FFFFFF;} + .st4{fill-rule:evenodd;clip-rule:evenodd;fill:#FFCB05;} + .st5{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;} + + + + - + - + - - + + - - - - + C187,50.2,188,50.6,188.9,50.6z"/> + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/city-polotsk-small-en.svg b/assets/images/city-polotsk-small-en.svg index 45dd0ed..d08a3cf 100644 --- a/assets/images/city-polotsk-small-en.svg +++ b/assets/images/city-polotsk-small-en.svg @@ -1,34 +1,280 @@ - - - - + .st0{fill:#FFFFFF;} + .st1{fill:#0065B3;} + .st2{fill:none;} + .st3{fill:#F58220;} + .st4{fill-rule:evenodd;clip-rule:evenodd;fill:#0066B3;} + .st5{fill-rule:evenodd;clip-rule:evenodd;} + .st6{fill:none;stroke:#000000;stroke-width:0.25;} + .st7{fill:none;stroke:#000000;} + .st8{fill:none;stroke:#000000;stroke-width:0.25;stroke-miterlimit:10;} + + + + - - - - + + + + - + c0.1,1.3-0.5,2.6-1.6,3.4C210.6,55.2,209.1,55.7,207.5,55.6z"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/city-polotsk-small-ru.svg b/assets/images/city-polotsk-small-ru.svg index ff98baa..baa7116 100644 --- a/assets/images/city-polotsk-small-ru.svg +++ b/assets/images/city-polotsk-small-ru.svg @@ -2,22 +2,266 @@ - - - + .st0{fill:#FFFFFF;} + .st1{fill:#0065B3;} + .st2{fill:#F58220;} + .st3{fill-rule:evenodd;clip-rule:evenodd;fill:#0066B3;} + .st4{fill-rule:evenodd;clip-rule:evenodd;} + .st5{fill:none;stroke:#000000;stroke-width:0.25;} + .st6{fill:none;stroke:#000000;} + .st7{fill:none;stroke:#000000;stroke-width:0.25;stroke-miterlimit:10;} + + + + - - + + - - + C187.3,50.4,188.3,50.8,189.2,50.8z"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/home/citiesCard/citiesCard.tsx b/modules/home/citiesCard/citiesCard.tsx index 8b9d1c1..2a751a5 100644 --- a/modules/home/citiesCard/citiesCard.tsx +++ b/modules/home/citiesCard/citiesCard.tsx @@ -36,30 +36,32 @@ function SmallCitiesLine() { const breakpoint800 = useMediaQuery('(max-width: 800px)'); const cityWidth = breakpoint800 ? 170 : 220; - const swapWidth = cityWidth * 1; + const swapWidth = cityWidth * 2; useScroll((scrollY, delta, time) => { const offset = -(scrollY / 6) - (time / 30); if (rootRef.current) { - rootRef.current.style.transform = `rotate(3deg) translate3D(${offset % swapWidth + cityWidth}px, 0px, 0px)`; + rootRef.current.style.transform = `rotate(3deg) translate3D(${offset % swapWidth + cityWidth * 2}px, 0px, 0px)`; } }, {}, [cityWidth]); const CityPolotsk = router.locale === 'ru' ? CityPolotskSmallRu : CityPolotskSmallEn; + const CityNovopolotsk = router.locale === 'ru' ? CityNovopolotskSmallRu : CityNovopolotskSmallEn; return (
+ + + + - - - - +
); } @@ -77,22 +79,24 @@ function BigCitiesLine() { const offset = (scrollY / 6) + (time / 30); if (rootRef.current) { - rootRef.current.style.transform = `rotate(356deg) translate3D(${offset % swapWidth}px, 0px, 0px)`; + rootRef.current.style.transform = `rotate(356deg) translate3D(${offset % swapWidth * 2}px, 0px, 0px)`; } }, {}, [cityWidth]); + const CityPolotsk = router.locale === 'ru' ? CityPolotskSmallRu : CityPolotskSmallEn; const CityNovopolotsk = router.locale === 'ru' ? CityNovopolotskSmallRu : CityNovopolotskSmallEn; return (
+ + + + - - - - +
);