diff --git a/VERSION b/VERSION index 0b31cc6..2496b04 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.23.0 +6.24.0 diff --git a/play-life-web/package.json b/play-life-web/package.json index a33b572..9f26292 100644 --- a/play-life-web/package.json +++ b/play-life-web/package.json @@ -1,6 +1,6 @@ { "name": "play-life-web", - "version": "6.23.0", + "version": "6.24.0", "type": "module", "scripts": { "dev": "vite", diff --git a/play-life-web/src/components/BoardSelector.css b/play-life-web/src/components/BoardSelector.css index 7842cab..5bbb242 100644 --- a/play-life-web/src/components/BoardSelector.css +++ b/play-life-web/src/components/BoardSelector.css @@ -219,11 +219,26 @@ color: #4f46e5; } +/* Строка с кнопками добавления и архива */ +.board-actions-row { + display: flex; + align-items: center; + margin-top: 6px; + border-top: 1px solid #f3f4f6; +} + +.board-actions-separator { + width: 1px; + height: 24px; + background: #e5e7eb; + flex-shrink: 0; +} + /* Кнопка добавления доски */ .dropdown-item.add-board { - margin-top: 6px; + flex: 1; padding-top: 14px; - border-top: 1px solid #f3f4f6; + padding-bottom: 14px; border-radius: 0 0 12px 12px; color: #667eea; font-weight: 500; @@ -231,6 +246,10 @@ justify-content: flex-start; } +.board-actions-row .dropdown-item.add-board:not(:last-child) { + border-radius: 0 0 0 12px; +} + .dropdown-item.add-board:hover { background: linear-gradient(135deg, #667eea08 0%, #764ba208 100%); } @@ -264,17 +283,16 @@ height: 20px; } -/* Секция архива в дропдауне */ -.archive-section { - margin-top: 2px; - border-top: 1px solid #f3f4f6; -} - +/* Кнопка архива в строке действий */ .dropdown-item.archive-toggle { + flex-shrink: 0; + width: auto; + padding: 14px 14px; + border-radius: 0 0 12px 0; color: #6b7280; font-weight: 500; - gap: 12px; - justify-content: flex-start; + gap: 6px; + justify-content: center; } .dropdown-item.archive-toggle:hover { @@ -289,13 +307,13 @@ } .archive-toggle-icon { - margin-left: auto; - font-size: 10px; + font-size: 8px; color: #9ca3af; } .archive-list { padding: 0 4px 4px; + border-top: 1px solid #f3f4f6; } .archive-loading { diff --git a/play-life-web/src/components/BoardSelector.jsx b/play-life-web/src/components/BoardSelector.jsx index 0f5c8f3..d7a7c30 100644 --- a/play-life-web/src/components/BoardSelector.jsx +++ b/play-life-web/src/components/BoardSelector.jsx @@ -100,45 +100,50 @@ function BoardSelector({ )} - +
+ - {archivedBoards.length > 0 && ( -
- + {archivedBoards.length > 0 && ( + <> +
+ + + )} +
- {archiveExpanded && ( -
- {archivedBoards.map(board => ( - - ))} -
- )} + {archiveExpanded && archivedBoards.length > 0 && ( +
+ {archivedBoards.map(board => ( + + ))}
)}