diff --git a/src/components/Candidate/Candidate.module.css b/src/components/Candidate/Candidate.module.css index b513947a..8d96e1b7 100644 --- a/src/components/Candidate/Candidate.module.css +++ b/src/components/Candidate/Candidate.module.css @@ -109,9 +109,9 @@ cursor: pointer; .arrow > span { margin-left: 40px; margin-right: 120px; - font-family: 'GT Eesti Pro Display - Thin'; + font-family: 'GT Eesti Pro Display'; font-size: 1.8em; - font-weight: 400; + font-weight: 100; font-style: normal; letter-spacing: normal; line-height: 36px; diff --git a/src/components/Candidate/sections/Section.module.css b/src/components/Candidate/sections/Section.module.css index 9acb655b..1c78ea26 100644 --- a/src/components/Candidate/sections/Section.module.css +++ b/src/components/Candidate/sections/Section.module.css @@ -10,14 +10,14 @@ } .SectionOne > p { - font-family: 'GT Eesti Pro Display - Thin'; + font-family: 'GT Eesti Pro Display'; font-size: 1.8em; - font-weight: 400; + font-weight: 100; font-style: normal; letter-spacing: normal; line-height: 28px; text-align: left; - color: #444444; + } .SectionOne > h4 { @@ -38,7 +38,6 @@ letter-spacing: normal; line-height: 28px; text-align: left; - color: #444444; } .SectionThree > h3 { @@ -52,14 +51,13 @@ } .SectionThree > p { - font-family: 'GT Eesti Pro Display - Thin'; + font-family: 'GT Eesti Pro Display'; font-size: 1.8em; - font-weight: 400; + font-weight: 100; font-style: normal; letter-spacing: normal; line-height: 28px; text-align: left; - color: #444444; } .SectionThree > h4 { @@ -112,12 +110,11 @@ } .SectionSkills > p { - font-family: 'GT Eesti Pro Display - Thin'; - font-size: 2em; - font-weight: 400; + font-family: 'GT Eesti Pro Display'; + font-size: 1.8em; + font-weight: 100; font-style: normal; letter-spacing: normal; line-height: 28px; text-align: left; - color: #444444; } \ No newline at end of file diff --git a/src/components/Sidebar/Sidebar.js b/src/components/Sidebar/Sidebar.js index dcf8b7bd..cc8589b8 100644 --- a/src/components/Sidebar/Sidebar.js +++ b/src/components/Sidebar/Sidebar.js @@ -1,5 +1,5 @@ import React from 'react'; -import male from '../../images/medium_male.png'; +import maleBig from '../../images/medium_male_big.png'; import arrowLeft from '../../images/arrow_left.png'; import arrowRight from '../../images/arrow_right.png'; import style from './Sidebar.module.css'; @@ -8,7 +8,7 @@ const Sidebar = () => { return (
- +

Опыт работы

4+ лет

@@ -19,7 +19,7 @@ const Sidebar = () => {
- 1/15 + 1 / 15
diff --git a/src/components/Sidebar/Sidebar.module.css b/src/components/Sidebar/Sidebar.module.css index 98938227..6fbc7e0d 100644 --- a/src/components/Sidebar/Sidebar.module.css +++ b/src/components/Sidebar/Sidebar.module.css @@ -20,7 +20,7 @@ .candidateSidebar__info__e { font-family: 'GT Eesti Pro Display'; font-size: 1.8em; - font-weight: 400; + font-weight: normal; font-style: normal; letter-spacing: normal; line-height: 36px; @@ -28,7 +28,7 @@ } .candidateSidebar__info__y { - font-family: 'GT Eesti Pro Display - Bold'; + font-family: 'GT Eesti Pro Display'; font-size: 3em; font-weight: 700; font-style: normal; @@ -41,17 +41,17 @@ height: 60px; border-radius: 100px; border: none; - background-color: #70c03e; + background-color: #73c141; color: #ffffff; - font-family: 'GT Eesti Pro Display'; - font-size: 1.8em; - font-weight: 600; + font-family: 'Muller'; + font-size: 1.6em; font-style: normal; letter-spacing: normal; line-height: normal; text-align: center; margin-top: 20px; margin-bottom: 120px; + } .candidateSidebar__info__l { @@ -88,8 +88,8 @@ .arrows__sp { color: #705fa3; - font-family: Circe; - font-size: 1.6em; + font-family: 'Circe'; + font-size: 1.3em; font-weight: 400; font-style: normal; letter-spacing: normal; diff --git a/src/fonts/muller_extrabold_demo.ttf b/src/fonts/muller_extrabold_demo.ttf new file mode 100755 index 00000000..a29d558a Binary files /dev/null and b/src/fonts/muller_extrabold_demo.ttf differ diff --git a/src/fonts/muller_extrabold_demo.woff b/src/fonts/muller_extrabold_demo.woff new file mode 100644 index 00000000..05c0e264 Binary files /dev/null and b/src/fonts/muller_extrabold_demo.woff differ diff --git a/src/fonts/muller_extrabold_demo.woff2 b/src/fonts/muller_extrabold_demo.woff2 new file mode 100644 index 00000000..67a1fc27 Binary files /dev/null and b/src/fonts/muller_extrabold_demo.woff2 differ diff --git a/src/fonts/stylesheet.css b/src/fonts/stylesheet.css index 03673618..d07c927d 100644 --- a/src/fonts/stylesheet.css +++ b/src/fonts/stylesheet.css @@ -344,3 +344,14 @@ font-style: italic; } +@font-face { + font-family: 'Muller'; + src: + url('muller_extrabold_demo.woff2') format('woff2'), + url('muller_extrabold_demo.woff') format('woff'), + url('muller_extrabold_demo.ttf') format('truetype'); + font-weight: bold; + font-style: normal; +} + + diff --git a/src/images/medium_male_big.png b/src/images/medium_male_big.png new file mode 100644 index 00000000..32641463 Binary files /dev/null and b/src/images/medium_male_big.png differ