diff --git a/src/components/energy-value/energy-value.module.scss b/src/components/energy-value/energy-value.module.scss index d805f28..0662941 100644 --- a/src/components/energy-value/energy-value.module.scss +++ b/src/components/energy-value/energy-value.module.scss @@ -36,7 +36,7 @@ } } -@media screen and (width <= 768px) { +@media screen and (width <= 1024px) { .energy-value { width: calc(100% - 16px); max-width: 100%; diff --git a/src/components/recipes-components/ingredients-list-popup/index.tsx b/src/components/recipes-components/ingredients-list-popup/index.tsx index 9d34636..9716eae 100644 --- a/src/components/recipes-components/ingredients-list-popup/index.tsx +++ b/src/components/recipes-components/ingredients-list-popup/index.tsx @@ -17,7 +17,7 @@ const IngredientsListPopup: React.FC = ({ onClick={() => handleClick(ingredient.id)} className={styles['popup-ingredients__name']} > - {ingredient?.name} + {`${ingredient?.name}`} {ingredient.quantity_in_recipe_measure} diff --git a/src/components/recipes-components/ingredients-list/index.tsx b/src/components/recipes-components/ingredients-list/index.tsx index 6210a0e..7f23b30 100644 --- a/src/components/recipes-components/ingredients-list/index.tsx +++ b/src/components/recipes-components/ingredients-list/index.tsx @@ -33,7 +33,7 @@ const IngredientsList: React.FC = ({

handleClick(ingredient.id)} className={styles.ingredient__name} - >{`${ingredient.name}, ${ingredient.amount + ingredient.measure_unit}`}

+ >{`${ingredient.name}`}

{ingredient.quantity_in_recipe_measure}

diff --git a/src/components/recipes-components/ingredients-list/ingredients-list.module.scss b/src/components/recipes-components/ingredients-list/ingredients-list.module.scss index 82d474e..5b9157b 100644 --- a/src/components/recipes-components/ingredients-list/ingredients-list.module.scss +++ b/src/components/recipes-components/ingredients-list/ingredients-list.module.scss @@ -7,7 +7,7 @@ font-family: $ubuntu-font; color: $active-text-color; - @media screen and (width <= 768px) { + @media screen and (width <= 1024px) { max-width: 100%; width: 100%; } @@ -39,7 +39,7 @@ grid-column: span 3; padding: 8px 0; - @media screen and (width <= 768px) { + @media screen and (width <= 1024px) { // width: 100%; display: flex; justify-content: space-between; @@ -48,7 +48,7 @@ } .ingredient { - @media screen and (width <= 768px) { + @media screen and (width <= 1024px) { width: 100%; } @@ -99,9 +99,12 @@ } } -@media screen and (width <= 768px) { +@media screen and (width <= 1024px) { .ingredients__list { + display: flex; + flex-direction: column; gap: 16px; - margin: 8px; + padding: 8px; + margin: 0; } } diff --git a/src/components/recipes-components/products-list-popup/index.tsx b/src/components/recipes-components/products-list-popup/index.tsx index b874f32..5e06398 100644 --- a/src/components/recipes-components/products-list-popup/index.tsx +++ b/src/components/recipes-components/products-list-popup/index.tsx @@ -70,7 +70,7 @@ const ProductsListPopup: React.FC = ({

handleClick(product.id)} - >{`${product.name}`}

+ >{`${product.name}, ${product.amount + product.measure_unit}`}