diff --git a/src/components/Auth/AuthForDevelopers.module.css b/src/components/Auth/AuthForDevelopers.module.css index 52d6f97e..76dc33a7 100644 --- a/src/components/Auth/AuthForDevelopers.module.css +++ b/src/components/Auth/AuthForDevelopers.module.css @@ -155,7 +155,9 @@ border: none; color: #ffffff; font-family: 'Muller'; + font-weight: 500; font-size: 2.2em; + font-weight: bold; letter-spacing: normal; line-height: 71.88px; text-align: center; @@ -182,7 +184,8 @@ background-color: #ffffff; border: 2px solid #6aaf5c; font-family: 'Muller'; - font-size: 1.8em; + font-size: 2em; + font-weight: 300; letter-spacing: normal; line-height: 71.88px; text-align: center; diff --git a/src/components/Auth/AuthForPartners.module.css b/src/components/Auth/AuthForPartners.module.css index 313e9954..763b5f98 100644 --- a/src/components/Auth/AuthForPartners.module.css +++ b/src/components/Auth/AuthForPartners.module.css @@ -155,6 +155,7 @@ border: none; color: #ffffff; font-family: 'Muller'; + font-weight: bold; font-size: 2.2em; letter-spacing: normal; line-height: 71.88px; @@ -179,7 +180,8 @@ background-color: #ffffff; border: 2px solid #6aaf5c; font-family: 'Muller'; - font-size: 1.8em; + font-size: 2em; + font-weight: 300; letter-spacing: normal; line-height: 71.88px; text-align: center; diff --git a/src/components/Description/Description.js b/src/components/Description/Description.js index c6627b0e..349db46c 100644 --- a/src/components/Description/Description.js +++ b/src/components/Description/Description.js @@ -31,7 +31,7 @@ const Description = ({ onLoadMore }) => {

- {el.specification} {SKILLS[el.position_id]}, {LEVELS[el.level]} + {el.specification} {SKILLS[el.position_id]}, {LEVELS[el.level]}

{el.vc_text_short ? ( @@ -88,7 +88,7 @@ const Description = ({ onLoadMore }) => {

- {el.specification} {SKILLS[el.position_id]}, {LEVELS[el.level]} + {el.specification} {SKILLS[el.position_id]}, {LEVELS[el.level]}

{el.vc_text_short ? ( diff --git a/src/components/Description/Description.module.css b/src/components/Description/Description.module.css index 192adb7f..d8f1cf54 100644 --- a/src/components/Description/Description.module.css +++ b/src/components/Description/Description.module.css @@ -53,7 +53,7 @@ margin-bottom: 10px; } -.description__title { +.description__title a { color: #333; } @@ -115,6 +115,7 @@ border: none; color: #ffffff; font-family: 'Muller'; + font-weight: bold; font-size: 1.6em; line-height: normal; letter-spacing: 0.8px; diff --git a/src/components/Outstaffing/OutstaffingBlock.js b/src/components/Outstaffing/OutstaffingBlock.js index 5a728129..a77be9b4 100644 --- a/src/components/Outstaffing/OutstaffingBlock.js +++ b/src/components/Outstaffing/OutstaffingBlock.js @@ -21,7 +21,7 @@ const handlePositionClick = ({dispatch, positionId, isSelected}) => { }; const OutstaffingBlock = ({ dataTags = [], selected, img, header, positionId, isSelected, onSelect }) => { - console.log('p', positionId) + const dispatch = useDispatch(); const itemsArr = useSelector(selectItems); diff --git a/src/components/Select/TagSelect.module.css b/src/components/Select/TagSelect.module.css index e5490bfe..283e2a7c 100644 --- a/src/components/Select/TagSelect.module.css +++ b/src/components/Select/TagSelect.module.css @@ -71,6 +71,10 @@ color: gray !important; } +.search__submit { + font-weight: bold; +} + .search__submit:hover .loader path { fill: #6aaf5c; } \ No newline at end of file diff --git a/src/fonts/MullerBold.ttf b/src/fonts/MullerBold.ttf new file mode 100644 index 00000000..129aa962 Binary files /dev/null and b/src/fonts/MullerBold.ttf differ diff --git a/src/fonts/MullerBold.woff b/src/fonts/MullerBold.woff new file mode 100644 index 00000000..f45c711a Binary files /dev/null and b/src/fonts/MullerBold.woff differ diff --git a/src/fonts/MullerBold.woff2 b/src/fonts/MullerBold.woff2 new file mode 100644 index 00000000..57fc0870 Binary files /dev/null and b/src/fonts/MullerBold.woff2 differ diff --git a/src/fonts/MullerLight.ttf b/src/fonts/MullerLight.ttf new file mode 100644 index 00000000..ac6ddaa3 Binary files /dev/null and b/src/fonts/MullerLight.ttf differ diff --git a/src/fonts/MullerLight.woff b/src/fonts/MullerLight.woff new file mode 100644 index 00000000..e73f152c Binary files /dev/null and b/src/fonts/MullerLight.woff differ diff --git a/src/fonts/MullerLight.woff2 b/src/fonts/MullerLight.woff2 new file mode 100644 index 00000000..22585e24 Binary files /dev/null and b/src/fonts/MullerLight.woff2 differ diff --git a/src/fonts/MullerRegular.ttf b/src/fonts/MullerRegular.ttf new file mode 100644 index 00000000..9b791ab7 Binary files /dev/null and b/src/fonts/MullerRegular.ttf differ diff --git a/src/fonts/MullerRegular.woff b/src/fonts/MullerRegular.woff new file mode 100644 index 00000000..d17f3692 Binary files /dev/null and b/src/fonts/MullerRegular.woff differ diff --git a/src/fonts/MullerRegular.woff2 b/src/fonts/MullerRegular.woff2 new file mode 100644 index 00000000..d5e52d8b Binary files /dev/null and b/src/fonts/MullerRegular.woff2 differ diff --git a/src/fonts/stylesheet.css b/src/fonts/stylesheet.css index 24c3500d..108775d3 100644 --- a/src/fonts/stylesheet.css +++ b/src/fonts/stylesheet.css @@ -318,9 +318,31 @@ @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; + src: local('Muller Bold'), local('Muller-Bold'), + url('MullerBold.woff2') format('woff2'), + url('MullerBold.woff') format('woff'), + url('MullerBold.ttf') format('truetype'); + font-weight: 700; + font-style: normal; +} + +@font-face { + font-family: 'Muller'; + src: local('Muller Regular'), local('Muller-Regular'), + url('MullerRegular.woff2') format('woff2'), + url('MullerRegular.woff') format('woff'), + url('MullerRegular.ttf') format('truetype'); + font-weight: 400; + font-style: normal; +} + +@font-face { + font-family: 'Muller'; + src: local('Muller Light'), local('Muller-Light'), + url('MullerLight.woff2') format('woff2'), + url('MullerLight.woff') format('woff'), + url('MullerLight.ttf') format('truetype'); + font-weight: 300; font-style: normal; }