diff --git a/assets/images/city-miory-small-en.svg b/assets/images/city-miory-small-en.svg new file mode 100644 index 0000000..dec562f --- /dev/null +++ b/assets/images/city-miory-small-en.svg @@ -0,0 +1,309 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/city-miory-small-ru.svg b/assets/images/city-miory-small-ru.svg new file mode 100644 index 0000000..97fef82 --- /dev/null +++ b/assets/images/city-miory-small-ru.svg @@ -0,0 +1,315 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/free-backdrop.png b/assets/images/free-backdrop.png index 1220555..60a598d 100644 Binary files a/assets/images/free-backdrop.png and b/assets/images/free-backdrop.png differ diff --git a/assets/images/free-exclamation-point.svg b/assets/images/free-exclamation-point.svg index d143ed4..176c798 100644 --- a/assets/images/free-exclamation-point.svg +++ b/assets/images/free-exclamation-point.svg @@ -1,4 +1,4 @@ - - + + diff --git a/assets/images/free-screenshot-en.png b/assets/images/free-screenshot-en.png index 6e154e8..2dde7d9 100644 Binary files a/assets/images/free-screenshot-en.png and b/assets/images/free-screenshot-en.png differ diff --git a/assets/images/free-screenshot-ru.png b/assets/images/free-screenshot-ru.png index c33cff5..2dde7d9 100644 Binary files a/assets/images/free-screenshot-ru.png and b/assets/images/free-screenshot-ru.png differ diff --git a/assets/images/ridebus-flat.jpg b/assets/images/ridebus-flat.jpg deleted file mode 100644 index b440ae5..0000000 Binary files a/assets/images/ridebus-flat.jpg and /dev/null differ diff --git a/components/gradients/gradient.fragmentShader.glsl b/components/gradients/gradient.fragmentShader.glsl index 42941e1..ba599dd 100644 --- a/components/gradients/gradient.fragmentShader.glsl +++ b/components/gradients/gradient.fragmentShader.glsl @@ -4,7 +4,7 @@ precision mediump float; const vec3 background = vec3(1.0); const vec3 primary = vec3(0., 0.345, 0.761); -const vec3 tertiary = vec3(0.675, 0.514, 0.682); +const vec3 tertiary = vec3(1., 0., 0.); varying float vHeight; varying float vColor; diff --git a/components/topBar/topBar.tsx b/components/topBar/topBar.tsx index f144a95..94af988 100644 --- a/components/topBar/topBar.tsx +++ b/components/topBar/topBar.tsx @@ -51,4 +51,4 @@ export function TopBar(props: TopBarProps) { ); -} \ No newline at end of file +} diff --git a/modules/contribute/header/header.tsx b/modules/contribute/header/header.tsx index 8279889..cf80300 100644 --- a/modules/contribute/header/header.tsx +++ b/modules/contribute/header/header.tsx @@ -116,6 +116,12 @@ export function Header() { )} /> +
+
+ +
); } \ No newline at end of file diff --git a/modules/home/citiesCard/citiesCard.tsx b/modules/home/citiesCard/citiesCard.tsx index 5d4353e..0eaecfc 100644 --- a/modules/home/citiesCard/citiesCard.tsx +++ b/modules/home/citiesCard/citiesCard.tsx @@ -5,9 +5,11 @@ import useLocale from '@/utils/useLocale'; import { LocalesMap } from '@/utils/useLocale'; import CityPolotskSmallEn from '@/assets/images/city-polotsk-small-en.svg'; import CityNovopolotskSmallEn from '@/assets/images/city-novopolotsk-small-en.svg'; +import CityMiorySmallEn from '@/assets/images/city-miory-small-en.svg'; import CityBigEn from '@/assets/images/city-big-en.svg'; import CityPolotskSmallRu from '@/assets/images/city-polotsk-small-ru.svg'; import CityNovopolotskSmallRu from '@/assets/images/city-novopolotsk-small-ru.svg'; +import CityMiorySmallRu from '@/assets/images/city-miory-small-ru.svg'; import CityBigRu from '@/assets/images/city-big-ru.svg'; import Mask from '@/assets/images/cities-star-mask.svg'; import ridebusImage from '@/assets/images/cities-backdrop.jpg'; @@ -49,19 +51,25 @@ function SmallCitiesLine() { const CityPolotsk = router.locale === 'ru' ? CityPolotskSmallRu : CityPolotskSmallEn; const CityNovopolotsk = router.locale === 'ru' ? CityNovopolotskSmallRu : CityNovopolotskSmallEn; + const CityMiory = router.locale === 'ru' ? CityMiorySmallRu : CityMiorySmallEn; return (
+ + + + +
); } @@ -79,25 +87,31 @@ function BigCitiesLine() { const offset = (scrollY / 6) + (time / 30); if (rootRef.current) { - rootRef.current.style.transform = `rotate(356deg) translate3D(${offset % swapWidth * 2}px, 0px, 0px)`; + rootRef.current.style.transform = `rotate(356deg) translate3D(${offset % swapWidth * 3}px, 0px, 0px)`; } }, {}, [cityWidth]); const CityPolotsk = router.locale === 'ru' ? CityPolotskSmallRu : CityPolotskSmallEn; const CityNovopolotsk = router.locale === 'ru' ? CityNovopolotskSmallRu : CityNovopolotskSmallEn; + const CityMiory = router.locale === 'ru' ? CityMiorySmallRu : CityMiorySmallEn; return (
+ + + + +
); } diff --git a/modules/home/freeCard/freeCard.module.scss b/modules/home/freeCard/freeCard.module.scss index 1446ea4..2a0d89e 100644 --- a/modules/home/freeCard/freeCard.module.scss +++ b/modules/home/freeCard/freeCard.module.scss @@ -10,7 +10,7 @@ .freeForever, .wihthoutAds { --on-background: #000000; - --background: #F3FF6C; + --background: #c0cde6; width: 100%; position: relative; border-radius: 100px; @@ -59,7 +59,7 @@ } .imageCard { - background-color: #FFF0E8; + background-color: #d6e2fe; border-radius: 36px; width: 100%; height: 100%; diff --git a/modules/home/header.tsx b/modules/home/header.tsx index 8e9101a..4ec9964 100644 --- a/modules/home/header.tsx +++ b/modules/home/header.tsx @@ -106,6 +106,13 @@ export default function Header() { {t('slogan_line')} +
+
+ {!breakpoint600 && } +
); diff --git a/pages/index.tsx b/pages/index.tsx index c458374..da18e7e 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -24,6 +24,7 @@ export default function HomePage() {
+
@@ -39,4 +40,4 @@ export default function HomePage() {