Skip to content

Commit 5f96cb4

Browse files
authored
Merge pull request #300 from NIAEFEUP/fix/divider-offers
fixed divider bug
2 parents 5905379 + ca02cd0 commit 5f96cb4

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/components/HomePage/SearchResultsArea/SearchResultsWidget/SearchResultsDesktop.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const OffersList = ({
1515
showSearchFilters, toggleShowSearchFilters, offers, moreOffersLoading, loadMoreOffers, searchQueryToken,
1616
}) => (
1717
<Grid item md={4} id="offer_list" className={classes.fullHeight}>
18-
<Grid container className={classes.fullHeight}>
18+
<Grid container className={classes.heightOffersList}>
1919
<div className={classes.offerItemsContainer}>
2020
{noOffers ?
2121
<div className={classes.noOffersColumn}>
@@ -51,6 +51,7 @@ OffersList.propTypes = {
5151
classes: PropTypes.shape({
5252
divider: PropTypes.string.isRequired,
5353
fullHeight: PropTypes.string.isRequired,
54+
heightOffersList: PropTypes.string.isRequired,
5455
offerItemsContainer: PropTypes.string.isRequired,
5556
noOffersColumn: PropTypes.string.isRequired,
5657
errorLoadingOffersIcon: PropTypes.string.isRequired,
@@ -139,6 +140,7 @@ const SearchResultsDesktop = () => {
139140

140141
const offersListClasses = {
141142
fullHeight: classes.fullHeight,
143+
heightOffersList: classes.heightOffersList,
142144
noOffersColumn: classes.noOffersColumn,
143145
errorLoadingOffersIcon: classes.errorLoadingOffersIcon,
144146
divider: classes.divider,

src/components/HomePage/SearchResultsArea/SearchResultsWidget/searchResultsWidgetStyles.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ export default makeStyles((theme) => ({
1313
fullWidth: {
1414
width: "100%",
1515
},
16+
heightOffersList: {
17+
height: "100%",
18+
overflow: "auto",
19+
},
1620
searchResults: {
1721
boxSizing: "border-box",
1822
height: "100vh",
@@ -58,8 +62,6 @@ export default makeStyles((theme) => ({
5862
display: "flex",
5963
justifyContent: "space-between",
6064
width: "100%",
61-
height: "100%",
62-
overflow: "auto",
6365
},
6466
offerBodyContainer: {
6567
height: "100%",
@@ -69,7 +71,6 @@ export default makeStyles((theme) => ({
6971
offerHeader: {
7072
marginBottom: theme.spacing(1),
7173
alignItems: "flex-start",
72-
7374
},
7475
verticalDivider: {
7576
"&&": {

0 commit comments

Comments
 (0)