diff --git a/src/components/Button/button.module.scss b/src/components/button-default/button.module.scss
similarity index 100%
rename from src/components/Button/button.module.scss
rename to src/components/button-default/button.module.scss
diff --git a/src/components/Button/index.tsx b/src/components/button-default/index.tsx
similarity index 85%
rename from src/components/Button/index.tsx
rename to src/components/button-default/index.tsx
index da9e54e8..08535b98 100644
--- a/src/components/Button/index.tsx
+++ b/src/components/button-default/index.tsx
@@ -1,7 +1,7 @@
import clsx from 'clsx';
import styles from './button.module.scss';
-export type ButtonProps = {
+export type ButtonDefaultProps = {
buttonText: string;
buttonStyle:
| 'green-border-button'
@@ -15,7 +15,7 @@ export type ButtonProps = {
type?: 'button' | 'submit' | 'reset';
};
-const Button = ({
+const ButtonDefault = ({
buttonText,
buttonStyle,
classNameActive,
@@ -23,7 +23,7 @@ const Button = ({
disabled,
classNames,
type,
-}: ButtonProps) => {
+}: ButtonDefaultProps) => {
return (
{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 82d474e7..5b9157b7 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 b874f320..5e063983 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}`}
Промокод
+
{promocodeError}
{
@@ -97,7 +98,6 @@ export default function ProfileUser() {
type="text"
value={values.profile_firstName}
withErrorSpan={true}
- required
/>
{/*