Resolve merge conflicts

hexlet-rus · Jun 26, 2024 · 0ad1b42 · 0ad1b42
1 parent 996fff2
commit 0ad1b42
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 50 deletions.
diff --git a/frontend/src/pages/landing/Footer.jsx b/frontend/src/pages/landing/Footer.jsx
@@ -232,7 +232,6 @@ function Footer() {
           <Col>
             <div className="mb-2">
               <p className="mb-0">
-<<<<<<< HEAD
                 <NavbarBrand href={tF('tel1Href')}>
                   <b>{tF('tel1')}</b>
                 </NavbarBrand>
@@ -246,59 +245,41 @@ function Footer() {
                 </NavbarBrand>
               </p>
               <p className="m-0">{tF('moscow')}</p>
-=======
-                <NavbarBrand href={t('footer.tel1Href')}>
-                  <b>{t('footer.tel1')}</b>
+                <NavbarBrand href={tF('tel1Href')}>
+                  <b>{tF('tel1')}</b>
                 </NavbarBrand>
               </p>
-              <p className="m-0">{t('footer.rf')}</p>
+              <p className="m-0">{tF('rf')}</p>
             </div>
             <div>
               <p className="m-0">
-                <NavbarBrand href={t('footer.tel2Href')}>
-                  <b>{t('footer.tel2')}</b>
+                <NavbarBrand href={tF('tel2Href')}>
+                  <b>{tF('tel2')}</b>
                 </NavbarBrand>
               </p>
-              <p className="m-0">{t('footer.moscow')}</p>
->>>>>>> hexlet-rus/main
+              <p className="m-0">{tF('moscow')}</p>
             </div>
           </Col>
           <Col>
             <Nav as="ul" className="list-group flex-column">
               <li className="mb-2">
                 <NavbarBrand className="p-0" href="#aboutProject">
-<<<<<<< HEAD
                   {tLH('about')}
-=======
-                  {t('landing.header.about')}
->>>>>>> hexlet-rus/main
                 </NavbarBrand>
               </li>
               <li className="mb-2">
                 <NavbarBrand className="p-0" href="#advantages">
-<<<<<<< HEAD
                   {tLH('advantages')}
-=======
-                  {t('landing.header.advantages')}
->>>>>>> hexlet-rus/main
                 </NavbarBrand>
               </li>
               <li className="mb-2">
                 <NavbarBrand className="p-0" href="#possibilities">
-<<<<<<< HEAD
                   {tLH('opportunities')}
-=======
-                  {t('landing.header.opportunities')}
->>>>>>> hexlet-rus/main
                 </NavbarBrand>
               </li>
               <li className="mb-2">
                 <NavbarBrand className="p-0" href="#faq">
-<<<<<<< HEAD
                   {tLH('faq')}
-=======
-                  {t('landing.header.faq')}
->>>>>>> hexlet-rus/main
                 </NavbarBrand>
               </li>
             </Nav>
@@ -311,11 +292,7 @@ function Footer() {
                   href="https://ru.hexlet.io/pages/about"
                   target="_blank"
                 >
-<<<<<<< HEAD
                   {tF('about')}
-=======
-                  {t('footer.about')}
->>>>>>> hexlet-rus/main
                 </NavbarBrand>
               </li>
               <li className="mb-2">
@@ -324,11 +301,7 @@ function Footer() {
                   href="https://hexlet-ru.notion.site/c6406ed8890747e690d32b050faf42c2"
                   target="_blank"
                 >
-<<<<<<< HEAD
                   {tF('career')}
-=======
-                  {t('footer.career')}
->>>>>>> hexlet-rus/main
                 </NavbarBrand>
               </li>
               <li className="mb-2">
@@ -337,11 +310,7 @@ function Footer() {
                   href="https://hexlet.printdirect.ru/?partner_id=615497"
                   target="_blank"
                 >
-<<<<<<< HEAD
                   {tF('shop')}
-=======
-                  {t('footer.shop')}
->>>>>>> hexlet-rus/main
                 </NavbarBrand>
               </li>
               <li className="mb-2">
@@ -350,11 +319,7 @@ function Footer() {
                   href="mailto: [email protected]"
                   target="_blank"
                 >
-<<<<<<< HEAD
                   {tF('mailSupport')}
-=======
-                  {t('footer.mailSupport')}
->>>>>>> hexlet-rus/main
                 </NavbarBrand>
               </li>
             </Nav>
@@ -367,7 +332,6 @@ function Footer() {
               <p className="m-0">{tF('ogrn')}</p>
             </div>
           </Col>
-        </Row>
       </Container>
     </footer>
   );

diff --git a/frontend/src/pages/landing/landing.scss b/frontend/src/pages/landing/landing.scss
@@ -161,15 +161,9 @@ $font-family: 'Nunito Sans';
         }
     }
 
-<<<<<<< HEAD
-    @media (max-width: 991px) {
-        .background-dark {
-            color: black;
-        }
-=======
 @media (max-width: 991px) {
     .background-dark {
         color: black;
->>>>>>> hexlet-rus/main
     }
-}
+  }
+}