Merge branch 'main' into adaptive-landing

app/javascript/components/Navbar.jsx

@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
 import routes from '../routes.js';
 import { useAuth } from '../hooks';
 import classes from './Navbar.module.css';
-import Logo from '/app/assets/landing/images/logo.png'
+import Logo from '/app/assets/landing/images/logo.svg'
 
 export function Navbar() {
   const auth = useAuth();

views/landing/modules/header.pug

@@ -1,7 +1,7 @@
 header
     nav.navbar.navbar-dark.py-3.navbar-expand-md
-        a.navbar-brand(href="/")
-            img.d-inline-block.align-top(src="/landing/images/logo.png" alt='hexlet')
+        a.pt-lg-0.pb-lg-2.navbar-brand(href="/")
+            img.d-inline-block.align-top(src="/landing/images/logo.svg" alt='hexlet' width="100" height="30")
             p.d-inline-block.align-bottom.ms-1.mb-0.lh-sm Runit
         button.navbar-toggler(type="button" data-bs-toggle="collapse" data-bs-target="#navbarToggler" aria-controls="navbarToggler" aria-expanded="false" aria-label="Toggle navigation")
             span.navbar-toggler-icon
@@ -12,4 +12,4 @@ header
                 li.nav-item.mb-2.mb-md-0
                     a.btn.btn-light.me-md-4.py-2.fs-md-5.fs-6.lh-5(href="/login") Войти
                 li.nav-item
-                    a.btn.btn-primary.py-2.fs-md-5.fs-6.lh-5(href="/signup") Регистрация
+                    a.btn.btn-primary.py-2.fs-md-5.fs-6.lh-5(href="/signup") Регистрация