Merge branch 'develop' into feature/prepend-mailto

NIAEFEUP · Feb 8, 2023 · 8a40c01 · 8a40c01
2 parents ae8544f + 5f96cb4
commit 8a40c01
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/components/HomePage/SearchResultsArea/SearchResultsWidget/SearchResultsDesktop.js b/src/components/HomePage/SearchResultsArea/SearchResultsWidget/SearchResultsDesktop.js
@@ -15,7 +15,7 @@ const OffersList = ({
     showSearchFilters, toggleShowSearchFilters, offers, moreOffersLoading, loadMoreOffers, searchQueryToken,
 }) => (
     <Grid item md={4} id="offer_list" className={classes.fullHeight}>
-        <Grid container className={classes.fullHeight}>
+        <Grid container className={classes.heightOffersList}>
             <div className={classes.offerItemsContainer}>
                 {noOffers ?
                     <div className={classes.noOffersColumn}>
@@ -51,6 +51,7 @@ OffersList.propTypes = {
     classes: PropTypes.shape({
         divider: PropTypes.string.isRequired,
         fullHeight: PropTypes.string.isRequired,
+        heightOffersList: PropTypes.string.isRequired,
         offerItemsContainer: PropTypes.string.isRequired,
         noOffersColumn: PropTypes.string.isRequired,
         errorLoadingOffersIcon: PropTypes.string.isRequired,
@@ -139,6 +140,7 @@ const SearchResultsDesktop = () => {
 
     const offersListClasses = {
         fullHeight: classes.fullHeight,
+        heightOffersList: classes.heightOffersList,
         noOffersColumn: classes.noOffersColumn,
         errorLoadingOffersIcon: classes.errorLoadingOffersIcon,
         divider: classes.divider,

diff --git a/src/components/HomePage/SearchResultsArea/SearchResultsWidget/searchResultsWidgetStyles.js b/src/components/HomePage/SearchResultsArea/SearchResultsWidget/searchResultsWidgetStyles.js
@@ -13,6 +13,10 @@ export default makeStyles((theme) => ({
     fullWidth: {
         width: "100%",
     },
+    heightOffersList: {
+        height: "100%",
+        overflow: "auto",
+    },
     searchResults: {
         boxSizing: "border-box",
         height: "100vh",
@@ -58,8 +62,6 @@ export default makeStyles((theme) => ({
         display: "flex",
         justifyContent: "space-between",
         width: "100%",
-        height: "100%",
-        overflow: "auto",
     },
     offerBodyContainer: {
         height: "100%",
@@ -69,7 +71,6 @@ export default makeStyles((theme) => ({
     offerHeader: {
         marginBottom: theme.spacing(1),
         alignItems: "flex-start",
-
     },
     verticalDivider: {
         "&&": {