6.17.5: Кнопка выполнения и тайтл в диалоге товара
Some checks failed
Build and Push Docker Image / build-and-push (push) Failing after 1m13s
Some checks failed
Build and Push Docker Image / build-and-push (push) Failing after 1m13s
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "play-life-web",
|
"name": "play-life-web",
|
||||||
"version": "6.17.4",
|
"version": "6.17.5",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
|||||||
@@ -170,19 +170,7 @@ function ShoppingItemDetail({ itemId, onClose, onRefresh, onItemCompleted, onNav
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="shopping-item-complete-row">
|
<div className="shopping-item-complete-row">
|
||||||
<button
|
<label className="progression-label">Объём</label>
|
||||||
onClick={handleComplete}
|
|
||||||
disabled={isCompleting}
|
|
||||||
className="shopping-item-complete-button"
|
|
||||||
>
|
|
||||||
{isCompleting ? (
|
|
||||||
<div className="shopping-item-complete-spinner"></div>
|
|
||||||
) : (
|
|
||||||
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2.5" strokeLinecap="round" strokeLinejoin="round">
|
|
||||||
<polyline points="20 6 9 17 4 12"></polyline>
|
|
||||||
</svg>
|
|
||||||
)}
|
|
||||||
</button>
|
|
||||||
<div className="progression-input-wrapper">
|
<div className="progression-input-wrapper">
|
||||||
<input
|
<input
|
||||||
type="number"
|
type="number"
|
||||||
@@ -218,6 +206,19 @@ function ShoppingItemDetail({ itemId, onClose, onRefresh, onItemCompleted, onNav
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div className="task-action-left">
|
||||||
|
<button
|
||||||
|
onClick={handleComplete}
|
||||||
|
disabled={isCompleting}
|
||||||
|
className="action-button action-button-check"
|
||||||
|
>
|
||||||
|
{isCompleting ? (
|
||||||
|
<div className="shopping-item-complete-spinner"></div>
|
||||||
|
) : (
|
||||||
|
'Выполнить'
|
||||||
|
)}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -210,7 +210,7 @@
|
|||||||
|
|
||||||
.shopping-item-complete-row {
|
.shopping-item-complete-row {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
flex-direction: column;
|
||||||
gap: 0.375rem;
|
gap: 0.375rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -218,6 +218,10 @@
|
|||||||
flex: 1;
|
flex: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.shopping-item-complete-row + .task-action-left {
|
||||||
|
margin-top: 0.75rem;
|
||||||
|
}
|
||||||
|
|
||||||
.shopping-item-complete-button {
|
.shopping-item-complete-button {
|
||||||
width: 48px;
|
width: 48px;
|
||||||
height: 48px;
|
height: 48px;
|
||||||
|
|||||||
Reference in New Issue
Block a user