Skip to content
This repository was archived by the owner on Feb 5, 2022. It is now read-only.

Commit d70c39d

Browse files
Merge branch 'develop' of https://github.com/openforge/OPENFORGE.IO into feature/services-redesign
# Conflicts: # src/components/app-cta/app-cta.tsx
2 parents c73b8ea + e03f828 commit d70c39d

11 files changed

+64
-8
lines changed

src/assets/i18n/en.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,17 @@ export const translations = {
9090
},
9191
},
9292
},
93+
landing: {
94+
container: {
95+
title1: 'What',
96+
title2: 'Does',
97+
skills: 'Skills'
98+
},
99+
cta: {
100+
title: 'Meet The Team',
101+
button: `Let's Go`
102+
}
103+
}
93104
},
94105

95106
contact: {

src/assets/team-landing-design.png

-21.3 KB
Binary file not shown.
-29.2 KB
Binary file not shown.
13 KB
Loading
15.8 KB
Loading
18.3 KB
Loading
13.7 KB
Loading
-44.1 KB
Binary file not shown.

src/assets/team-landing-pet.png

-46.2 KB
Binary file not shown.

src/pages/app-team-landing/app-team-landing.scss

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// section - team-landing
22
section.team-landing {
3+
font-family: 'Muli', sans-serif;
34
// hero
45
.hero {
56
background-position: top center;
@@ -66,7 +67,7 @@ section.team-landing {
6667
display: grid;
6768

6869
app-img {
69-
justify-self: center;
70+
align-self: center;
7071
img {
7172
object-fit: cover;
7273
}
@@ -76,7 +77,7 @@ section.team-landing {
7677
grid-template-columns: 0.5fr 1fr;
7778

7879
.text-img-container-text {
79-
margin-left: 10px;
80+
margin-left: 35px;
8081
h2,
8182
h4 {
8283
color: $orange;
@@ -142,4 +143,27 @@ section.team-landing {
142143
color: $white;
143144
font-size: 12px;
144145
}
146+
147+
.cta {
148+
background: linear-gradient(-160deg, #f99a2a 0%, #f9902a 100%);
149+
height: 114px;
150+
151+
@include media-breakpoint-down(sm) {
152+
height: 140px;
153+
}
154+
155+
.cta-container {
156+
height: inherit;
157+
line-height: 2.5rem;
158+
}
159+
160+
h3 {
161+
font-size: 1.5rem;
162+
margin: 0 4rem;
163+
@include media-breakpoint-down(sm) {
164+
margin-left: 0;
165+
margin-right: 2rem;
166+
}
167+
}
168+
}
145169
}

0 commit comments

Comments
 (0)