From 763b13358e36c9f7575f8ad6d9a9e79b5c2888ca Mon Sep 17 00:00:00 2001 From: poignatov Date: Mon, 2 Feb 2026 19:53:58 +0300 Subject: [PATCH] =?UTF-8?q?4.8.2:=20=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BE=D1=82=D1=81=D1=82=D1=83=D0=BF=D1=8B=20?= =?UTF-8?q?=D0=B2=20=D1=84=D0=BE=D1=80=D0=BC=D0=B5=20=D1=80=D0=B5=D0=B4?= =?UTF-8?q?=D0=B0=D0=BA=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D1=86=D0=B5=D0=BB=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VERSION | 2 +- play-life-web/package.json | 2 +- play-life-web/src/components/WishlistForm.css | 13 ++++++++++++- play-life-web/src/components/WishlistForm.jsx | 12 ++++++++---- 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/VERSION b/VERSION index 697e993..326ec63 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.8.1 +4.8.2 diff --git a/play-life-web/package.json b/play-life-web/package.json index 63777f9..1181807 100644 --- a/play-life-web/package.json +++ b/play-life-web/package.json @@ -1,6 +1,6 @@ { "name": "play-life-web", - "version": "4.8.1", + "version": "4.8.2", "type": "module", "scripts": { "dev": "vite", diff --git a/play-life-web/src/components/WishlistForm.css b/play-life-web/src/components/WishlistForm.css index d889148..65c43d5 100644 --- a/play-life-web/src/components/WishlistForm.css +++ b/play-life-web/src/components/WishlistForm.css @@ -323,7 +323,7 @@ } .condition-form form { - padding: 1.5rem; + padding: 1.5rem 1.5rem 0.75rem 1.5rem; flex: 1; display: flex; flex-direction: column; @@ -333,6 +333,17 @@ display: flex; gap: 1rem; margin-top: 1.5rem; + margin-bottom: 0.125rem; +} + +.calculated-weeks-info { + margin-top: 0.125rem; + margin-bottom: 0; + text-align: left; + color: #666; + font-size: 0.85em; + min-height: 1.2em; + line-height: 1.2em; } .submit-button { diff --git a/play-life-web/src/components/WishlistForm.jsx b/play-life-web/src/components/WishlistForm.jsx index 898e9f2..edc0393 100644 --- a/play-life-web/src/components/WishlistForm.jsx +++ b/play-life-web/src/components/WishlistForm.jsx @@ -1296,10 +1296,14 @@ function ConditionForm({ tasks, projects, onSubmit, onCancel, editingCondition, {isEditing ? 'Сохранить' : 'Добавить'} - {type === 'project_points' && calculatedWeeksText && ( -
- Срок: - {calculatedWeeksText} + {type === 'project_points' && ( +
+ {calculatedWeeksText && ( + <> + Срок: + {calculatedWeeksText} + + )}
)}