From 1a189007af73a545fdb8c4492161566e52dfad2c Mon Sep 17 00:00:00 2001 From: Sofia Bilous Date: Tue, 17 Oct 2023 19:45:35 +0300 Subject: [PATCH] fix some styles --- .../BreadCrumbs/BreadCrumbs.module.css | 110 +++++++++--------- .../SearchPage/search_field/Text.module.css | 39 +------ .../search_field/companies/Companies.js | 10 +- .../companies/CompaniesCards.module.css | 7 +- .../SearchPage/search_page.module.css | 7 +- 5 files changed, 70 insertions(+), 103 deletions(-) diff --git a/FrontEnd/src/components/BreadCrumbs/BreadCrumbs.module.css b/FrontEnd/src/components/BreadCrumbs/BreadCrumbs.module.css index e57cf89eb..0245623a2 100644 --- a/FrontEnd/src/components/BreadCrumbs/BreadCrumbs.module.css +++ b/FrontEnd/src/components/BreadCrumbs/BreadCrumbs.module.css @@ -1,70 +1,70 @@ .content { - padding-left: 192px; - display: flex; - align-items: center; - margin-bottom: 32px; + padding-left: 10%; + display: flex; + align-items: center; + margin-bottom: 32px; } .main-page__button { - font-family: "Inter", sans-serif; - font-size: 16px; - font-weight: 600; - line-height: 20px; - letter-spacing: -0.01em; - text-align: left; - color: #8D959C; - text-decoration: none; + font-family: 'Inter', sans-serif; + font-size: 16px; + font-weight: 600; + line-height: 20px; + letter-spacing: -0.01em; + text-align: left; + color: #8d959c; + text-decoration: none; } .current-page__button { - font-family: "Inter", sans-serif; - font-size: 16px; - font-weight: 600; - line-height: 20px; - letter-spacing: -0.01em; - text-align: left; - color: #25292C; - text-decoration: none; + font-family: 'Inter', sans-serif; + font-size: 16px; + font-weight: 600; + line-height: 20px; + letter-spacing: -0.01em; + text-align: left; + color: #25292c; + text-decoration: none; } -.goback__button { - display: flex; - padding: 5px 15px; - justify-content: center; - align-items: center; - gap: 10px; - border-radius: 4px; - border: 1px solid var(--primary-green-80, #1f9a7c); - background: var(--main-white, #fff); - box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, 0.02); - color: var(--primary-green-80, #1f9a7c); - text-align: center; - font-feature-settings: "calt" off; - font-family: "Inter", sans-serif; - font-size: 16px; - font-style: normal; - font-weight: 600; - line-height: 20px; - letter-spacing: -0.16px; - cursor: pointer; - margin-right: 32px; - } +.goback__button { + display: flex; + padding: 5px 15px; + justify-content: center; + align-items: center; + gap: 10px; + border-radius: 4px; + border: 1px solid var(--primary-green-80, #1f9a7c); + background: var(--main-white, #fff); + box-shadow: 0px 2px 0px 0px rgba(0, 0, 0, 0.02); + color: var(--primary-green-80, #1f9a7c); + text-align: center; + font-feature-settings: 'calt' off; + font-family: 'Inter', sans-serif; + font-size: 16px; + font-style: normal; + font-weight: 600; + line-height: 20px; + letter-spacing: -0.16px; + cursor: pointer; + margin-right: 32px; +} .right { - transform: rotate(-45deg); - -webkit-transform: rotate(-45deg); - border: solid #25292C; - border-width: 0 2px 2px 0; - display: inline-block; - padding: 4px; - margin: 0px 15px; + transform: rotate(-45deg); + -webkit-transform: rotate(-45deg); + border: solid #25292c; + border-width: 0 2px 2px 0; + display: inline-block; + padding: 4px; + margin: 0px 15px; } .left { - transform: rotate(135deg); - -webkit-transform: rotate(135deg); - border: solid #1f9a7c; - border-width: 0 2px 2px 0; - display: inline-block; - padding: 4px; + transform: rotate(135deg); + -webkit-transform: rotate(135deg); + border: solid #1f9a7c; + border-width: 0 2px 2px 0; + display: inline-block; + padding: 4px; } diff --git a/FrontEnd/src/components/SearchPage/search_field/Text.module.css b/FrontEnd/src/components/SearchPage/search_field/Text.module.css index aad8d7008..691c81826 100644 --- a/FrontEnd/src/components/SearchPage/search_field/Text.module.css +++ b/FrontEnd/src/components/SearchPage/search_field/Text.module.css @@ -1,46 +1,17 @@ @import './companies/variables.css'; -.new-companies-main { - width: 1304px; - display: flex; - padding: 80px 104px; - flex-direction: column; - align-items: flex-start; - gap: 24px; - background: var(--main_light-color); -} -.new-companies { - display: flex; - align-items: center; - gap: 800px; -} -.new-companies-main__header { - width: 444px; - color: var(--text-color); - text-transform: uppercase; - font-family: Inter; - font-size: 20px; - font-style: normal; - font-weight: 700; - line-height: 120%; -} .new-companies-block { display: flex; - width: 1304px; + width: 1412px; padding: 16px 8px; flex-direction: column; - align-items: left; - gap: 36px; -} -.new-companies-block__row { - display: flex; - align-items: flex-start; - gap: 60px; + align-items: center; + gap: 26px; } .row { - display: flex; - flex-wrap: wrap; + display: grid; + grid-template-columns: 1fr 1fr 1fr; justify-content: space-between; margin: -10px; /* spacess beetwen ecompanies */ } diff --git a/FrontEnd/src/components/SearchPage/search_field/companies/Companies.js b/FrontEnd/src/components/SearchPage/search_field/companies/Companies.js index 5c6e236da..9df0bcb4d 100644 --- a/FrontEnd/src/components/SearchPage/search_field/companies/Companies.js +++ b/FrontEnd/src/components/SearchPage/search_field/companies/Companies.js @@ -21,15 +21,13 @@ const MainCompanies = ({ companyData, isAuthorized }) => {
-
+
{companyData.categories && companyData.categories .map((category) => category.name) .join(' ')}
-
+
{
-
+
{companyData.address}
diff --git a/FrontEnd/src/components/SearchPage/search_field/companies/CompaniesCards.module.css b/FrontEnd/src/components/SearchPage/search_field/companies/CompaniesCards.module.css index 67c637ee5..12bb1f66b 100644 --- a/FrontEnd/src/components/SearchPage/search_field/companies/CompaniesCards.module.css +++ b/FrontEnd/src/components/SearchPage/search_field/companies/CompaniesCards.module.css @@ -51,6 +51,7 @@ font-style: normal; font-weight: 700; line-height: 120%; /* 19.2px */ + text-align: left; } .product-card__name-text { width: 328px; @@ -62,6 +63,7 @@ font-weight: 700; line-height: 120%; /* 24px */ text-transform: uppercase; + text-align: left; } .product-card__name-text_link { @@ -83,6 +85,7 @@ font-weight: 400; line-height: 20px; /* 142.857% */ letter-spacing: -0.14px; + text-align: left; } .product-card__badges-block { width: 100%; @@ -145,10 +148,6 @@ position: absolute; } -.align_items_left { - text-align: left; -} - .product-card__buttons { color: var(--companies-card-button); border: none; diff --git a/FrontEnd/src/components/SearchPage/search_page.module.css b/FrontEnd/src/components/SearchPage/search_page.module.css index 8b09a6115..67dd1f2c4 100644 --- a/FrontEnd/src/components/SearchPage/search_page.module.css +++ b/FrontEnd/src/components/SearchPage/search_page.module.css @@ -2,6 +2,7 @@ .main_block_outer { padding-top: 10px; + width: 1512px; } .new-companies-main { @@ -15,7 +16,7 @@ .new-companies-search_count { display: flex; margin: auto; - padding-left: 7%; + padding-left: 10%; } .search_field_entered_value { @@ -36,10 +37,10 @@ font: Inter; } -.search_result_error_search_value { +/* .search_result_error_search_value { color: var(--main-style-signs-color); } - + */ .frame-img-right { position: absolute; top: 30px;