From eda38247ba5b80016b0999f97f115e15c4150f80 Mon Sep 17 00:00:00 2001 From: Tatiana Nikolaeva Date: Sun, 27 Apr 2025 14:38:59 +0500 Subject: [PATCH] correcting header --- .../src/components/Account/Account.module.css | 13 +++++++++++-- SurveyFrontend/src/components/Header/Header.tsx | 4 +++- .../components/PageSurvey/PageSurvey.module.css | 11 +++++++++-- .../src/components/PageSurvey/PageSurvey.tsx | 17 +++++++++++++---- 4 files changed, 36 insertions(+), 9 deletions(-) diff --git a/SurveyFrontend/src/components/Account/Account.module.css b/SurveyFrontend/src/components/Account/Account.module.css index cbbfd5e..20e0844 100644 --- a/SurveyFrontend/src/components/Account/Account.module.css +++ b/SurveyFrontend/src/components/Account/Account.module.css @@ -7,18 +7,27 @@ padding: 4.58px 13px 4.58px 4.58px; margin: 26px 33px 27px 0; margin-left: auto; + display: inline-flex; + max-width: 100%; + min-width: fit-content; } .accountText{ + width: 100%; + gap: 9px; + display: flex; + align-items: center; + justify-content: space-around; font-size: 24px; font-weight: 600; color: black; - width: 100%; text-decoration: none; + white-space: nowrap; } .accountImg{ vertical-align: middle; width: 55px; margin-right: 9px; -} \ No newline at end of file + flex-shrink: 0; +} diff --git a/SurveyFrontend/src/components/Header/Header.tsx b/SurveyFrontend/src/components/Header/Header.tsx index 488200c..84cbf0b 100644 --- a/SurveyFrontend/src/components/Header/Header.tsx +++ b/SurveyFrontend/src/components/Header/Header.tsx @@ -4,6 +4,8 @@ import Account from "../Account/Account.tsx"; import styles from './Header.module.css' import SurveyPagesList from "../SurveyPagesList/SurveyPagesList.tsx"; + + const Header: React.FC = () => { const [activePage, setActivePage] = useState('Создать опрос'); @@ -26,4 +28,4 @@ const Header: React.FC = () => { ); }; -export default Header; \ No newline at end of file +export default Header; diff --git a/SurveyFrontend/src/components/PageSurvey/PageSurvey.module.css b/SurveyFrontend/src/components/PageSurvey/PageSurvey.module.css index 2e845fa..a54cfa2 100644 --- a/SurveyFrontend/src/components/PageSurvey/PageSurvey.module.css +++ b/SurveyFrontend/src/components/PageSurvey/PageSurvey.module.css @@ -17,6 +17,13 @@ .active{ color: #000000; - text-decoration: underline; text-decoration-color: #3881C8; -} \ No newline at end of file +} + +.line{ + border: 1px solid #000000; + width: 50%; + margin: 0 auto; + padding: 0; + box-shadow: 0 1px 4px 0 #3881C8; +} diff --git a/SurveyFrontend/src/components/PageSurvey/PageSurvey.tsx b/SurveyFrontend/src/components/PageSurvey/PageSurvey.tsx index adc8adb..fe1de26 100644 --- a/SurveyFrontend/src/components/PageSurvey/PageSurvey.tsx +++ b/SurveyFrontend/src/components/PageSurvey/PageSurvey.tsx @@ -10,11 +10,20 @@ interface PageSurveyProps{ const PageSurvey: React.FC = ({name, isActive, onClick}) => { return (
  • - + {isActive ? ( + <> + +
    + + ) : ( + + )}
  • ); }; -export default PageSurvey; \ No newline at end of file +export default PageSurvey;