Merge branch 'develop' into fix/jedi-twitter

Author: Fdom92

src/assets/i18n/en.ts

@@ -132,6 +132,7 @@ export const translations = {
         company: 'Company',
         email: 'E-mail*',
         phone: 'Phone*',
+        contact_phone: 'Phone',
         github: 'GitHub URL*',
         designProfile: 'Portfolio*',
         whatAreYouWorkingOn: 'What are you working on?',

src/components/app-cta/app-cta.scss

@@ -63,6 +63,15 @@
     }
   }
 
+  p {
+    color: #ffffff;
+    font-family: Muli;
+    font-size: 40px;
+    font-weight: 700;
+    line-height: 48px;
+    text-align: center;
+  }
+
   button {
     background-color: $orange-dark;
     border: 0.75px solid #ffffff;

src/components/app-cta/app-cta.tsx

@@ -18,9 +18,6 @@ export class AppCta {
               <p>
                 <app-translate keyword="cta.subTitle" />
               </p>
-              <h2>
-                <app-translate keyword="cta.text" />
-              </h2>
               <stencil-route-link url="/contact">
                 <button class="button">
                   <app-translate keyword="cta.link" />

src/components/app-footer/app-footer.tsx

@@ -43,9 +43,9 @@ export class AppFooter {
             <div class="footer--column col-12 col-sm-4">
               <h2>{translate('footer.webinar.signup')}</h2>
               <p>{translate('footer.webinar.webinarText')}</p>
-              <a href="http://startupjunto.org/" target="_blank" id="startup-junto meetup" rel="noopener" class="btn-primary button-link">
+              {/* <a href="http://startupjunto.org/" target="_blank" id="startup-junto meetup" rel="noopener" class="btn-primary button-link">
                 {translate('footer.webinar.register')}
-              </a>
+              </a> */}
             </div>
           </div>
 

src/components/app-nav-header/app-nav-header.scss

@@ -26,6 +26,9 @@ button.navbar-toggler {
 }
 
 nav.navbar .navbar-nav .nav-item {
+  .active {
+    color: $orange;
+  }
   text-align: left;
 
   @include media-breakpoint-down(md) {
@@ -123,6 +126,9 @@ nav.navbar .navbar-nav .nav-link {
       margin-top: 0.5rem;
       margin-bottom: 1.5rem;
     }
+    &.active {
+      color: $orange;
+    }
   }
 }
 

src/components/app-nav-header/app-nav-header.tsx

@@ -78,10 +78,19 @@ export class AppNavHeader {
                   </stencil-route-link>
                 </li>
                 <li class="nav-item dropdown" data-target="#navbarSupportedContent">
-                  <a href="" class="nav-link dropdown-toggle" id="navbarDropdown1" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                  <stencil-route-link
+                    urlMatch={['/blog', '/forge']}
+                    activeClass="active"
+                    anchorClass="nav-link dropdown-toggle"
+                    id="navbarDropdown0"
+                    role="button"
+                    data-toggle="dropdown"
+                    aria-haspopup="true"
+                    aria-expanded="false"
+                  >
                     {translate('nav.links.resources')}
-                  </a>
-                  <div class="dropdown-menu" aria-labelledby="navbarDropdown1">
+                  </stencil-route-link>
+                  <div class="dropdown-menu" aria-labelledby="navbarDropdown0">
                     <stencil-route-link url="/blog" anchorClass="nav-link dropdown-item" activeClass="active">
                       Blog
                     </stencil-route-link>

src/pages/app-about/app-about.scss

@@ -72,7 +72,7 @@
     line-height: 34px;
   }
 
-  p {
+  p.about-text {
     @include media-breakpoint-down(md) {
       color: #5d534e;
       margin-bottom: 1rem;

src/pages/app-about/app-about.tsx

@@ -29,7 +29,7 @@ export class AppAbout {
                 <app-translate class="d-none d-md-block" keyword="about.header.title" />
                 <app-translate class="d-block d-md-none" keyword="about.header.titleSmall" />
               </h1>
-              <p>
+              <p class="about-text">
                 <app-translate keyword="about.header.text" />
               </p>
               <app-img class="d-block d-md-none" src="../../assets/svg/about-graphic-header.svg" />
@@ -46,7 +46,7 @@ export class AppAbout {
                   <app-translate keyword="about.values.title" />
                 </span>
               </h2>
-              <p>
+              <p class="about-text">
                 <app-translate keyword="about.values.text" />
               </p>
             </div>

src/pages/app-contact/app-contact.tsx

@@ -169,7 +169,7 @@ export class AppContact {
 
                       <app-input
                         name="phone"
-                        label={translate('contact.form.phone')}
+                        label={translate('contact.form.contact_phone')}
                         id="phone"
                         type="tel"
                         placeholder={translate('contact.form.placeholder.phone')}

src/pages/app-opportunities/app-opportunities.scss

@@ -42,6 +42,7 @@
         background-size: contain;
         margin-top: 0;
         padding-top: 50px;
+        background-position: bottom;
         height: 100vh;
         background-image: url('/assets/opportunities/opportunities-mobile-transition-dev.svg');
       }
@@ -62,6 +63,7 @@
         background-size: contain;
         margin-top: 0;
         padding-top: 50px;
+        background-position: bottom;
         height: 100vh;
         background-image: url('/assets/opportunities/opportunities-mobile-transition-design.svg');
       }
@@ -82,6 +84,7 @@
         background-size: contain;
         margin-top: 0;
         padding-top: 50px;
+        background-position: bottom;
         height: 100vh;
         background-image: url('/assets/opportunities/opportunities-mobile-transition-dev-design.svg');
       }
@@ -102,6 +105,7 @@
         background-size: contain;
         margin-top: 0;
         padding-top: 50px;
+        background-position: bottom;
         height: 100vh;
         background-image: url('/assets/opportunities/opportunities-mobile-transition-design-dev.svg');
       }
@@ -121,6 +125,7 @@
       @include media-breakpoint-down(sm) {
         background-size: contain;
         margin-top: 0;
+        background-position: bottom;
         padding-top: 50px;
         height: 100vh;
         background-image: url('/assets/opportunities/opportunities-mobile-dev-active.svg');
@@ -142,6 +147,7 @@
         background-size: contain;
         margin-top: 0;
         padding-top: 50px;
+        background-position: bottom;
         height: 100vh;
         background-image: url('/assets/opportunities/opportunities-mobile-design-active.svg');
       }