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

Commit ec68469

Browse files
Merge branch 'meet-the-team' into member-details-updates
2 parents 59dbab3 + 44753fb commit ec68469

File tree

7 files changed

+293
-71
lines changed

7 files changed

+293
-71
lines changed

package-lock.json

Lines changed: 30 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/assets/fonts/Muli.css

Lines changed: 60 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,81 @@
11
/* vietnamese */
22
@font-face {
3+
font-display: swap;
34
font-family: 'Muli';
45
font-style: normal;
56
font-weight: 400;
6-
src: local('Muli Regular'), local('Muli-Regular'), url(https://fonts.gstatic.com/s/muli/v12/7Auwp_0qiz-afT3GLQjUwkQ1OQ.woff2) format('woff2');
7+
src: url(https://fonts.gstatic.com/s/muli/v19/7Auwp_0qiz-afT3GLQjUwkQ1OQ.woff2) format('woff2');
78
unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB;
8-
font-display: fallback;
99
}
1010
/* latin-ext */
1111
@font-face {
12+
font-display: swap;
1213
font-family: 'Muli';
1314
font-style: normal;
1415
font-weight: 400;
15-
src: local('Muli Regular'), local('Muli-Regular'), url(https://fonts.gstatic.com/s/muli/v12/7Auwp_0qiz-afTzGLQjUwkQ1OQ.woff2) format('woff2');
16+
src: url(https://fonts.gstatic.com/s/muli/v19/7Auwp_0qiz-afTzGLQjUwkQ1OQ.woff2) format('woff2');
1617
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
17-
font-display: fallback;
1818
}
1919
/* latin */
2020
@font-face {
21+
font-display: swap;
2122
font-family: 'Muli';
2223
font-style: normal;
2324
font-weight: 400;
24-
src: local('Muli Regular'), local('Muli-Regular'), url(https://fonts.gstatic.com/s/muli/v12/7Auwp_0qiz-afTLGLQjUwkQ.woff2) format('woff2');
25+
src: url(https://fonts.gstatic.com/s/muli/v19/7Auwp_0qiz-afTLGLQjUwkQ.woff2) format('woff2');
26+
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
27+
}
28+
/* vietnamese */
29+
@font-face {
30+
font-display: swap;
31+
font-family: 'Muli';
32+
font-style: normal;
33+
font-weight: 600;
34+
src: url(https://fonts.gstatic.com/s/muli/v19/7Auwp_0qiz-afT3GLQjUwkQ1OQ.woff2) format('woff2');
35+
unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB;
36+
}
37+
/* latin-ext */
38+
@font-face {
39+
font-display: swap;
40+
font-family: 'Muli';
41+
font-style: normal;
42+
font-weight: 600;
43+
src: url(https://fonts.gstatic.com/s/muli/v19/7Auwp_0qiz-afTzGLQjUwkQ1OQ.woff2) format('woff2');
44+
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
45+
}
46+
/* latin */
47+
@font-face {
48+
font-display: swap;
49+
font-family: 'Muli';
50+
font-style: normal;
51+
font-weight: 600;
52+
src: url(https://fonts.gstatic.com/s/muli/v19/7Auwp_0qiz-afTLGLQjUwkQ.woff2) format('woff2');
53+
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
54+
}
55+
/* vietnamese */
56+
@font-face {
57+
font-display: swap;
58+
font-family: 'Muli';
59+
font-style: normal;
60+
font-weight: 700;
61+
src: url(https://fonts.gstatic.com/s/muli/v19/7Auwp_0qiz-afT3GLQjUwkQ1OQ.woff2) format('woff2');
62+
unicode-range: U+0102-0103, U+0110-0111, U+1EA0-1EF9, U+20AB;
63+
}
64+
/* latin-ext */
65+
@font-face {
66+
font-display: swap;
67+
font-family: 'Muli';
68+
font-style: normal;
69+
font-weight: 700;
70+
src: url(https://fonts.gstatic.com/s/muli/v19/7Auwp_0qiz-afTzGLQjUwkQ1OQ.woff2) format('woff2');
71+
unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
72+
}
73+
/* latin */
74+
@font-face {
75+
font-display: swap;
76+
font-family: 'Muli';
77+
font-style: normal;
78+
font-weight: 700;
79+
src: url(https://fonts.gstatic.com/s/muli/v19/7Auwp_0qiz-afTLGLQjUwkQ.woff2) format('woff2');
2580
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
26-
font-display: fallback;
2781
}

src/assets/i18n/en.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,12 @@ export const translations = {
5757
about: {
5858
header: {
5959
title: 'We Are Passionate About Technology and Design',
60+
titleSmall: 'We Are Passionate About Technology & Design',
6061
text: "We believe that your success is our success. We're here to challenge your assumptions and help you discover your web or mobile applications full potential.",
6162
action: 'LEARN MORE',
6263
},
6364
mission: {
65+
title: 'Our Mission',
6466
statement: 'Our mission is to forge a bond between people and technology through digital experiences.',
6567
},
6668
values: {
@@ -72,8 +74,7 @@ export const translations = {
7274
value3: 'Transparency',
7375
},
7476
team: {
75-
title: 'Get to Know Us',
76-
text: "There's no doubt that our team is made up of brilliant and talented individuals who are passionate about technology and design thinking. Together we design, code, grow, and evolve.",
77+
title: 'Meet our Team',
7778
member: {
7879
title: {
7980
apply: 'Click to Apply',
@@ -94,8 +95,7 @@ export const translations = {
9495
},
9596
landing: {
9697
container: {
97-
title1: 'What',
98-
title2: 'Does',
98+
title1: 'About',
9999
skills: 'Skills',
100100
},
101101
cta: {

0 commit comments

Comments
 (0)