From ed25b7c00ecca3b9488fcb606e48381e58cd7ab3 Mon Sep 17 00:00:00 2001 From: Hope87 Date: Mon, 12 Jul 2021 17:30:36 +0300 Subject: [PATCH] fixed code on description page --- src/components/Candidate/Candidate.js | 10 ++++---- src/components/Candidate/Candidate.module.css | 1 + src/components/Description/Description.js | 24 +++++++++++-------- .../Description/Description.module.css | 10 ++++++-- src/components/Home/Home.js | 2 +- 5 files changed, 30 insertions(+), 17 deletions(-) diff --git a/src/components/Candidate/Candidate.js b/src/components/Candidate/Candidate.js index 67c6bcb5..8e8eee7c 100644 --- a/src/components/Candidate/Candidate.js +++ b/src/components/Candidate/Candidate.js @@ -1,5 +1,5 @@ import React, { useEffect } from 'react'; -import { useHistory, useParams } from 'react-router-dom'; +import { useHistory, useParams, Link } from 'react-router-dom'; import { useSelector, useDispatch } from 'react-redux'; import { currentCandidate, selectCurrentCandidate } from '../../redux/outstaffingSlice'; import style from './Candidate.module.css'; @@ -113,9 +113,11 @@ const Candidate = () => { ) : (

Описание отсутствует...

)} - + + + diff --git a/src/components/Candidate/Candidate.module.css b/src/components/Candidate/Candidate.module.css index da0ab9a8..e0758cd9 100644 --- a/src/components/Candidate/Candidate.module.css +++ b/src/components/Candidate/Candidate.module.css @@ -222,6 +222,7 @@ margin-top: 60px; border-radius: 10px; margin-bottom: 60px; + flex-wrap: wrap; } @media (max-width: 575.98px) { diff --git a/src/components/Description/Description.js b/src/components/Description/Description.js index d94b8cdc..8738e68a 100644 --- a/src/components/Description/Description.js +++ b/src/components/Description/Description.js @@ -43,11 +43,13 @@ const Description = ({ onLoadMore }) => {
- {el.skillValues.map((e) => ( - - {e.skill.name} - - ))} +
+ {el.skillValues.map((e) => ( + + {e.skill.name} + + ))} +
@@ -76,11 +78,13 @@ const Description = ({ onLoadMore }) => {
- {el.skillValues.map((e) => ( - - {e.skill.name} - - ))} +
+ {el.skillValues.map((e) => ( + + {e.skill.name} + + ))} +
diff --git a/src/components/Description/Description.module.css b/src/components/Description/Description.module.css index f3f131ad..600ff211 100644 --- a/src/components/Description/Description.module.css +++ b/src/components/Description/Description.module.css @@ -82,6 +82,7 @@ line-height: 24px; text-align: left; line-height: 28px; + word-wrap: break-word; } .description__text > p:first-child { @@ -132,10 +133,10 @@ .description__button { width: 220px; height: 50px; - position: absolute; - bottom: -170px; z-index: 5; margin-left: 85px; + margin-top: 40px; + margin-bottom: 40px; } } @@ -151,6 +152,10 @@ } } +.description__spBox { + padding: 5px; +} + .description__sp { font-family: 'GT Eesti Pro Display'; font-size: 1.7em; @@ -161,6 +166,7 @@ line-height: 36px; margin-top: 20px; margin-left: 10px; + word-wrap: break-word; } @media (max-width: 575.98px) { diff --git a/src/components/Home/Home.js b/src/components/Home/Home.js index 58c2a693..46895912 100644 --- a/src/components/Home/Home.js +++ b/src/components/Home/Home.js @@ -6,7 +6,7 @@ import { fetchProfile, fetchSkills } from '../../server/server'; import { profiles, tags } from '../../redux/outstaffingSlice'; const Home = () => { - const [index, setIndex] = useState(2); + const [index, setIndex] = useState(4); const dispatch = useDispatch();